grape 0.6.1 → 0.7.0

data/lib/grape/validations/coerce.rb

@@ -1,13 +1,12 @@
 module Grape
-
   class API
     Boolean = Virtus::Attribute::Boolean # rubocop:disable ConstantName
   end
 
   module Validations
-
     class CoerceValidator < SingleOptionValidator
       def validate_param!(attr_name, params)
+        raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :coerce unless params.is_a? Hash
         new_value = coerce_value(@option, params[attr_name])
         if valid_type?(new_value)
           params[attr_name] = new_value
@@ -47,6 +46,10 @@ module Grape
       end
 
       def coerce_value(type, val)
+        # Don't coerce things other than nil to Arrays or Hashes
+        return val || [] if type == Array
+        return val || {} if type == Hash
+
         converter = Virtus::Attribute.build(type)
         converter.coerce(val)
 
@@ -55,8 +58,6 @@ module Grape
       rescue
         InvalidValue.new
       end
-
     end
-
   end
 end

data/lib/grape/validations/default.rb

@@ -7,14 +7,16 @@ module Grape
       end
 
       def validate_param!(attr_name, params)
-        params[attr_name] = @default unless params.has_key?(attr_name)
+        params[attr_name] = @default.is_a?(Proc) ? @default.call : @default unless params.has_key?(attr_name)
       end
 
       def validate!(params)
-        params = AttributesIterator.new(self, @scope, params)
-        params.each do |resource_params, attr_name|
+        attrs = AttributesIterator.new(self, @scope, params)
+        parent_element = @scope.element
+        attrs.each do |resource_params, attr_name|
           if resource_params[attr_name].nil?
             validate_param!(attr_name, resource_params)
+            params[parent_element] = resource_params if parent_element && params[parent_element].nil?
           end
         end
       end

data/lib/grape/validations/presence.rb

@@ -7,7 +7,7 @@ module Grape
       end
 
       def validate_param!(attr_name, params)
-        unless params.has_key?(attr_name)
+        unless params.respond_to?(:has_key?) && params.has_key?(attr_name)
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :presence
         end
       end

data/lib/grape/validations/regexp.rb

@@ -1,6 +1,5 @@
 module Grape
   module Validations
-
     class RegexpValidator < SingleOptionValidator
       def validate_param!(attr_name, params)
         if params[attr_name] && !(params[attr_name].to_s =~ @option)
@@ -8,6 +7,5 @@ module Grape
         end
       end
     end
-
   end
 end

data/lib/grape/validations/values.rb

@@ -3,11 +3,12 @@ module Grape
     class ValuesValidator < Validator
       def initialize(attrs, options, required, scope)
         @values = options
+        @required = required
         super
       end
 
       def validate_param!(attr_name, params)
-        if params[attr_name] && !@values.include?(params[attr_name])
+        if (params[attr_name] || @required) && !(@values.is_a?(Proc) ? @values.call : @values).include?(params[attr_name])
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :values
         end
       end

data/lib/grape/version.rb

@@ -1,3 +1,3 @@
 module Grape
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/grape/api_spec.rb

@@ -383,7 +383,7 @@ describe Grape::API do
             subject.send(verb) do
               env['api.request.body']
             end
-            send verb, '/', MultiJson.dump(object), { 'CONTENT_TYPE' => 'application/json' }
+            send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json'
             last_response.status.should == (verb == :post ? 201 : 200)
             last_response.body.should eql MultiJson.dump(object)
             last_request.params.should eql Hash.new
@@ -393,7 +393,7 @@ describe Grape::API do
             subject.send(verb) do
               env['api.request.input']
             end
-            send verb, '/', MultiJson.dump(object), { 'CONTENT_TYPE' => 'application/json' }
+            send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json'
             last_response.status.should == (verb == :post ? 201 : 200)
             last_response.body.should eql MultiJson.dump(object).to_json
           end
