diff options
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 11 | ||||
| -rw-r--r-- | actionpack/test/controller/url_for_test.rb | 18 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/keys.rb | 14 |
3 files changed, 12 insertions, 31 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 12ae2456d6..d75bb1c2de 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -147,16 +147,7 @@ module ActionDispatch when nil _routes.url_for(url_options.symbolize_keys) when Hash - symbolized = {} - options.keys.each do |k| - sym = k.to_sym - symbolized[sym] = options[k] unless symbolized.has_key?(sym) - end - url_options.keys.each do |k| - sym = k.to_sym - symbolized[sym] = url_options[k] unless symbolized.has_key?(sym) - end - _routes.url_for(symbolized) + _routes.url_for(options.symbolize_keys.reverse_merge!(url_options)) when String options else diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb index 04a431c5c9..aa233d6135 100644 --- a/actionpack/test/controller/url_for_test.rb +++ b/actionpack/test/controller/url_for_test.rb @@ -356,24 +356,6 @@ module AbstractController assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true))) end - def test_with_stringified_default_url_options - W.default_url_options['controller'] = 'd' - W.default_url_options['only_path'] = false - assert_equal("/c", W.new.url_for(:controller => 'c', :only_path => true)) - - W.default_url_options['action'] = 'b' - assert_equal("/c/a", W.new.url_for(:controller => 'c', :action => 'a', :only_path => true)) - end - - def test_with_stringified_default_url_options_and_without_options - W.default_url_options['controller'] = 'c' - W.default_url_options['only_path'] = true - assert_equal("/c", W.new.url_for) - - W.default_url_options['action'] = 'a' - assert_equal("/c/a", W.new.url_for) - end - def test_url_params_with_nil_to_param_are_not_in_url assert_equal("/c/a", W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :id => Struct.new(:to_param).new(nil))) end diff --git a/activesupport/lib/active_support/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb index d8748b1138..65c3736593 100644 --- a/activesupport/lib/active_support/core_ext/hash/keys.rb +++ b/activesupport/lib/active_support/core_ext/hash/keys.rb @@ -1,7 +1,11 @@ class Hash # Return a new hash with all keys converted to strings. def stringify_keys - dup.stringify_keys! + result = {} + keys.each do |key| + result[key.to_s] = self[key] + end + result end # Destructively convert all keys to strings. @@ -15,14 +19,18 @@ class Hash # Return a new hash with all keys converted to symbols, as long as # they respond to +to_sym+. def symbolize_keys - dup.symbolize_keys! + result = {} + keys.each do |key| + result[(key.to_sym rescue key)] = self[key] + end + result end # Destructively convert all keys to symbols, as long as they respond # to +to_sym+. def symbolize_keys! keys.each do |key| - self[(key.to_sym rescue key) || key] = delete(key) + self[(key.to_sym rescue key)] = delete(key) end self end |