TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

push host / port / protocol extraction up

Browse Source 
Then we only need to extract host once.
This commit is contained in:
Aaron Patterson 2014-06-30 15:37:12 -07:00
parent 41a7c443a6
commit da57d0b2d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_dispatch/http/url.rb
View File

@ -29,7 +29,8 @@ def extract_subdomain(host, tld_length)
end
def url_for(options)
unless options[:host] || options[:only_path]
host = options[:host]
unless host || options[:only_path]
raise ArgumentError, 'Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true'
end
@ -41,7 +42,9 @@ def url_for(options)
result = if options[:only_path]
path
else
build_host_url(options).concat path
protocol = options[:protocol]
port = options[:port]
build_host_url(host, port, protocol, options).concat path
end
if options.key? :params
@ -80,10 +83,7 @@ def add_trailing_slash(path)
path
end
def build_host_url(options)
protocol = options[:protocol]
host = options[:host]
port = options[:port]
def build_host_url(host, port, protocol, options)
if match = host.match(HOST_REGEXP)
protocol ||= match[1] unless protocol == false
host = match[2]