diff options
author | Melanie Gilman <melanie@thoughtbot.com> | 2014-11-24 10:06:16 -0500 |
---|---|---|
committer | Melanie Gilman <melanie@thoughtbot.com> | 2014-11-24 21:16:33 -0500 |
commit | 4d84922840deb89754f5b5fb61ebea0aeadc52df (patch) | |
tree | d069733f7270c7e1f58432bb1d6661ab888cf55e /actionpack/lib | |
parent | 77fbc5358616c131884df4e0b622241ebf2a129b (diff) | |
download | rails-4d84922840deb89754f5b5fb61ebea0aeadc52df.tar.gz rails-4d84922840deb89754f5b5fb61ebea0aeadc52df.tar.bz2 rails-4d84922840deb89754f5b5fb61ebea0aeadc52df.zip |
Deprecate string options in URL helpers
Fixes https://github.com/rails/rails/issues/16958
[Byron Bischoff & Melanie Gilman]
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index a641ea3ea9..a8ef5531d5 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -271,7 +271,7 @@ module ActionDispatch controller_options = t.url_options options = controller_options.merge @options hash = handle_positional_args(controller_options, - inner_options || {}, + deprecate_string_options(inner_options) || {}, args, options, @segment_keys) @@ -293,6 +293,22 @@ module ActionDispatch result.merge!(inner_options) end + + DEPRECATED_STRING_OPTIONS = %w[controller action] + + def deprecate_string_options(options) + options ||= {} + deprecated_string_options = options.keys & DEPRECATED_STRING_OPTIONS + if deprecated_string_options.any? + msg = "Calling URL helpers with string keys #{deprecated_string_options.join(", ")} is deprecated. Use symbols instead." + ActiveSupport::Deprecation.warn(msg) + deprecated_string_options.each do |option| + value = options.delete(option) + options[option.to_sym] = value + end + end + options + end end private |