Middlewares that take blocks are now supported by API.use

Author: Michael Bleigh

lib/grape/api.rb

@@ -5,7 +5,7 @@
 
 module Grape
   # The API class is the primary entry point for
-  # creating Grape APIs. Users should subclass this
+  # creating Grape APIs.Users should subclass this
   # class in order to build an API.
   class API
     class << self
@@ -309,8 +309,10 @@ def scope(name = nil, &block)
       #
       # @param middleware_class [Class] The class of the middleware you'd like
       #   to inject.
-      def use(middleware_class, *args)
-        imbue(:middleware, [[middleware_class, *args]])
+      def use(middleware_class, *args, &block)
+        arr = [middleware_class, *args]
+        arr << block if block_given?
+        imbue(:middleware, [arr])
       end
 
       # Retrieve an array of the middleware classes

lib/grape/endpoint.rb

@@ -225,7 +225,14 @@ def build_middleware
 
       b.use Grape::Middleware::Formatter, :default_format => settings[:default_format] || :json
 
-      aggregate_setting(:middleware).each{|m| b.use *m }
+      aggregate_setting(:middleware).each do |m|
+        block = m.pop if m.last.is_a?(Proc)
+        if block
+          b.use *m, &block
+        else
+          b.use *m
+        end
+      end
 
       b
     end

spec/grape/api_spec.rb

@@ -337,11 +337,13 @@ class PhonyMiddleware
       def initialize(app, *args)
         @args = args
         @app = app
+        @block = true if block_given?
       end
 
       def call(env)
         env['phony.args'] ||= []
         env['phony.args'] << @args
+        env['phony.block'] = true if @block
         @app.call(env)
       end
     end
@@ -395,6 +397,23 @@ def call(env)
         get '/'
         last_response.body.should eql 'hello'
       end
+
+      it 'should add a block if one is given' do
+        block = lambda{ }
+        subject.use PhonyMiddleware, &block
+        subject.middleware.should eql [[PhonyMiddleware, block]]
+      end
+
+      it 'should use a block if one is given' do
+        block = lambda{ }
+        subject.use PhonyMiddleware, &block
+        subject.get '/' do
+          env['phony.block'].inspect
+        end
+
+        get '/'
+        last_response.body.should == 'true'
+      end
     end
   end
   describe '.basic' do