Merging in master.

Author: Michael Bleigh

.gitignore

@@ -23,5 +23,7 @@ pkg
 .yardoc/*
 dist
 Gemfile.lock
+*.orig
+*.rej
 
 ## PROJECT::SPECIFIC

README.markdown

@@ -86,6 +86,37 @@ To circumvent this default behaviour, one could use the `:strict` option. When t
 
 Serialization takes place automatically. For more detailed usage information, please visit the [Grape Wiki](http://github.com/intridea/grape/wiki).
 
+## Helpers
+
+You can define helper methods that your endpoints can use with the `helpers`
+macro by either giving a block or a module:
+
+````ruby
+module MyHelpers
+  def say_hello(user)
+    "hey there #{user.name}"
+  end
+end
+
+class API < Grape::API
+  # define helpers with a block
+  helpers do
+    def current_user
+      User.find(params[:user_id])
+    end
+  end
+
+  # or mix in a module
+  helpers MyHelpers
+
+  get '/hello' do
+    # helpers available in your endpoint and filters
+    say_hello(current_user)
+  end
+end
+````
+
+
 ## Working with Entities
 
 A common problem in designing Ruby APIs is that you probably don't want

lib/grape/api.rb

@@ -79,11 +79,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'}
@@ -103,8 +103,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)
@@ -180,7 +180,10 @@ def represent(model_class, options)
       #
       # When called without a block, all known helpers within this scope
       # are included.
-      # 
+      #
+      # @param mod [Module] optional module of methods to include
+      # @param &block [Block] optional block of methods to include
+      #
       # @example Define some helpers.
       #     class ExampleAPI < Grape::API
       #       helpers do
@@ -189,18 +192,18 @@ 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
           change!
-          m
+          mod
         end
       end
 
@@ -267,7 +270,7 @@ def route(methods, paths = ['/'], route_options = {}, &block)
       def before(&block)
         imbue(:befores, [block])
       end
-      
+
       def after(&block) 
         imbue(:afters, [block])
       end
@@ -287,14 +290,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)
@@ -321,13 +324,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.
@@ -343,7 +346,7 @@ def nest(*blocks, &block)
         end
       end
 
-      def inherited(subclass)
+     def inherited(subclass)
         subclass.reset!
         subclass.logger = logger.clone
       end

spec/grape/api_spec.rb

@@ -502,6 +502,22 @@ def two
 
       lambda{get '/howdy'}.should_not raise_error
     end
+
+    it 'should allow for modules' do
+      mod = Module.new do
+        def hello
+          "Hello, world."
+        end
+      end
+      subject.helpers mod
+
+      subject.get '/howdy' do
+        hello
+      end
+
+      get '/howdy'
+      last_response.body.should eql 'Hello, world.'
+    end
   end
 
   describe '.scope' do