@@ -403,7 +403,7 @@ describe Grape::API do
               subject.send(verb) do
                 env['api.request.input']
               end
-              send verb, '/', MultiJson.dump(object), { 'CONTENT_TYPE' => 'application/json', 'HTTP_TRANSFER_ENCODING' => 'chunked', 'CONTENT_LENGTH' => nil  }
+              send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json', 'HTTP_TRANSFER_ENCODING' => 'chunked', 'CONTENT_LENGTH' => nil
               last_response.status.should == (verb == :post ? 201 : 200)
               last_response.body.should eql MultiJson.dump(object).to_json
             end
@@ -473,13 +473,15 @@ describe Grape::API do
       last_response.body.should eql 'Created'
     end
 
-    it 'returns a 405 for an unsupported method' do
+    it 'returns a 405 for an unsupported method with an X-Custom-Header' do
+      subject.before { header 'X-Custom-Header', 'foo' }
       subject.get 'example' do
         "example"
       end
       put '/example'
       last_response.status.should eql 405
       last_response.body.should eql ''
+      last_response.headers['X-Custom-Header'].should eql 'foo'
     end
 
     specify '405 responses includes an Allow header specifying supported methods' do
@@ -504,7 +506,8 @@ describe Grape::API do
       last_response.headers['Content-Type'].should eql 'text/plain'
     end
 
-    it 'adds an OPTIONS route that returns a 204 and an Allow header' do
+    it 'adds an OPTIONS route that returns a 204, an Allow header and a X-Custom-Header' do
+      subject.before { header 'X-Custom-Header', 'foo' }
       subject.get 'example' do
         "example"
       end
@@ -512,6 +515,7 @@ describe Grape::API do
       last_response.status.should eql 204
       last_response.body.should eql ''
       last_response.headers['Allow'].should eql 'OPTIONS, GET, HEAD'
+      last_response.headers['X-Custom-Header'].should eql 'foo'
     end
 
     it 'allows HEAD on a GET request' do
@@ -579,6 +583,31 @@ describe Grape::API do
       last_response.body.should eql 'first second'
     end
 
+    it 'adds a before filter to current and child namespaces only' do
+      subject.get '/' do
+        "root - #{@foo}"
+      end
+      subject.namespace :blah do
+        before { @foo = 'foo' }
+        get '/' do
+          "blah - #{@foo}"
+        end
+
+        namespace :bar do
+          get '/' do
+            "blah - bar - #{@foo}"
+          end
+        end
+      end
+
+      get '/'
+      last_response.body.should eql 'root - '
+      get '/blah'
+      last_response.body.should eql 'blah - foo'
+      get '/blah/bar'
+      last_response.body.should eql 'blah - bar - foo'
+    end
+
     it 'adds a after_validation filter' do
       subject.after_validation { @foo = "first #{params[:id] }:#{params[:id].class}"  }
       subject.after_validation { @bar = 'second' }
@@ -605,6 +634,94 @@ describe Grape::API do
       get '/'
       last_response.body.should eql 'default'
     end
