Create new ActionController::Middleware class that will work as a normal Rack middleware.

  * This initial implementation is a bit hackish, but it uses a normal middleware API
    so it's future-proof when we improve the internals.

4 files changed, 35 insertions, 23 deletions

diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index b93e6ce634..f5b1c9e4d1 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -89,7 +89,6 @@ module AbstractController
       end
 
       process_action(action_name)
-      self
     end
 
   private
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 37ff618edd..d27a867efe 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -3,6 +3,7 @@ module ActionController
   autoload :ConditionalGet,       "action_controller/metal/conditional_get"
   autoload :HideActions,          "action_controller/metal/hide_actions"
   autoload :Metal,                "action_controller/metal"
+  autoload :Middleware,           "action_controller/middleware"
   autoload :Layouts,              "action_controller/metal/layouts"
   autoload :RackConvenience,      "action_controller/metal/rack_convenience"
   autoload :Rails2Compatibility,  "action_controller/metal/compatibility"
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index aad9570237..51fbba3661 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -88,23 +88,6 @@ module ActionController
       end
     end
 
-    class ActionMiddleware
-      def initialize(controller, action)
-        @controller, @action = controller, action
-      end
-
-      def call(env)
-        controller = @controller.new
-        controller.app = @app
-        controller.call(@action, env)
-      end
-
-      def new(app)
-        @app = app
-        self
-      end
-    end
-
     # Return a rack endpoint for the given action. Memoize the endpoint, so
     # multiple calls into MyController.action will return the same object
     # for the same action.
@@ -118,10 +101,5 @@ module ActionController
       @actions ||= {}
       @actions[name.to_s] ||= ActionEndpoint.new(self, name)
     end
-
-    def self.middleware(name)
-      @middlewares ||= {}
-      @middlewares[name.to_s] ||= ActionMiddleware.new(self, name)
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/middleware.rb b/actionpack/lib/action_controller/middleware.rb
new file mode 100644
index 0000000000..5fccca0b48
--- /dev/null
+++ b/actionpack/lib/action_controller/middleware.rb
@@ -0,0 +1,34 @@
+module ActionController
+  class Middleware < Metal
+    class ActionMiddleware
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def call(env)
+        controller = @controller.allocate
+        controller.app = @app
+        controller._call(env)
+      end
+
+      def app=(app)
+        @app = app
+      end
+    end
+    
+    def self.new(app)
+      middleware = ActionMiddleware.new(self)
+      middleware.app = app
+      middleware
+    end
+    
+    def _call(env)
+      @_env = env
+      process(:index)
+    end
+    
+    def index
+      call(env)
+    end
+  end
+end
\ No newline at end of file