Allow for helper modules.

Author: pat

lib/grape/api.rb

@@ -49,7 +49,7 @@ def set(key, value)
       def imbue(key, value)
         settings.imbue(key, value)
       end
-      
+
       # Define a root URL prefix for your entire
       # API.
       def prefix(prefix = nil)
@@ -61,11 +61,11 @@ def prefix(prefix = nil)
       # @example API with legacy support.
       #   class MyAPI < Grape::API
       #     version 'v2'
-      #     
+      #
       #     get '/main' do
       #       {:some => 'data'}
       #     end
-      #         
+      #
       #     version 'v1' do
       #       get '/main' do
       #         {:legacy => 'data'}
@@ -85,8 +85,8 @@ def version(*args, &block)
           end
         end
       end
-      
-      # Specify the default format for the API's 
+
+      # Specify the default format for the API's
       # serializers. Currently only `:json` is
       # supported.
       def default_format(new_format = nil)
@@ -162,7 +162,7 @@ def represent(model_class, options)
       #
       # When called without a block, all known helpers within this scope
       # are included.
-      # 
+      #
       # @example Define some helpers.
       #     class ExampleAPI < Grape::API
       #       helpers do
@@ -171,17 +171,17 @@ def represent(model_class, options)
       #         end
       #       end
       #     end
-      def helpers(&block)
-        if block_given?
-          m = settings.peek[:helpers] || Module.new
-          m.class_eval &block
-          set(:helpers, m)
+      def helpers(mod = nil, &block)
+        if block_given? || mod
+          mod ||= settings.peek[:helpers] || Module.new
+          mod.class_eval &block if block_given?
+          set(:helpers, mod)
         else
-          m = Module.new
+          mod = Module.new
           settings.stack.each do |s|
-            m.send :include, s[:helpers] if s[:helpers]
+            mod.send :include, s[:helpers] if s[:helpers]
           end
-          m
+          mod
         end
       end
 
@@ -215,7 +215,7 @@ def mount(mounts)
 
         mounts.each_pair do |app, path|
           next unless app.respond_to?(:call)
-          route_set.add_route(app, 
+          route_set.add_route(app,
             :path_info => compile_path(path, false)
           )
         end
@@ -271,8 +271,8 @@ def route(methods, paths = ['/'], route_options = {}, &block)
       def before(&block)
         settings.imbue(:befores, [block])
       end
-      
-      def after(&block) 
+
+      def after(&block)
         settings.imbue(:afters, [block])
       end
 
@@ -291,14 +291,14 @@ def namespace(space = nil, &block)
           Rack::Mount::Utils.normalize_path(settings.stack.map{|s| s[:namespace]}.join('/'))
         end
       end
-      
+
       alias_method :group, :namespace
       alias_method :resource, :namespace
       alias_method :resources, :namespace
       alias_method :segment, :namespace
-      
+
       # Create a scope without affecting the URL.
-      # 
+      #
       # @param name [Symbol] Purely placebo, just allows to to name the scope to make the code more readable.
       def scope(name = nil, &block)
         nest(block)
@@ -325,13 +325,13 @@ def middleware
       def routes
         @routes ||= []
       end
-      
+
       def versions
         @versions ||= []
       end
-      
+
       protected
-      
+
       # Execute first the provided block, then each of the
       # block passed in. Allows for simple 'before' setups
       # of settings stack pushes.
@@ -355,11 +355,11 @@ def aggregate_setting(key)
 
       def build_endpoint(&block)
         b = Rack::Builder.new
-        b.use Grape::Middleware::Error, 
-          :default_status => settings[:default_error_status] || 403, 
-          :rescue_all => settings[:rescue_all], 
-          :rescued_errors => settings[:rescued_errors], 
-          :format => settings[:error_format] || :txt, 
+        b.use Grape::Middleware::Error,
+          :default_status => settings[:default_error_status] || 403,
+          :rescue_all => settings[:rescue_all],
+          :rescued_errors => settings[:rescued_errors],
+          :format => settings[:error_format] || :txt,
           :rescue_options => settings[:rescue_options],
           :rescue_handlers => settings[:rescue_handlers] || {}
 
@@ -382,15 +382,15 @@ def build_endpoint(&block)
         representations = settings[:representations] || {}
 
         endpoint = Grape::Endpoint.generate({
-          :befores => befores, 
+          :befores => befores,
           :afters => afters,
           :representations => representations
         }, &block)
         endpoint.send :include, helpers
         b.run endpoint
         b.to_app
       end
-      
+
       def inherited(subclass)
         subclass.reset!
         subclass.logger = logger.clone