+
+    it 'calls all filters when validation passes' do
+      a = double('before mock')
+      b = double('before_validation mock')
+      c = double('after_validation mock')
+      d = double('after mock')
+
+      subject.params do
+        requires :id, type: Integer
+      end
+      subject.resource ':id' do
+        before { a.do_something! }
+        before_validation { b.do_something! }
+        after_validation { c.do_something! }
+        after { d.do_something! }
+        get do
+          'got it'
+        end
+      end
+
+      a.should_receive(:do_something!).exactly(1).times
+      b.should_receive(:do_something!).exactly(1).times
+      c.should_receive(:do_something!).exactly(1).times
+      d.should_receive(:do_something!).exactly(1).times
+
+      get '/123'
+      last_response.status.should eql 200
+      last_response.body.should eql 'got it'
+    end
+
+    it 'calls only before filters when validation fails' do
+      a = double('before mock')
+      b = double('before_validation mock')
+      c = double('after_validation mock')
+      d = double('after mock')
+
+      subject.params do
+        requires :id, type: Integer
+      end
+      subject.resource ':id' do
+        before { a.do_something! }
+        before_validation { b.do_something! }
+        after_validation { c.do_something! }
+        after { d.do_something! }
+        get do
+          'got it'
+        end
+      end
+
+      a.should_receive(:do_something!).exactly(1).times
+      b.should_receive(:do_something!).exactly(1).times
+      c.should_receive(:do_something!).exactly(0).times
+      d.should_receive(:do_something!).exactly(0).times
+
+      get '/abc'
+      last_response.status.should eql 400
+      last_response.body.should eql 'id is invalid'
+    end
+
+    it 'calls filters in the correct order' do
+      i = 0
+      a = double('before mock')
+      b = double('before_validation mock')
+      c = double('after_validation mock')
+      d = double('after mock')
+
+      subject.params do
+        requires :id, type: Integer
+      end
+      subject.resource ':id' do
+        before { a.here(i += 1) }
+        before_validation { b.here(i += 1) }
+        after_validation { c.here(i += 1) }
+        after { d.here(i += 1) }
+        get do
+          'got it'
+        end
+      end
+
+      a.should_receive(:here).with(1).exactly(1).times
+      b.should_receive(:here).with(2).exactly(1).times
+      c.should_receive(:here).with(3).exactly(1).times
+      d.should_receive(:here).with(4).exactly(1).times
+
+      get '/123'
+      last_response.status.should eql 200
+      last_response.body.should eql 'got it'
+    end
   end
 
   context 'format' do
@@ -641,6 +758,26 @@ describe Grape::API do
       get '/error.xml'
       last_response.headers['Content-Type'].should eql 'application/xml'
     end
+
+    context 'with a custom content_type' do
+      before do
+        subject.content_type :custom, 'application/custom'
+        subject.formatter :custom, lambda { |object, env| "custom" }
+
+        subject.get('/custom') { 'bar' }
+        subject.get('/error') { error!('error in custom', 500) }
+      end
+
+      it 'sets content type' do
+        get '/custom.custom'
+        last_response.headers['Content-Type'].should eql 'application/custom'
+      end
+
+      it 'sets content type for error' do
+        get '/error.custom'
+        last_response.headers['Content-Type'].should eql 'application/custom'
+      end
+    end
   end
 
   context 'custom middleware' do
@@ -713,13 +850,13 @@ describe Grape::API do
       end
 
       it 'adds a block if one is given' do
-        block = lambda { }
+        block = lambda {}
         subject.use ApiSpec::PhonyMiddleware, &block
         subject.middleware.should eql [[ApiSpec::PhonyMiddleware, block]]
       end
 
       it 'uses a block if one is given' do
-        block = lambda { }
+        block = lambda {}
         subject.use ApiSpec::PhonyMiddleware, &block
         subject.get '/' do
           env['phony.block'].inspect
@@ -730,7 +867,7 @@ describe Grape::API do
       end
 
       it 'does not destroy the middleware settings on multiple runs' do
-        block = lambda { }
+        block = lambda {}
         subject.use ApiSpec::PhonyMiddleware, &block
         subject.get '/' do
           env['phony.block'].inspect
@@ -757,7 +894,7 @@ describe Grape::API do
       end
     end
   end
-  describe '.basic' do
+  describe '.http_basic' do
     it 'protects any resources on the same scope' do
       subject.http_basic do |u, p|
         u == 'allow'
@@ -796,6 +933,51 @@ describe Grape::API do
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
       last_response.status.should eql 200
     end
