refactor Routing::Mapper

rails · Jan 3, 2013 · 77f2ba9 · 77f2ba9 · batiste · Jun 2, 2015
1 parent ef61504
commit 77f2ba9
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -26,15 +26,10 @@ def initialize(app, constraints, request)
         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