diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 14:17:34 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 14:17:34 -0300 |
commit | 540a0ba8e2234344b4f47ea1cdbedf8c84b74dbf (patch) | |
tree | 3d3e5027b68961eb6c8957a4048c8407feaa4d00 /actionpack/lib | |
parent | c59c09126f9e80b45e381eb6939bb0577738924a (diff) | |
parent | cb5f2d321587e80964e051b52c5d7e5a3cc0aaaa (diff) | |
download | rails-540a0ba8e2234344b4f47ea1cdbedf8c84b74dbf.tar.gz rails-540a0ba8e2234344b4f47ea1cdbedf8c84b74dbf.tar.bz2 rails-540a0ba8e2234344b4f47ea1cdbedf8c84b74dbf.zip |
Merge pull request #16013 from tgxworld/remove_symbolized_path_parameters
Remove symbolized_path_parameters.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 7 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/testing/test_request.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index b117170514..8fd11d7cf2 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -233,7 +233,6 @@ module ActionController @formats = nil @env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ } @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ } - @symbolized_path_params = nil @method = @request_method = nil @fullpath = @ip = @remote_ip = @protocol = nil @env['action_dispatch.request.query_parameters'] = {} diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index 5f7627cf96..6f10fcd9bf 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/hash/keys' require 'active_support/core_ext/hash/indifferent_access' +require 'active_support/deprecation' module ActionDispatch module Http @@ -24,8 +25,10 @@ module ActionDispatch @env[PARAMETERS_KEY] = parameters end - # The same as <tt>path_parameters</tt> with explicitly symbolized keys. def symbolized_path_parameters + ActiveSupport::Deprecation.warn( + "`symbolized_path_parameters` is deprecated. Please use `path_parameters`" + ) path_parameters end @@ -33,8 +36,6 @@ module ActionDispatch # Returned hash keys are strings: # # {'action' => 'my_action', 'controller' => 'my_controller'} - # - # See <tt>symbolized_path_parameters</tt> for symbolized keys. def path_parameters @env[PARAMETERS_KEY] ||= {} end diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb index 57c678843b..de3dc5f924 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -39,7 +39,7 @@ module ActionDispatch end def action=(action_name) - path_parameters["action"] = action_name.to_s + path_parameters[:action] = action_name.to_s end def if_modified_since=(last_modified) |