+
+    it 'has access to the current endpoint' do
+      basic_auth_context = nil
+
+      subject.http_basic do |u, p|
+        basic_auth_context = self
+
+        u == 'allow'
+      end
+
+      subject.get(:hello) { "Hello, world." }
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
+      basic_auth_context.should be_an_instance_of(Grape::Endpoint)
+    end
+
+    it 'has access to helper methods' do
+      subject.helpers do
+        def authorize(u, p)
+          u == 'allow' && p == 'whatever'
+        end
+      end
+
+      subject.http_basic do |u, p|
+        authorize(u, p)
+      end
+
+      subject.get(:hello) { "Hello, world." }
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
+      last_response.status.should eql 200
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('disallow', 'whatever')
+      last_response.status.should eql 401
+    end
+
+    it 'can set instance variables accessible to routes' do
+      subject.http_basic do |u, p|
+        @hello = "Hello, world."
+
+        u == 'allow'
+      end
+
+      subject.get(:hello) { @hello }
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
+      last_response.status.should eql 200
+      last_response.body.should eql "Hello, world."
+    end
   end
 
   describe '.logger' do
@@ -964,7 +1146,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 403
+      last_response.status.should eql 500
     end
 
     it 'rescues only certain errors if rescue_from is called with specific errors' do
@@ -973,30 +1155,34 @@ describe Grape::API do
       subject.get('/unrescued') { raise "beefcake" }
 
       get '/rescued'
-      last_response.status.should eql 403
+      last_response.status.should eql 500
 
       lambda { get '/unrescued' }.should raise_error
     end
 
-    it 'does not re-raise exceptions of type Grape::Exception::Base' do
-      class CustomError < Grape::Exceptions::Base; end
-      subject.get('/custom_exception') { raise CustomError }
+    context 'CustomError subclass of Grape::Exceptions::Base' do
+      before do
+        class CustomError < Grape::Exceptions::Base; end
+      end
 
-      lambda { get '/custom_exception' }.should_not raise_error
-    end
+      it 'does not re-raise exceptions of type Grape::Exceptions::Base' do
+        subject.get('/custom_exception') { raise CustomError }
 
-    it 'rescues custom grape exceptions' do
-      class CustomError < Grape::Exceptions::Base; end
-      subject.rescue_from CustomError do |e|
-        rack_response('New Error', e.status)
-      end
-      subject.get '/custom_error' do
-        raise CustomError, status: 400, message: 'Custom Error'
+        lambda { get '/custom_exception' }.should_not raise_error
       end
 
-      get '/custom_error'
-      last_response.status.should == 400
-      last_response.body.should == 'New Error'
+      it 'rescues custom grape exceptions' do
+        subject.rescue_from CustomError do |e|
+          rack_response('New Error', e.status)
+        end
+        subject.get '/custom_error' do
+          raise CustomError, status: 400, message: 'Custom Error'
+        end
+
+        get '/custom_error'
+        last_response.status.should == 400
+        last_response.body.should == 'New Error'
+      end
     end
 
     it 'can rescue exceptions raised in the formatter' do
@@ -1027,61 +1213,65 @@ describe Grape::API do
       last_response.status.should eql 202
       last_response.body.should == 'rescued from rain!'
     end
-    it 'rescues an error via rescue_from :all' do
-      class ConnectionError < RuntimeError; end
-      subject.rescue_from :all do |e|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.get '/exception' do
-        raise ConnectionError
-      end
-      get '/exception'
-      last_response.status.should eql 500
-      last_response.body.should == 'rescued from ConnectionError'
-    end
-    it 'rescues a specific error' do
-      class ConnectionError < RuntimeError; end
-      subject.rescue_from ConnectionError do |e|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.get '/exception' do
-        raise ConnectionError
-      end
-      get '/exception'
-      last_response.status.should eql 500
-      last_response.body.should == 'rescued from ConnectionError'
-    end
-    it 'rescues multiple specific errors' do
-      class ConnectionError < RuntimeError; end
-      class DatabaseError < RuntimeError; end
-      subject.rescue_from ConnectionError do |e|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.rescue_from DatabaseError do |e|
-        rack_response("rescued from #{e.class.name}", 500)
+
+    context 'custom errors' do
+      before do
+        class ConnectionError < RuntimeError; end
+        class DatabaseError < RuntimeError; end
+        class CommunicationError < StandardError; end
       end
