diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-27 14:40:55 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-27 14:40:55 -0700 |
commit | cfdab77d1fd39a887e9d94342e4e85f915a5b00b (patch) | |
tree | 6a2e75717181bcb7d4d47cd111ac4ad92107075e /actionpack/lib/action_dispatch/http | |
parent | babcd7d375bc39b3df5526bde0380e0d6d3d243b (diff) | |
parent | 406b1b64649f48bdd724826a05c06fb78f5378ea (diff) | |
download | rails-cfdab77d1fd39a887e9d94342e4e85f915a5b00b.tar.gz rails-cfdab77d1fd39a887e9d94342e4e85f915a5b00b.tar.bz2 rails-cfdab77d1fd39a887e9d94342e4e85f915a5b00b.zip |
Merge branch 'constraints'
* constraints:
rm reset_parameters because we automatically do it from 9ca4839a
move path_parameter encoding check to the request object
dispatcher doesn't need `call` anymore
call `serve` with the request on dispatchers
constraints class does not need the request class anymore
give all endpoints a superclass
skip the build business if the stack is empty
stop hardcoding path_parameters and get it from the request
we do not need to cache rack_app
a redirect is not a dispatcher by definition, so eliminate test
push is_a check up to where the Constraints object is allocated
pass the request object to the application
pass a request to `matches?` so we can avoid creating excess requests
nothing is passed to `rack_app` anymore, so rm the params
one fewer is_a check
Constraints#app should never return another Constraints object, so switch to if statement
eliminate dispatcher is_a checks
push is_a?(Dispatcher) check in to one place
Always construct route objects with Constraint objects
Conflicts:
actionpack/lib/action_controller/metal.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index 5b22cd1fcd..ff555f93a8 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -43,10 +43,6 @@ module ActionDispatch @env[Routing::RouteSet::PARAMETERS_KEY] ||= {} end - def reset_parameters #:nodoc: - @env.delete("action_dispatch.request.parameters") - end - private # Convert nested Hash to HashWithIndifferentAccess diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index cdb3e44b3a..dfe258e463 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -53,6 +53,17 @@ module ActionDispatch @uuid = nil end + def check_path_parameters! + # If any of the path parameters has an invalid encoding then + # raise since it's likely to trigger errors further on. + path_parameters.each do |key, value| + next unless value.respond_to?(:valid_encoding?) + unless value.valid_encoding? + raise ActionController::BadRequest, "Invalid parameter: #{key} => #{value}" + end + end + end + def key?(key) @env.key?(key) end |