kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Speed up subdomain and domain calculus.

Browse source
This commit is contained in:
José Valim 2010-11-23 10:05:47 +01:00
parent 2fe43b694f
commit 56b1214024
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -570,22 +570,14 @@ module ActionDispatch
end
def subdomain_and_domain(options)
return nil unless options[:subdomain] || options[:domain]
tld_length = options[:tld_length] || ActionDispatch::Http::URL.tld_length
current_domain = ActionDispatch::Http::URL.extract_domain(options[:host], tld_length)
current_subdomain = ActionDispatch::Http::URL.extract_subdomain(options[:host], tld_length)
domain_parts = if options[:subdomain] && options[:domain]
[options[:subdomain], options[:domain]]
elsif options[:subdomain]
[options[:subdomain], current_domain]
elsif options[:domain]
[current_subdomain, options[:domain]]
else
nil
end
domain_parts ? domain_parts.join('.') : nil
host = ""
host << (options[:subdomain] || ActionDispatch::Http::URL.extract_subdomain(options[:host], tld_length))
host << "."
host << (options[:domain] || ActionDispatch::Http::URL.extract_domain(options[:host], tld_length))
host
end
def handle_positional_args(options)