-      subject.get '/connection' do
-        raise ConnectionError
+
+      it 'rescues an error via rescue_from :all' do
+        subject.rescue_from :all do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.get '/exception' do
+          raise ConnectionError
+        end
+        get '/exception'
+        last_response.status.should eql 500
+        last_response.body.should == 'rescued from ConnectionError'
       end
-      subject.get '/database' do
-        raise DatabaseError
+      it 'rescues a specific error' do
+        subject.rescue_from ConnectionError do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.get '/exception' do
+          raise ConnectionError
+        end
+        get '/exception'
+        last_response.status.should eql 500
+        last_response.body.should == 'rescued from ConnectionError'
       end
-      get '/connection'
-      last_response.status.should eql 500
-      last_response.body.should == 'rescued from ConnectionError'
-      get '/database'
-      last_response.status.should eql 500
-      last_response.body.should == 'rescued from DatabaseError'
-    end
-    it 'does not rescue a different error' do
-      class CommunicationError < RuntimeError; end
-      subject.rescue_from RuntimeError do |e|
-        rack_response("rescued from #{e.class.name}", 500)
+      it 'rescues multiple specific errors' do
+        subject.rescue_from ConnectionError do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.rescue_from DatabaseError do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.get '/connection' do
+          raise ConnectionError
+        end
+        subject.get '/database' do
+          raise DatabaseError
+        end
+        get '/connection'
+        last_response.status.should eql 500
+        last_response.body.should == 'rescued from ConnectionError'
+        get '/database'
+        last_response.status.should eql 500
+        last_response.body.should == 'rescued from DatabaseError'
       end
-      subject.get '/uncaught' do
-        raise CommunicationError
+      it 'does not rescue a different error' do
+        subject.rescue_from RuntimeError do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.get '/uncaught' do
+          raise CommunicationError
+        end
+        lambda { get '/uncaught' }.should raise_error(CommunicationError)
       end
-      lambda { get '/uncaught' }.should raise_error(CommunicationError)
     end
   end
 
@@ -1124,6 +1314,46 @@ describe Grape::API do
     end
   end
 
+  describe '.rescue_from klass, rescue_subclasses: boolean' do
+    before do
+      module APIErrors
+        class ParentError < StandardError; end
+        class ChildError < ParentError; end
+      end
+    end
+
+    it 'rescues error as well as subclass errors with rescue_subclasses option set' do
+      subject.rescue_from APIErrors::ParentError, rescue_subclasses: true do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/caught_child' do
+        raise APIErrors::ChildError
+      end
+      subject.get '/caught_parent' do
+        raise APIErrors::ParentError
+      end
+      subject.get '/uncaught_parent' do
+        raise StandardError
+      end
+
+      get '/caught_child'
+      last_response.status.should eql 500
+      get '/caught_parent'
+      last_response.status.should eql 500
+      lambda { get '/uncaught_parent' }.should raise_error(StandardError)
+    end
+
+    it 'does not rescue child errors if rescue_subclasses is false' do
+      subject.rescue_from APIErrors::ParentError, rescue_subclasses: false do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/uncaught' do
+        raise APIErrors::ChildError
+      end
+      lambda { get '/uncaught' }.should raise_error(APIErrors::ChildError)
+    end
+  end
+
   describe '.error_format' do
     it 'rescues all errors and return :txt' do
       subject.rescue_from :all
@@ -1142,7 +1372,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.body.start_with?("rain!\r\n").should be_true
+      last_response.body.start_with?("rain!\r\n").should be true
     end
 
     it 'rescues all errors with a default formatter' do
@@ -1308,7 +1538,7 @@ describe Grape::API do
         last_response.body.should eql '{"some":"hash"}'
       end
       it 'uses custom formatter' do
