1 files changed, 49 insertions, 42 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7e78b417fa..84a08770f5 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -6,6 +6,7 @@ require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/inflector'
 require 'action_dispatch/routing/redirection'
+require 'action_dispatch/routing/endpoint'
 
 module ActionDispatch
   module Routing
@@ -15,34 +16,41 @@ module ActionDispatch
                        :controller, :action, :path_names, :constraints,
                        :shallow, :blocks, :defaults, :options]
 
-      class Constraints #:nodoc:
-        def self.new(app, constraints, request = Rack::Request)
-          if constraints.any?
-            super(app, constraints, request)
-          else
-            app
+      class Constraints < Endpoint #:nodoc:
+        attr_reader :app, :constraints
+
+        def initialize(app, constraints, dispatcher_p)
+          # 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.
+          if app.is_a?(self.class)
+            constraints += app.constraints
+            app = app.app
           end
-        end
 
-        attr_reader :app, :constraints
+          @dispatcher = dispatcher_p
 
-        def initialize(app, constraints, request)
-          @app, @constraints, @request = app, constraints, request
+          @app, @constraints, = app, constraints
         end
 
-        def matches?(env)
-          req = @request.new(env)
+        def dispatcher?; @dispatcher; end
 
+        def matches?(req)
           @constraints.all? 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
 
-        def call(env)
-          matches?(env) ? @app.call(env) : [ 404, {'X-Cascade' => 'pass'}, [] ]
+        def serve(req)
+          return [ 404, {'X-Cascade' => 'pass'}, [] ] unless matches?(req)
+
+          if dispatcher?
+            @app.serve req
+          else
+            @app.call req.env
+          end
         end
 
         private
@@ -57,12 +65,18 @@ module ActionDispatch
         WILDCARD_PATH = %r{\*([^/\)]+)\)?$}
 
         attr_reader :scope, :path, :options, :requirements, :conditions, :defaults
+        attr_reader :to, :default_controller, :default_action
 
         def initialize(set, scope, path, options)
-          @set, @scope, @path, @options = set, scope, path, options
+          @set, @scope, @path = set, scope, path
           @requirements, @conditions, @defaults = {}, {}, {}
 
-          normalize_options!
+          options = scope[:options].merge(options) if scope[:options]
+          @to                 = options[:to]
+          @default_controller = options[:controller] || scope[:controller]
+          @default_action     = options[:action] || scope[:action]
+
+          @options = normalize_options!(options)
           normalize_path!
           normalize_requirements!
           normalize_conditions!
@@ -94,14 +108,13 @@ module ActionDispatch
             options[:format] != false && !path.include?(':format') && !path.end_with?('/')
           end
 
-          def normalize_options!
-            @options.reverse_merge!(scope[:options]) if scope[:options]
+          def normalize_options!(options)
             path_without_format = path.sub(/\(\.:format\)$/, '')
 
             # Add a constraint for wildcard route to make it non-greedy and match the
             # optional format part of the route by default
-            if path_without_format.match(WILDCARD_PATH) && @options[:format] != false
-              @options[$1.to_sym] ||= /.+?/
+            if path_without_format.match(WILDCARD_PATH) && options[:format] != false
+              options[$1.to_sym] ||= /.+?/
             end
 
             if path_without_format.match(':controller')
@@ -111,10 +124,10 @@ module ActionDispatch
               # controllers with default routes like :controller/:action/:id(.:format), e.g:
               # GET /admin/products/show/1
               # => { controller: 'admin/products', action: 'show', id: '1' }
-              @options[:controller] ||= /.+?/
+              options[:controller] ||= /.+?/
             end
 
-            @options.merge!(default_controller_and_action)
+            options.merge!(default_controller_and_action)
           end
 
           def normalize_requirements!
@@ -210,7 +223,17 @@ module ActionDispatch
           end
 
           def app
-            Constraints.new(endpoint, blocks, @set.request_class)
+            return to if Redirect === to
+
+            if to.respond_to?(:call)
+              Constraints.new(to, blocks, false)
+            else
+              if blocks.any?
+                Constraints.new(dispatcher, blocks, true)
+              else
+                dispatcher
+              end
+            end
           end
 
           def default_controller_and_action
@@ -296,24 +319,8 @@ module ActionDispatch
             Journey::Router::Strexp.compile(path, requirements, SEPARATORS)
           end
 
-          def endpoint
-            to.respond_to?(:call) ? to : dispatcher
-          end
-
           def dispatcher
-            Routing::RouteSet::Dispatcher.new(:defaults => defaults)
-          end
-
-          def to
-            options[:to]
-          end
-
-          def default_controller
-            options[:controller] || scope[:controller]
-          end
-
-          def default_action
-            options[:action] || scope[:action]
+            Routing::RouteSet::Dispatcher.new(defaults)
           end
       end