Add support for other types of routing constraints

This now allows the use of arrays like this:

  get '/foo/:action', to: 'foo', constraints: { subdomain: %w[www admin] }

or constraints where the request method returns an Fixnum like this:

  get '/foo', to: 'foo#index', constraints: { port: 8080 }

Note that this only applies to constraints on the request - path
constraints still need to be specified as Regexps as the various
constraints are compiled into a single Regexp.

1 files changed, 1 insertions, 5 deletions

diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 1fc45a2109..31868b1814 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -131,11 +131,7 @@ module ActionDispatch
           }
           routes.concat get_routes_as_head(routes)
 
-          routes.sort_by!(&:precedence).select! { |r|
-            r.constraints.all? { |k, v| v === req.send(k) } &&
-              r.verb === req.request_method
-          }
-          routes.reject! { |r| req.ip && !(r.ip === req.ip) }
+          routes.sort_by!(&:precedence).select! { |r| r.matches?(req) }
 
           routes.map! { |r|
             match_data  = r.path.match(req.path_info)