lib/rage-rb.rb in rage-rb-1.4.0 vs lib/rage-rb.rb in rage-rb-1.6.0

@@ -5,13 +5,31 @@
 require "iodine"
 require "pathname"
 
 module Rage
   def self.application
-    Application.new(__router)
+    app = Application.new(__router)
+
+    config.middleware.middlewares.reverse.inject(app) do |next_in_chain, (middleware, args, block)|
+      # in Rails compatibility mode we first check if the middleware is a part of the Rails middleware stack;
+      # if it is - it is expected to be built using `ActionDispatch::MiddlewareStack::Middleware#build`
+      if Rage.config.internal.rails_mode
+        rails_middleware = Rails.application.config.middleware.middlewares.find { |m| m.name == middleware.name }
+      end
+
+      if rails_middleware
+        rails_middleware.build(next_in_chain)
+      else
+        middleware.new(next_in_chain, *args, &block)
+      end
+    end
   end
 
+  def self.multi_application
+    Rage::Router::Util::Cascade.new(application, Rails.application)
+  end
+
   def self.routes
     Rage::Router::DSL.new(__router)
   end
 
   def self.__router
@@ -41,32 +59,12 @@
 
   def self.logger
     @logger ||= config.logger
   end
 
-  def self.load_middlewares(rack_builder)
-    config.middleware.middlewares.each do |middleware, args, block|
-      # in Rails compatibility mode we first check if the middleware is a part of the Rails middleware stack;
-      # if it is - it is expected to be built using `ActionDispatch::MiddlewareStack::Middleware#build`, but Rack
-      # expects the middleware to respond to `#new`, so we wrap the middleware into a helper module
-      if Rage.config.internal.rails_mode
-        rails_middleware = Rails.application.config.middleware.middlewares.find { |m| m.name == middleware.name }
-        if rails_middleware
-          wrapper = Module.new do
-            extend self
-            attr_accessor :middleware
-            def new(app, *, &)
-              middleware.build(app)
-            end
-          end
-          wrapper.middleware = rails_middleware
-          middleware = wrapper
-        end
-      end
-
-      rack_builder.use(middleware, *args, &block)
-    end
+  def self.load_middlewares(_)
+    puts "`Rage.load_middlewares` is deprecated and has been merged into `Rage.application`. Please remove this call."
   end
 
   def self.code_loader
     @code_loader ||= Rage::CodeLoader.new
   end
@@ -92,9 +90,12 @@
     end
   end
 
   module Router
     module Strategies
+    end
+
+    module DSLPlugins
     end
   end
 
   module Ext
     module ActiveRecord