Merge branch 'master' of https://github.com/merchii/grape into intridea/master

Author: Jerry Cheung

lib/grape/api.rb

@@ -284,6 +284,7 @@ def post(paths = ['/'], options = {}, &block); route('POST', paths, options, &bl
       def put(paths = ['/'], options = {}, &block); route('PUT', paths, options, &block) end
       def head(paths = ['/'], options = {}, &block); route('HEAD', paths, options, &block) end
       def delete(paths = ['/'], options = {}, &block); route('DELETE', paths, options, &block) end
+      def options(paths = ['/'], options = {}, &block); route('OPTIONS', paths, options, &block) end
 
       def namespace(space = nil, &block)
         if space || block_given?

spec/grape/api_spec.rb

@@ -238,13 +238,13 @@ def app; subject end
         "lol"
       end
 
-      %w(get post put delete).each do |m|
+      %w(get post put delete options).each do |m|
         send(m, '/abc')
         last_response.body.should eql 'lol'
       end
     end
 
-    verbs = %w(post get head delete put)
+    verbs = %w(post get head delete put options)
     verbs.each do |verb|
       it "should allow and properly constrain a #{verb.upcase} method" do
         subject.send(verb, '/example') do