-        get '/simple.custom', { 'HTTP_ACCEPT' => 'application/custom' }
+        get '/simple.custom', 'HTTP_ACCEPT' => 'application/custom'
         last_response.body.should eql '{"custom_formatter":"hash"}'
       end
     end
@@ -1331,7 +1561,7 @@ describe Grape::API do
         last_response.body.should eql '{"some":"hash"}'
       end
       it 'uses custom formatter' do
-        get '/simple.custom', { 'HTTP_ACCEPT' => 'application/custom' }
+        get '/simple.custom', 'HTTP_ACCEPT' => 'application/custom'
         last_response.body.should eql '{"custom_formatter":"hash"}'
       end
     end
@@ -1343,7 +1573,7 @@ describe Grape::API do
       subject.post '/data' do
         { x: params[:x] }
       end
-      post "/data", '{"x":42}', { 'CONTENT_TYPE' => 'application/json' }
+      post "/data", '{"x":42}', 'CONTENT_TYPE' => 'application/json'
       last_response.status.should == 201
       last_response.body.should == '{"x":42}'
     end
@@ -1448,7 +1678,16 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 403
+      last_response.status.should eql 500
+    end
+    it 'uses the default error status in error!' do
+      subject.rescue_from :all
+      subject.default_error_status 400
+      subject.get '/exception' do
+        error! "rain!"
+      end
+      get '/exception'
+      last_response.status.should eql 400
     end
   end
 
@@ -1513,7 +1752,7 @@ describe Grape::API do
     end
     describe 'api structure with additional parameters' do
       before(:each) do
-        subject.get 'split/:string', { params: { "token" => "a token" }, optional_params: { "limit" => "the limit" } } do
+        subject.get 'split/:string', params: { "token" => "a token" }, optional_params: { "limit" => "the limit" } do
           params[:string].split(params[:token], (params[:limit] || 0).to_i)
         end
       end
@@ -1550,7 +1789,7 @@ describe Grape::API do
       route = subject.routes.first
       route.route_description.should == "first method"
       route.route_foo.should be_nil
-      route.route_params.should == { }
+      route.route_params.should == {}
     end
     it 'describes methods separately' do
       subject.desc "first method"
@@ -1597,9 +1836,7 @@ describe Grape::API do
     ]
     end
     it 'describes a method with parameters' do
-      subject.desc "Reverses a string.", { params:
-        { "s" => { desc: "string to reverse", type: "string" } }
-      }
+      subject.desc "Reverses a string.", params: { "s" => { desc: "string to reverse", type: "string" } }
       subject.get 'reverse' do
         params[:s].reverse
       end
@@ -1682,8 +1919,10 @@ describe Grape::API do
       subject.routes.map { |route|
         route.route_params
       }.should eq [{
+        "group1"         => { required: true, type: "Array" },
         "group1[param1]" => { required: false, desc: "group1 param1 desc" },
         "group1[param2]" => { required: true, desc: "group1 param2 desc" },
+        "group2"         => { required: true, type: "Array" },
         "group2[param1]" => { required: false, desc: "group2 param1 desc" },
         "group2[param2]" => { required: true, desc: "group2 param2 desc" }
       }]
@@ -1703,11 +1942,19 @@ describe Grape::API do
         { description: "nesting",
           params: {
             "root_param" => { required: true, desc: "root param" },
+            "nested" => { required: true, type: "Array" },
             "nested[nested_param]" => { required: true, desc: "nested param" }
           }
         }
     ]
     end
+    it 'allows to set the type attribute on :group element' do
+      subject.params do
+        group :foo, type: Array do
+          optional :bar
+        end
+      end
+    end
     it 'parses parameters when no description is given' do
       subject.params do
         requires :one_param, desc: "one param"
@@ -1720,9 +1967,7 @@ describe Grape::API do
     ]
     end
     it 'does not symbolize params' do
