Goliath::API#use now takes *args, not one optional arg -- this makes …

…it work the same as rack's #use
postrank-labs · May 12, 2011 · 2776d2a · 2776d2a
1 parent 6d8b4aa
commit 2776d2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/goliath/api.rb b/lib/goliath/api.rb
@@ -53,7 +53,7 @@ def middlewares
       # @param name [Class] The middleware class to use
       # @param args Any arguments to pass to the middeware
       # @param block A block to pass to the middleware
-      def use(name, args = nil, &block)
+      def use(name, *args, &block)
         @middlewares ||= []
         @middlewares << [name, args, block]
       end

diff --git a/lib/goliath/rack/builder.rb b/lib/goliath/rack/builder.rb
@@ -8,8 +8,8 @@ class Builder
       # @return [Object] The Rack middleware chain
       def self.build(klass, api)
         ::Rack::Builder.app do
-          klass.middlewares.each do |mw|
-            use(*(mw[0..1].compact), &mw[2])
+          klass.middlewares.each do |mw_klass, args, blk|
+            use(mw_klass, *args, &blk)
           end
 
           # If you use map you can't use run as
@@ -20,8 +20,8 @@ def self.build(klass, api)
             klass.maps.each do |(path, route_klass, blk)|
               if route_klass
                 map(path) do
-                  route_klass.middlewares.each do |mw|
-                    use(*(mw[0..1].compact), &mw[2])
+                  route_klass.middlewares.each do |mw_klass, args, blk|
+                    use(mw_klass, *args, &blk)
                   end
                   run klass.new
                 end