unwrap the constraints object on initialization, eliminate loops

Unwrap Constraints objects.  I don't actually think it's possible
to pass a Constraints object to this constructor, but there were
multiple places that kept testing children of this object.  I
*think* they were just being defensive, but I have no idea.

4 files changed, 12 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index cc3c7f20cb..1ba91d548e 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -19,7 +19,7 @@ module ActionDispatch
         # Unwrap any constraints so we can see what's inside for route generation.
         # This allows the formatter to skip over any mounted applications or redirects
         # that shouldn't be matched when using a url_for without a route name.
-        while app.is_a?(Routing::Mapper::Constraints) do
+        if app.is_a?(Routing::Mapper::Constraints)
           app = app.app
         end
         @dispatcher  = app.is_a?(Routing::RouteSet::Dispatcher)
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index 71a0c5e826..2135b280da 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -16,7 +16,7 @@ module ActionDispatch
         @rack_app ||= begin
           class_name = app.class.name.to_s
           if class_name == "ActionDispatch::Routing::Mapper::Constraints"
-            rack_app(app.app)
+            app.app
           elsif ActionDispatch::Routing::Redirect === app || class_name !~ /^ActionDispatch::Routing/
             app
           end
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f39fd1ea35..b33c5e0dfd 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -19,6 +19,15 @@ module ActionDispatch
         attr_reader :app, :constraints
 
         def initialize(app, constraints, request)
+          # Unwrap Constraints objects.  I don't actually think it's possible
+          # to pass a Constraints object to this constructor, but there were
+          # multiple places that kept testing children of this object.  I
+          # *think* they were just being defensive, but I have no idea.
+          while app.is_a?(self.class)
+            constraints += app.constraints
+            app = app.app
+          end
+
           @app, @constraints, @request = app, constraints, request
         end
 
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 40c767e685..924455bce2 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -704,7 +704,7 @@ module ActionDispatch
           old_params = req.path_parameters
           req.path_parameters = old_params.merge params
           dispatcher = route.app
-          while dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env) do
+          if dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env)
             dispatcher = dispatcher.app
           end