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

Merge pull request #39638 from Edouard-chin/ec-actioncontroller-fix

Browse source 
Fix route params using reserved keywords:
This commit is contained in:
Rafael França 2020-06-15 22:48:02 -04:00 committed by GitHub
commit da5b1c3bb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -766,7 +766,7 @@ module ActionDispatch
end end
route_name = options.delete :use_route route_name = options.delete :use_route
path = path_for(options, route_name) path = path_for(options, route_name, [])
uri = URI.parse(path) uri = URI.parse(path)
params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys
@ -794,12 +794,12 @@ module ActionDispatch
options.delete(:relative_url_root) || relative_url_root options.delete(:relative_url_root) || relative_url_root
end end
def path_for(options, route_name = nil) def path_for(options, route_name = nil, reserved = RESERVED_OPTIONS)
url_for(options, route_name, PATH) url_for(options, route_name, PATH, nil, reserved)
end end
# The +options+ argument must be a hash whose keys are *symbols*. # The +options+ argument must be a hash whose keys are *symbols*.
def url_for(options, route_name = nil, url_strategy = UNKNOWN, method_name = nil) def url_for(options, route_name = nil, url_strategy = UNKNOWN, method_name = nil, reserved = RESERVED_OPTIONS)
options = default_url_options.merge options options = default_url_options.merge options
user = password = nil user = password = nil
@ -819,7 +819,7 @@ module ActionDispatch
end end
path_options = options.dup path_options = options.dup
RESERVED_OPTIONS.each { |ro| path_options.delete ro } reserved.each { |ro| path_options.delete ro }
route_with_params = generate(route_name, path_options, recall) route_with_params = generate(route_name, path_options, recall)
path = route_with_params.path(method_name) path = route_with_params.path(method_name)

4
actionpack/test/controller/routing_test.rb
View file

@ -2085,6 +2085,10 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
params = { controller: "people", action: "create", person: { name: "Josh" } } params = { controller: "people", action: "create", person: { name: "Josh" } }
assert_equal [:person], @routes.extra_keys(params) assert_equal [:person], @routes.extra_keys(params)
assert_equal({ controller: "people", action: "create", person: { name: "Josh" } }, params) assert_equal({ controller: "people", action: "create", person: { name: "Josh" } }, params)
params = { controller: "people", action: "create", domain: { foo: "Josh" } }
assert_equal [:domain], @routes.extra_keys(params)
assert_equal({ controller: "people", action: "create", domain: { foo: "Josh" } }, params)
end end
def test_unicode_path def test_unicode_path