Make sure middleware use works in Apiculture::App

apiculture.gemspec

@@ -45,4 +45,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">= 12.3.3"
   s.add_development_dependency "bundler", "~> 1.0"
   s.add_development_dependency "simplecov", ">= 0"
+  s.add_development_dependency "rack-parser"
 end

lib/apiculture/app.rb

@@ -3,9 +3,9 @@
 class Apiculture::App
 
   class << self
-    def use(middlreware_factory, middleware_options, &middleware_blk)
+    def use(middleware, *args, &block)
       @middleware_configurations ||= []
-      @middleware_configurations << [middleware_factory, middleware_options, middleware_blk]
+      @middleware_configurations << [middleware, args, block]
     end
 
     def middleware_configurations
@@ -36,6 +36,17 @@ def define_action(http_method, url_path, **options, &handler_blk)
       @actions ||= []
       @actions << [http_method.to_s.upcase, url_path, options, handler_blk]
     end
+
+    def call(env)
+      app = new
+      middleware_configurations = @middleware_configurations || []
+      Rack::Builder.new do
+        middleware_configurations.each do |middleware, *args, &block|
+          use(middleware, *args, &block)
+        end
+        run ->(env) { app.call_without_middleware(env) }
+      end.to_app.call(env)
+    end
   end
 
   def call_without_middleware(env)
@@ -69,16 +80,6 @@ def call_without_middleware(env)
     [404, {'Content-Type' => 'application/json', 'Content-Length' => out.bytesize.to_s}, [out]]
   end
 
-  def self.call(env)
-    app = new
-    Rack::Builder.new do
-      (@middleware_configurations || []).each do |middleware_args|
-        use(*middleware_args)
-      end
-      run ->(env) { app.call_without_middleware(env) }
-    end.to_app.call(env)
-  end
-
   attr_reader :request
   attr_reader :env
   attr_reader :params

spec/apiculture_spec.rb

@@ -123,19 +123,48 @@ def app
       }.to raise_error('Missing parameter :name')
     end
 
-    it 'verifies the parameter type' do
+    it 'verifies the parameter type and allows addition of middleware' do
+      require 'rack/parser'
       @app_class = Class.new(Apiculture::App) do
         extend Apiculture
+        use Rack::Parser
 
         required_param :number, "Number of the thing", Integer
         api_method :post, '/thing' do
-          raise "Should never be called"
+          raise "Did end up in the action"
         end
       end
 
       expect {
-        post '/thing', {number: '123'}
+        post '/thing', JSON.dump({number: '123'}), {'CONTENT_TYPE' => 'application/json'}
       }.to raise_error('Received String, expected Integer for :number')
+
+      expect {
+        post '/thing', JSON.dump({number: 123}), {'CONTENT_TYPE' => 'application/json'}
+      }.to raise_error(/Did end up in the action/)
+    end
+
+    it 'allows addition of middleware' do
+      class Raiser < Struct.new(:app)
+        def call(env)
+          s, h, b = app.call(env)
+          h['X-Via'] = 'Raiser'
+          [s, h, b]
+        end
+      end
+
+      @app_class = Class.new(Apiculture::App) do
+        extend Apiculture
+        use Raiser
+
+        api_method :post, '/thing' do
+          'Everything is fine'
+        end
+      end
+
+      post '/thing'
+
+      raise last_response.headers.inspect
     end
 
     it 'supports an arbitrary object with === as a type specifier for a parameter' do