diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-03 04:07:31 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-03 04:07:31 -0800 |
| commit | e0be37ccdb73a11035d3cff640bdfde7d4986cfc (patch) | |
| tree | 1a9de2e34c1abf72a6a761fd3765300a06a793d8 /actionpack | |
| parent | fe649b1f4c0c39b78d9c48581c2a2b4ed301d900 (diff) | |
| parent | 77f2ba9559ff53987ce3e026f33275678617768e (diff) | |
| download | rails-e0be37ccdb73a11035d3cff640bdfde7d4986cfc.tar.gz rails-e0be37ccdb73a11035d3cff640bdfde7d4986cfc.tar.bz2 rails-e0be37ccdb73a11035d3cff640bdfde7d4986cfc.zip | |
Merge pull request #8715 from goshakkk/refactor-mapper
Refactor Routing::Mapper#matches?
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 0dc6403ec0..a21383e091 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -26,15 +26,10 @@ module ActionDispatch def matches?(env) req = @request.new(env) - @constraints.each { |constraint| - if constraint.respond_to?(:matches?) && !constraint.matches?(req) - return false - elsif constraint.respond_to?(:call) && !constraint.call(*constraint_args(constraint, req)) - return false - end - } - - return true + @constraints.none? do |constraint| + (constraint.respond_to?(:matches?) && !constraint.matches?(req)) || + (constraint.respond_to?(:call) && !constraint.call(*constraint_args(constraint, req))) + end ensure req.reset_parameters end |