diff options
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 15 | ||||
| -rw-r--r-- | actionpack/test/controller/url_for_test.rb | 9 |
2 files changed, 22 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 94db36ce1f..bab501f27c 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -144,10 +144,21 @@ module ActionDispatch # # => 'http://somehost.org/tasks/testing?number=33' def url_for(options = nil) case options + when nil + _routes.url_for(url_options) + 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) when String options - when nil, Hash - _routes.url_for((options || {}).symbolize_keys.reverse_merge!(url_options)) else polymorphic_url(options) end diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb index aa233d6135..5b06d94d18 100644 --- a/actionpack/test/controller/url_for_test.rb +++ b/actionpack/test/controller/url_for_test.rb @@ -356,6 +356,15 @@ 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_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 |