kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

PARAMETERS_KEY is only used in the request, so move the constant there

Browse source
This commit is contained in:
Aaron Patterson 2014-05-27 14:46:04 -07:00
parent cfdab77d1f
commit 2ffa126f79
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/lib/action_dispatch/http/parameters.rb
View file

@ -4,6 +4,8 @@ require 'active_support/core_ext/hash/indifferent_access'
module ActionDispatch module ActionDispatch
module Http module Http
module Parameters module Parameters
PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
def initialize(env) def initialize(env)
super super
@symbolized_path_params = nil @symbolized_path_params = nil
@ -25,7 +27,7 @@ module ActionDispatch
def path_parameters=(parameters) #:nodoc: def path_parameters=(parameters) #:nodoc:
@env.delete('action_dispatch.request.parameters') @env.delete('action_dispatch.request.parameters')
@env[Routing::RouteSet::PARAMETERS_KEY] = parameters @env[PARAMETERS_KEY] = parameters
end end
# The same as <tt>path_parameters</tt> with explicitly symbolized keys. # The same as <tt>path_parameters</tt> with explicitly symbolized keys.
@ -40,7 +42,7 @@ module ActionDispatch
# #
# See <tt>symbolized_path_parameters</tt> for symbolized keys. # See <tt>symbolized_path_parameters</tt> for symbolized keys.
def path_parameters def path_parameters
@env[Routing::RouteSet::PARAMETERS_KEY] ||= {} @env[PARAMETERS_KEY] ||= {}
end end
private private

2
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -19,8 +19,6 @@ module ActionDispatch
# alias inspect to to_s. # alias inspect to to_s.
alias inspect to_s alias inspect to_s
PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
class Dispatcher < Routing::Endpoint #:nodoc: class Dispatcher < Routing::Endpoint #:nodoc:
def initialize(defaults) def initialize(defaults)
@defaults = defaults @defaults = defaults

10
actionpack/test/controller/routing_test.rb
View file

@ -87,7 +87,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_symbols_with_dashes def test_symbols_with_dashes
rs.draw do rs.draw do
get '/:artist/:song-omg', :to => lambda { |env| get '/:artist/:song-omg', :to => lambda { |env|
resp = ActiveSupport::JSON.encode env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
[200, {}, [resp]] [200, {}, [resp]]
} }
end end
@ -99,7 +99,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_id_with_dash def test_id_with_dash
rs.draw do rs.draw do
get '/journey/:id', :to => lambda { |env| get '/journey/:id', :to => lambda { |env|
resp = ActiveSupport::JSON.encode env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
[200, {}, [resp]] [200, {}, [resp]]
} }
end end
@ -111,7 +111,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_dash_with_custom_regexp def test_dash_with_custom_regexp
rs.draw do rs.draw do
get '/:artist/:song-omg', :constraints => { :song => /\d+/ }, :to => lambda { |env| get '/:artist/:song-omg', :constraints => { :song => /\d+/ }, :to => lambda { |env|
resp = ActiveSupport::JSON.encode env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
[200, {}, [resp]] [200, {}, [resp]]
} }
end end
@ -124,7 +124,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_pre_dash def test_pre_dash
rs.draw do rs.draw do
get '/:artist/omg-:song', :to => lambda { |env| get '/:artist/omg-:song', :to => lambda { |env|
resp = ActiveSupport::JSON.encode env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
[200, {}, [resp]] [200, {}, [resp]]
} }
end end
@ -136,7 +136,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_pre_dash_with_custom_regexp def test_pre_dash_with_custom_regexp
rs.draw do rs.draw do
get '/:artist/omg-:song', :constraints => { :song => /\d+/ }, :to => lambda { |env| get '/:artist/omg-:song', :constraints => { :song => /\d+/ }, :to => lambda { |env|
resp = ActiveSupport::JSON.encode env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
[200, {}, [resp]] [200, {}, [resp]]
} }
end end