Move middleware and route configuration from AC::Dispatcher to Rails application object

3 files changed, 7 insertions, 3 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d3057aaa11..14336d90c3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,10 +1,14 @@
 module Rails
   class Application
+    attr_accessor :middleware, :routes
+
     def initialize
-      @app = ActionController::Dispatcher.new
+      @middleware = ActionDispatch::MiddlewareStack.new
+      @routes = ActionController::Routing::Routes
     end
 
     def call(env)
+      @app ||= middleware.build(@routes)
       @app.call(env)
     end
   end
diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb
index fc84a50e91..1ad62e5058 100644
--- a/railties/lib/rails/console_app.rb
+++ b/railties/lib/rails/console_app.rb
@@ -27,6 +27,6 @@ end
 def reload!
   puts "Reloading..."
   ActionDispatch::Callbacks.new(lambda {}, true)
-  ActionController::Dispatcher.router.reload
+  ActionController::Routing::Routes.reload
   true
 end
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb
index 399ce26618..f6aca082e8 100644
--- a/railties/lib/rails/initializer.rb
+++ b/railties/lib/rails/initializer.rb
@@ -608,8 +608,8 @@ Run `rake gems:install` to install the missing gems.
 
   Initializer.default.add :build_application do
     if configuration.frameworks.include?(:action_controller)
-      ActionController::Dispatcher.middleware = configuration.middleware
       Rails.application = Rails::Application.new
+      Rails.application.middleware = configuration.middleware
     end
   end
 end