actionpack/lib/action_controller/middleware_stack.rb railties/lib/tasks/middleware.rake @@ -57,6 +57,7 @@ module ActionController autoload :Integration, 'action_controller/integration' autoload :IntegrationTest, 'action_controller/integration' autoload :Layout, 'action_controller/layout' + autoload :MiddlewareStack, 'action_controller/middleware_stack' autoload :MimeResponds, 'action_controller/mime_responds' autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes' autoload :RackRequest, 'action_controller/rack_process' actionpack/lib/action_controller.rb @@ -85,6 +85,9 @@ module ActionController end end + cattr_accessor :middleware + self.middleware = MiddlewareStack.new + cattr_accessor :error_file_path self.error_file_path = Rails.public_path if defined?(Rails.public_path) @@ -93,6 +96,7 @@ module ActionController def initialize(output = $stdout, request = nil, response = nil) @output, @request, @response = output, request, response + @app = @@middleware.build(lambda { |env| self._call(env) }) end def dispatch_unlocked @@ -127,6 +131,10 @@ module ActionController end def call(env) + @app.call(env) + end + + def _call(env) @request = RackRequest.new(env) @response = RackResponse.new(@request) dispatch actionpack/lib/action_controller/dispatcher.rb @@ -881,6 +881,11 @@ Run `rake gems:install` to install the missing gems. end end + def middleware + require 'action_controller' + ActionController::Dispatcher.middleware + end + def builtin_directories # Include builtins only in the development environment. (environment == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : [] railties/lib/initializer.rb 3c07a8828ede3d41000513af29c293ae2e2a49d4 Joshua Peek josh josh@joshpeek.com http://github.com/rails/rails/commit/06ed8e451198b2296d8b2752741e259b4f995081 06ed8e451198b2296d8b2752741e259b4f995081 2008-12-01T11:49:34-08:00 2008-12-01T11:48:47-08:00 Add internal middleware stack to Dispatcher config.middleware.use Rack::Cache 9e7733152cb317178ea95bfbe423e98e252a98c3 Joshua Peek josh josh@joshpeek.com