1 files changed, 37 insertions, 15 deletions

diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index d18efd863a..063302e0f2 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -1,7 +1,7 @@
 module ActionDispatch
   module Journey # :nodoc:
     class Route # :nodoc:
-      attr_reader :app, :path, :verb, :defaults, :ip, :name
+      attr_reader :app, :path, :defaults, :name
 
       attr_reader :constraints
       alias :conditions :constraints
@@ -12,15 +12,11 @@ module ActionDispatch
       # +path+ is a path constraint.
       # +constraints+ is a hash of constraints to be applied to this route.
       def initialize(name, app, path, constraints, defaults = {})
-        constraints  = constraints.dup
         @name        = name
         @app         = app
         @path        = path
-        @verb        = constraints[:request_method] || //
-        @ip          = constraints.delete(:ip) || //
 
         @constraints = constraints
-        @constraints.keep_if { |_,v| Regexp === v || String === v }
         @defaults    = defaults
         @required_defaults = nil
         @required_parts    = nil
@@ -30,11 +26,11 @@ module ActionDispatch
       end
 
       def ast
-        return @decorated_ast if @decorated_ast
-
-        @decorated_ast = path.ast
-        @decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
-        @decorated_ast
+        @decorated_ast ||= begin
+          decorated_ast = path.ast
+          decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
+          decorated_ast
+        end
       end
 
       def requirements # :nodoc:
@@ -45,11 +41,11 @@ module ActionDispatch
       end
 
       def segments
-        @path.names
+        path.names
       end
 
       def required_keys
-        path.required_names.map { |x| x.to_sym } + required_defaults.keys
+        required_parts + required_defaults.keys
       end
 
       def score(constraints)
@@ -83,12 +79,38 @@ module ActionDispatch
         @required_parts ||= path.required_names.map { |n| n.to_sym }
       end
 
+      def required_default?(key)
+        (constraints[:required_defaults] || []).include?(key)
+      end
+
       def required_defaults
-        @required_defaults ||= begin
-          matches = parts
-          @defaults.dup.delete_if { |k,_| matches.include?(k) }
+        @required_defaults ||= @defaults.dup.delete_if do |k,_|
+          parts.include?(k) || !required_default?(k)
         end
       end
+
+      def matches?(request)
+        constraints.all? do |method, value|
+          next true unless request.respond_to?(method)
+
+          case value
+          when Regexp, String
+            value === request.send(method).to_s
+          when Array
+            value.include?(request.send(method))
+          else
+            value === request.send(method)
+          end
+        end
+      end
+
+      def ip
+        constraints[:ip] || //
+      end
+
+      def verb
+        constraints[:request_method] || //
+      end
     end
   end
 end