diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-03 17:37:03 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 11:58:42 -0300 |
| commit | 34e380764edede47f7ebe0c7671d6f9c9dc7e809 (patch) | |
| tree | 7cf998642ebb3abf88a7976589db327ee408f1c6 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | e4e1fd7ade47771067177254cb133564a3422b8a (diff) | |
| download | rails-34e380764edede47f7ebe0c7671d6f9c9dc7e809.tar.gz rails-34e380764edede47f7ebe0c7671d6f9c9dc7e809.tar.bz2 rails-34e380764edede47f7ebe0c7671d6f9c9dc7e809.zip | |
Remove deprecated usage of string keys in URL helpers
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index f23aec0691..b046f5acac 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -244,7 +244,7 @@ module ActionDispatch controller_options = t.url_options options = controller_options.merge @options hash = handle_positional_args(controller_options, - deprecate_string_options(inner_options) || {}, + inner_options || {}, args, options, @segment_keys) @@ -272,22 +272,6 @@ 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 |