extract required_defaults from the conditions hash before constructing the route

this way we can remove the strange "respond_to?" conditional in the
`matches?` loop

1 files changed, 3 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index 4698ff8cc7..cbc985640a 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -11,7 +11,7 @@ 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 = {})
+      def initialize(name, app, path, constraints, required_defaults, defaults)
         @name        = name
         @app         = app
         @path        = path
@@ -19,6 +19,7 @@ module ActionDispatch
         @constraints = constraints
         @defaults    = defaults
         @required_defaults = nil
+        @_required_defaults = required_defaults || []
         @required_parts    = nil
         @parts             = nil
         @decorated_ast     = nil
@@ -73,7 +74,7 @@ module ActionDispatch
       end
 
       def required_default?(key)
-        (constraints[:required_defaults] || []).include?(key)
+        @_required_defaults.include?(key)
       end
 
       def required_defaults
@@ -92,8 +93,6 @@ module ActionDispatch
 
       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