mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8704 from senny/remove_regexp_global_from_url_for 

replace regexp global in #url_for
This commit is contained in:
Aaron Patterson 2013-02-14 09:59:16 -08:00
parent cdbd64d1a3 19e9e67f95
commit 9d023c87de
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,12 @@ module ActionDispatch
params.reject! { |_,v| v.to_param.nil? }
result = build_host_url(options)
if options[:trailing_slash] && !path.ends_with?('/')
result << path.sub(/(\?|\z)/) { "/" + $& }
if options[:trailing_slash]
if path.include?('?')
result << path.sub(/\?/, '/\&')
else
result << path.sub(/[^\/]\z|\A\z/, '\&/')
end
else
result << path
end

3
actionpack/test/dispatch/request_test.rb
View File

@ -13,6 +13,9 @@ class RequestTest < ActiveSupport::TestCase
assert_equal '/books', url_for(:only_path => true, :path => '/books')
assert_equal 'http://www.example.com/books/?q=code', url_for(trailing_slash: true, path: '/books?q=code')
assert_equal 'http://www.example.com/books/?spareslashes=////', url_for(trailing_slash: true, path: '/books?spareslashes=////')
assert_equal 'http://www.example.com', url_for
assert_equal 'http://api.example.com', url_for(:subdomain => 'api')
assert_equal 'http://example.com', url_for(:subdomain => false)