-      subject.desc "Reverses a string.", { params:
-        { "s" => { desc: "string to reverse", type: "string" } }
-      }
+      subject.desc "Reverses a string.", params: { "s" => { desc: "string to reverse", type: "string" } }
       subject.get 'reverse/:s' do
         params[:s].reverse
       end
@@ -1735,7 +1980,7 @@ describe Grape::API do
   end
 
   describe '.mount' do
-    let(:mounted_app) { lambda { |env| [200, { }, ["MOUNTED"]] } }
+    let(:mounted_app) { lambda { |env| [200, {}, ["MOUNTED"]] } }
 
     context 'with a bare rack app' do
       before do
@@ -1827,8 +2072,8 @@ describe Grape::API do
       it 'collects the routes of the mounted api' do
         subject.namespace :cool do
           app = Class.new(Grape::API)
-          app.get('/awesome') { }
-          app.post('/sauce') { }
+          app.get('/awesome') {}
+          app.post('/sauce') {}
           mount app
         end
         subject.routes.size.should == 2
@@ -1861,6 +2106,50 @@ describe Grape::API do
         get "/app1/app2/nice"
         last_response.status.should == 200
         last_response.body.should == "play"
+        options "/app1/app2/nice"
+        last_response.status.should == 204
+      end
+
+      it 'responds to options' do
+        app = Class.new(Grape::API)
+        app.get '/colour' do
+          'red'
+        end
+        app.namespace :pears do
+          get '/colour' do
+            'green'
+          end
+        end
+        subject.namespace :apples do
+          mount app
+        end
+        get '/apples/colour'
+        last_response.status.should eql 200
+        last_response.body.should == 'red'
+        options '/apples/colour'
+        last_response.status.should eql 204
+        get '/apples/pears/colour'
+        last_response.status.should eql 200
+        last_response.body.should == 'green'
+        options '/apples/pears/colour'
+        last_response.status.should eql 204
+      end
+
+      it 'responds to options with path versioning' do
+        subject.version 'v1', using: :path
+        subject.namespace :apples do
+          app = Class.new(Grape::API)
+          app.get('/colour') do
+            "red"
+          end
+          mount app
+        end
+
+        get '/v1/apples/colour'
+        last_response.status.should eql 200
+        last_response.body.should == 'red'
+        options '/v1/apples/colour'
+        last_response.status.should eql 204
       end
 
     end
@@ -1932,7 +2221,7 @@ describe Grape::API do
         subject.get '/description' do
           route.route_description
         end
-        subject.desc 'returns parameters', { params: { "x" => "y" } }
+        subject.desc 'returns parameters', params: { "x" => "y" }
         subject.get '/params/:id' do
           route.route_params[params[:id]]
         end
@@ -1965,7 +2254,7 @@ describe Grape::API do
         last_response.body.should == { meaning_of_life: 42 }.to_json
       end
       it 'forces txt from a non-accepting header' do
-        get '/meaning_of_life', {}, { 'HTTP_ACCEPT' => 'application/json' }
+        get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'application/json'
         last_response.body.should == { meaning_of_life: 42 }.to_s
       end
     end
@@ -1985,7 +2274,7 @@ describe Grape::API do
         last_response.body.should == { meaning_of_life: 42 }.to_s
       end
       it 'forces txt from a non-accepting header' do
-        get '/meaning_of_life', {}, { 'HTTP_ACCEPT' => 'application/json' }
+        get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'application/json'
         last_response.body.should == { meaning_of_life: 42 }.to_s
       end
     end
@@ -2006,7 +2295,7 @@ describe Grape::API do
         last_response.body.should == { meaning_of_life: 42 }.to_s
       end
       it 'forces json from a non-accepting header' do
-        get '/meaning_of_life', {}, { 'HTTP_ACCEPT' => 'text/html' }
+        get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'text/html'
         last_response.body.should == { meaning_of_life: 42 }.to_json
       end
       it 'can be overwritten with an explicit content type' do