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

1 files changed, 5 insertions, 1 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