Update AC::Middleware to play better with the normal AC::Metal stack. This required stopping to use #call for non-rack-related stuff

3 files changed, 24 insertions, 24 deletions

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 6f89bf5d67..60b3f9a89b 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -49,7 +49,7 @@ module ActionController
     # and response object available. You might wish to control the
     # environment and response manually for performance reasons.
 
-    attr_internal :status, :headers, :content_type, :app, :response
+    attr_internal :status, :headers, :content_type, :response
 
     def initialize(*)
       @_headers = {}
@@ -69,7 +69,7 @@ module ActionController
     end
 
     # :api: private
-    def call(name, env)
+    def dispatch(name, env)
       @_env = env
       process(name)
       to_a
@@ -95,7 +95,7 @@ module ActionController
       end
 
       def call(env)
-        controller = @controller.new.call(@action, env)
+        @controller.new.dispatch(@action, env)
       end
     end
 
diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_convenience.rb
index a80569c530..131d20114d 100644
--- a/actionpack/lib/action_controller/metal/rack_convenience.rb
+++ b/actionpack/lib/action_controller/metal/rack_convenience.rb
@@ -8,7 +8,7 @@ module ActionController
       attr_internal :request
     end
 
-    def call(name, env)
+    def dispatch(action, env)
       @_request = ActionDispatch::Request.new(env)
       @_response = ActionDispatch::Response.new
       @_response.request = request
diff --git a/actionpack/lib/action_controller/middleware.rb b/actionpack/lib/action_controller/middleware.rb
index fac0ed2645..17275793b7 100644
--- a/actionpack/lib/action_controller/middleware.rb
+++ b/actionpack/lib/action_controller/middleware.rb
@@ -1,34 +1,34 @@
 module ActionController
   class Middleware < Metal
     class ActionMiddleware
-      def initialize(controller)
-        @controller = controller
+      def initialize(controller, app)
+        @controller, @app = controller, app
       end
 
       def call(env)
-        controller = @controller.allocate
-        controller.send(:initialize)
-        controller.app = @app
-        controller._call(env)
+        @controller.build(@app).dispatch(:index, env)
       end
+    end
+
+    class << self
+      alias build new
 
-      def app=(app)
-        @app = app
+      def new(app)
+        ActionMiddleware.new(self, app)
       end
     end
-    
-    def self.new(app)
-      middleware = ActionMiddleware.new(self)
-      middleware.app = app
-      middleware
+
+    attr_internal :app
+
+    def process(action)
+      response = super
+      self.status, self.headers, self.response_body = response if response.is_a?(Array)
+      response
     end
-    
-    def _call(env)
-      @_env = env
-      @_request = ActionDispatch::Request.new(env)
-      @_response = ActionDispatch::Response.new
-      @_response.request = @_request
-      process(:index)
+
+    def initialize(app)
+      super()
+      @_app = app
     end
     
     def index