Merge pull request rails#8882 from goshakkk/clearer-conditional

Clearer conditional in constraint match check
sgrgic · Jan 11, 2013 · d61b49e · d61b49e
2 parents fc6f5a4 + caa54db
commit d61b49e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -26,9 +26,9 @@ def initialize(app, constraints, request)
         def matches?(env)
           req = @request.new(env)
 
-          @constraints.none? do |constraint|
-            (constraint.respond_to?(:matches?) && !constraint.matches?(req)) ||
-            (constraint.respond_to?(:call) && !constraint.call(*constraint_args(constraint, req)))
+          @constraints.all? do |constraint|
+            (constraint.respond_to?(:matches?) && constraint.matches?(req)) ||
+              (constraint.respond_to?(:call) && constraint.call(*constraint_args(constraint, req)))
           end
         ensure
           req.reset_parameters