rory 0.3.16 → 0.3.17

data/lib/rory/application.rb

@@ -95,8 +95,29 @@ module Rory
       @db.loggers << logger
     end
 
+    def use_middleware(*args, &block)
+      @middleware << [args, block]
+    end
+
+    def middleware
+      @middleware ||= []
+    end
+
+    def dispatcher
+      Rory::Dispatcher.rack_app(self)
+    end
+
+    def stack
+      builder = Rack::Builder.new
+      middleware.each do |args, block|
+        builder.use *args, &block
+      end
+      builder.run dispatcher
+      builder
+    end
+
     def call(env)
-      Rory::Dispatcher.new(Rack::Request.new(env), self).dispatch
+      stack.call(env)
     end
 
     def logger

data/lib/rory/dispatcher.rb

@@ -9,6 +9,12 @@ module Rory
       @app = app
     end
 
+    def self.rack_app(app)
+      Proc.new { |env|
+        new(Rack::Request.new(env), app).dispatch
+      }
+    end
+
     def route
       @routing[:route] ||= get_route
     end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.16'
+  VERSION = '0.3.17'
 end

data/spec/fixture_app/lib/dummy_middleware.rb

@@ -0,0 +1,13 @@
+class DummyMiddleware
+  attr_accessor :prefix
+
+  def initialize(app, *args, &block)
+    @app = app
+    @args = args
+    block.call(self)
+  end
+
+  def call(env)
+    @app.call("#{prefix} #{@args.first}")
+  end
+end

data/spec/lib/rory/application_spec.rb

@@ -111,4 +111,20 @@ describe Rory::Application do
       Fixture::Application.require_all_files
     end
   end
+
+  describe '.use_middleware' do
+    it 'adds the given middleware to the stack, retaining args and block' do
+      require Fixture::Application.root.join('lib', 'dummy_middleware')
+      Fixture::Application.use_middleware DummyMiddleware, :puppy do |dm|
+        dm.prefix = 'a salubrious'
+      end
+
+      expect(Fixture::Application.instance).to receive(:dispatcher).
+        and_return(dispatch_stack_mock = double)
+      expect(dispatch_stack_mock).to receive(:call).
+        with('a salubrious puppy')
+      Fixture::Application.call({})
+      Fixture::Application.middleware.clear
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -211,6 +211,7 @@ files:
 - spec/fixture_app/controllers/goose/lumpies_controller.rb
 - spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb
 - spec/fixture_app/controllers/stub_controller.rb
+- spec/fixture_app/lib/dummy_middleware.rb
 - spec/fixture_app/views/for_reals/but_wait.html.erb
 - spec/fixture_app/views/for_reals/srsly.html.erb
 - spec/fixture_app/views/layouts/surround.html.erb