grape 0.6.1 → 0.7.0

data/spec/grape/middleware/base_spec.rb

@@ -13,11 +13,6 @@ describe Grape::Middleware::Base do
     subject.app.should == blank_app
   end
 
-  it 'is able to access the request' do
-    subject.call({})
-    subject.request.should be_kind_of(Rack::Request)
-  end
-
   it 'calls through to the app' do
     subject.call({}).should == [200, {}, 'Hi there.']
   end
@@ -41,7 +36,7 @@ describe Grape::Middleware::Base do
 
   context 'options' do
     it 'persists options passed at initialization' do
-      Grape::Middleware::Base.new(blank_app, abc: true).options[:abc].should be_true
+      Grape::Middleware::Base.new(blank_app, abc: true).options[:abc].should be true
     end
 
     context 'defaults' do
@@ -52,11 +47,11 @@ describe Grape::Middleware::Base do
       end
 
       it 'persists the default options' do
-        ExampleWare.new(blank_app).options[:monkey].should be_true
+        ExampleWare.new(blank_app).options[:monkey].should be true
       end
 
       it 'overrides default options when provided' do
-        ExampleWare.new(blank_app, monkey: false).options[:monkey].should be_false
+        ExampleWare.new(blank_app, monkey: false).options[:monkey].should be false
       end
     end
   end

data/spec/grape/middleware/error_spec.rb

@@ -31,10 +31,10 @@ describe Grape::Middleware::Error do
     last_response.body.should == 'Awesome stuff.'
   end
 
-  it 'defaults to a 403 status' do
+  it 'defaults to a 500 status' do
     ErrApp.error = {}
     get '/'
-    last_response.status.should == 403
+    last_response.status.should == 500
   end
 
   it 'has a default message' do

data/spec/grape/middleware/exception_spec.rb

@@ -15,7 +15,7 @@ describe Grape::Middleware::Error do
   # raises a hash error
   class ErrorHashApp
     class << self
-      def error!(message, status = 403)
+      def error!(message, status)
         throw :error, message: { error: message, detail: "missing widget" }, status: status
       end
 
@@ -28,7 +28,7 @@ describe Grape::Middleware::Error do
   # raises an error!
   class AccessDeniedApp
     class << self
-      def error!(message, status = 403)
+      def error!(message, status)
         throw :error, message: message, status: status
       end
 
@@ -70,13 +70,13 @@ describe Grape::Middleware::Error do
       last_response.body.should == "rain!"
     end
 
-    it 'defaults to a 403 status' do
+    it 'defaults to a 500 status' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, rescue_all: true
         run ExceptionApp
       end
       get '/'
-      last_response.status.should == 403
+      last_response.status.should == 500
     end
 
     it 'is possible to specify a different default status code' do

data/spec/grape/middleware/formatter_spec.rb

@@ -72,9 +72,12 @@ describe Grape::Middleware::Formatter do
 
   context 'detection' do
 
-    it 'uses the extension if one is provided' do
+    it 'uses the xml extension if one is provided' do
       subject.call('PATH_INFO' => '/info.xml')
       subject.env['api.format'].should == :xml
+    end
+
+    it 'uses the json extension if one is provided' do
       subject.call('PATH_INFO' => '/info.json')
       subject.env['api.format'].should == :json
     end
@@ -195,7 +198,7 @@ describe Grape::Middleware::Formatter do
               'rack.input' => io,
               'CONTENT_LENGTH' => io.length
             )
-            subject.env['rack.request.form_hash']['is_boolean'].should be_true
+            subject.env['rack.request.form_hash']['is_boolean'].should be true
             subject.env['rack.request.form_hash']['string'].should == 'thing'
           end
         end
@@ -209,7 +212,7 @@ describe Grape::Middleware::Formatter do
           'rack.input' => io,
           'HTTP_TRANSFER_ENCODING' => 'chunked'
         )
-        subject.env['rack.request.form_hash']['is_boolean'].should be_true
+        subject.env['rack.request.form_hash']['is_boolean'].should be true
         subject.env['rack.request.form_hash']['string'].should == 'thing'
       end
       it "rewinds IO" do
@@ -222,7 +225,7 @@ describe Grape::Middleware::Formatter do
           'rack.input' => io,
           'HTTP_TRANSFER_ENCODING' => 'chunked'
         )
-        subject.env['rack.request.form_hash']['is_boolean'].should be_true
+        subject.env['rack.request.form_hash']['is_boolean'].should be true
         subject.env['rack.request.form_hash']['string'].should == 'thing'
       end
       it 'parses the body from an xml #{method} and copies values into rack.request.from_hash' do

data/spec/grape/middleware/versioner/param_spec.rb

@@ -6,12 +6,13 @@ describe Grape::Middleware::Versioner::Param do
   subject { Grape::Middleware::Versioner::Param.new(app, @options || {}) }
 
   it 'sets the API version based on the default param (apiver)' do
-    env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
+    env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
     subject.call(env)[1]["api.version"].should == 'v1'
   end
 
   it 'cuts (only) the version out of the params', focus: true do
-    env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1", "other_param" => "5" } })
+    env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1", "other_param" => "5" })
+    env['rack.request.query_hash'] = Rack::Utils.parse_nested_query(env['QUERY_STRING'])
     subject.call(env)[1]['rack.request.query_hash']["apiver"].should be_nil
     subject.call(env)[1]['rack.request.query_hash']["other_param"].should == "5"
   end
@@ -24,11 +25,11 @@ describe Grape::Middleware::Versioner::Param do
   context 'with specified parameter name' do
     before { @options = { parameter: 'v' } }
     it 'sets the API version based on the custom parameter name' do
-      env = Rack::MockRequest.env_for("/awesome", { params: { "v" => "v1" } })
+      env = Rack::MockRequest.env_for("/awesome", params: { "v" => "v1" })
       subject.call(env)[1]["api.version"].should == "v1"
     end
     it 'does not set the API version based on the default param' do
-      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
+      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
       subject.call(env)[1]["api.version"].should be_nil
     end
   end
@@ -36,11 +37,11 @@ describe Grape::Middleware::Versioner::Param do
   context 'with specified versions' do
     before { @options = { versions: ['v1', 'v2'] } }
     it 'throws an error if a non-allowed version is specified' do
-      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v3" } })
+      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v3" })
       catch(:error) { subject.call(env) }[:status].should == 404
     end
     it 'allows versions that have been specified' do
-      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
+      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
       subject.call(env)[1]["api.version"].should == 'v1'
     end
   end
@@ -50,7 +51,7 @@ describe Grape::Middleware::Versioner::Param do
       versions: ['v1'],
       version_options: { using: :header }
     }
-    env = Rack::MockRequest.env_for("/awesome", { params: {} })
+    env = Rack::MockRequest.env_for("/awesome", params: {})
     subject.call(env).first.should == 200
   end
 

data/spec/grape/path_spec.rb

@@ -57,25 +57,29 @@ module Grape
     describe "#uses_path_versioning?" do
       it "is false when the version setting is nil" do
         path = Path.new(anything, anything, version: nil)
-        expect(path.uses_path_versioning?).to be_false
+        expect(path.uses_path_versioning?).to be false
       end
 
       it "is false when the version option is header" do
-        path = Path.new(anything, anything, {
+        path = Path.new(
+          anything,
+          anything,
           version: 'v1',
           version_options: { using: :header }
-        })
+        )
 
-        expect(path.uses_path_versioning?).to be_false
+        expect(path.uses_path_versioning?).to be false
       end
 
       it "is true when the version option is path" do
-        path = Path.new(anything, anything, {
+        path = Path.new(
+          anything,
+          anything,
           version: 'v1',
           version_options: { using: :path }
-        })
+        )
 
-        expect(path.uses_path_versioning?).to be_true
+        expect(path.uses_path_versioning?).to be true
       end
     end
 
@@ -126,7 +130,7 @@ module Grape
     describe "#path" do
       context "mount_path" do
         it "is not included when it is nil" do
-          path = Path.new(nil, nil, { mount_path: '/foo/bar' })
+          path = Path.new(nil, nil, mount_path: '/foo/bar')
           expect(path.path).to eql '/foo/bar'
         end
 
@@ -143,29 +147,35 @@ module Grape
         end
 
         it "is included after the mount path" do
-          path = Path.new(nil, nil, {
+          path = Path.new(
+            nil,
+            nil,
             mount_path: '/foo',
             root_prefix: '/hello'
-          })
+          )
 
           expect(path.path).to eql('/foo/hello')
         end
       end
 
       it "uses the namespace after the mount path and root prefix" do
-        path = Path.new(nil, 'namespace', {
+        path = Path.new(
+          nil,
+          'namespace',
           mount_path: '/foo',
           root_prefix: '/hello'
-        })
+        )
 
         expect(path.path).to eql('/foo/hello/namespace')
       end
 
       it "uses the raw path after the namespace" do
-        path = Path.new('raw_path', 'namespace', {
+        path = Path.new(
+          'raw_path',
+          'namespace',
           mount_path: '/foo',
           root_prefix: '/hello'
-        })
+        )
 
         expect(path.path).to eql('/foo/hello/namespace/raw_path')
       end

data/spec/grape/util/hash_stack_spec.rb

@@ -25,31 +25,31 @@ describe Grape::Util::HashStack do
   describe '#imbue' do
     it 'pushes a new value onto the end of an array' do
       subject[:abc] = []
-      subject.imbue(:abc, [123])
-      subject.imbue(:abc, [456])
+      subject.imbue :abc, [123]
+      subject.imbue :abc, [456]
       subject[:abc].should == [123, 456]
     end
 
     it 'merges a hash that is passed' do
       subject[:abc] = { foo: 'bar' }
-      subject.imbue(:abc, { baz: 'wich' })
+      subject.imbue :abc, baz: 'wich'
       subject[:abc].should == { foo: 'bar', baz: 'wich' }
     end
 
     it 'sets the value if not a hash or array' do
-      subject.imbue(:abc, 123)
+      subject.imbue :abc, 123
       subject[:abc].should == 123
     end
 
     it 'is able to imbue an array without explicit setting' do
-      subject.imbue(:arr, [1])
-      subject.imbue(:arr, [2])
+      subject.imbue :arr, [1]
+      subject.imbue :arr, [2]
       subject[:arr].should == [1, 2]
     end
 
     it 'is able to imbue a hash without explicit setting' do
-      subject.imbue(:hash, foo: 'bar')
-      subject.imbue(:hash, baz: 'wich')
+      subject.imbue :hash, foo: 'bar'
+      subject.imbue :hash, baz: 'wich'
       subject[:hash].should == { foo: 'bar', baz: 'wich' }
     end
   end

data/spec/grape/validations/coerce_spec.rb

@@ -22,8 +22,12 @@ describe Grape::Validations::CoerceValidator do
         I18n.load_path << File.expand_path('../zh-CN.yml', __FILE__)
         I18n.reload!
         I18n.locale = 'zh-CN'.to_sym
-        subject.params { requires :age, type: Integer }
-        subject.get '/single' do 'int works'; end
+        subject.params do
+          requires :age, type: Integer
+        end
+        subject.get '/single' do
+          'int works'
+        end
 
         get '/single', age: '43a'
         last_response.status.should == 400
@@ -32,8 +36,12 @@ describe Grape::Validations::CoerceValidator do
 
       it 'gives an english fallback error when default locale message is blank' do
         I18n.locale = 'pt-BR'.to_sym
-        subject.params { requires :age, type: Integer }
-        subject.get '/single' do 'int works'; end
+        subject.params do
+          requires :age, type: Integer
+        end
+        subject.get '/single' do
+          'int works'
+        end
 
         get '/single', age: '43a'
         last_response.status.should == 400
@@ -43,8 +51,12 @@ describe Grape::Validations::CoerceValidator do
     end
 
     it 'error on malformed input' do
-      subject.params { requires :int, type: Integer }
-      subject.get '/single' do 'int works'; end
+      subject.params do
+        requires :int, type: Integer
+      end
+      subject.get '/single' do
+        'int works'
+      end
 
       get '/single', int: '43a'
       last_response.status.should == 400
@@ -56,14 +68,18 @@ describe Grape::Validations::CoerceValidator do
     end
 
     it 'error on malformed input (Array)' do
-      subject.params { requires :ids, type: Array[Integer] }
-      subject.get '/array' do 'array int works'; end
+      subject.params do
+        requires :ids, type: Array[Integer]
+      end
+      subject.get '/array' do
+        'array int works'
+      end
 
-      get 'array', { ids: ['1', '2', 'az'] }
+      get 'array', ids: ['1', '2', 'az']
       last_response.status.should == 400
       last_response.body.should == 'ids is invalid'
 
-      get 'array', { ids: ['1', '2', '890'] }
+      get 'array', ids: ['1', '2', '890']
       last_response.status.should == 200
       last_response.body.should == 'array int works'
     end
@@ -78,8 +94,12 @@ describe Grape::Validations::CoerceValidator do
       end
 
       it 'error on malformed input for complex objects' do
-        subject.params { requires :user, type: CoerceValidatorSpec::User }
-        subject.get '/user' do 'complex works'; end
+        subject.params do
+          requires :user, type: CoerceValidatorSpec::User
+        end
+        subject.get '/user' do
+          'complex works'
+        end
 
         get '/user', user: "32"
         last_response.status.should == 400
@@ -93,71 +113,93 @@ describe Grape::Validations::CoerceValidator do
 
     context 'coerces' do
       it 'Integer' do
-        subject.params { requires :int, coerce: Integer }
-        subject.get '/int' do params[:int].class; end
+        subject.params do
+          requires :int, coerce: Integer
+        end
+        subject.get '/int' do
+          params[:int].class
+        end
 
-        get '/int', { int: "45" }
+        get '/int', int: "45"
         last_response.status.should == 200
         last_response.body.should == 'Fixnum'
       end
 
       it 'Array of Integers' do
-        subject.params { requires :arry, coerce: Array[Integer] }
-        subject.get '/array' do params[:arry][0].class; end
+        subject.params do
+          requires :arry, coerce: Array[Integer]
+        end
+        subject.get '/array' do
+          params[:arry][0].class
+        end
 
-        get '/array', { arry: ['1', '2', '3'] }
+        get '/array', arry: ['1', '2', '3']
         last_response.status.should == 200
         last_response.body.should == 'Fixnum'
       end
 
       it 'Array of Bools' do
-        subject.params { requires :arry, coerce: Array[Virtus::Attribute::Boolean] }
-        subject.get '/array' do params[:arry][0].class; end
+        subject.params do
+          requires :arry, coerce: Array[Virtus::Attribute::Boolean]
+        end
+        subject.get '/array' do
+          params[:arry][0].class
+        end
 
-        get 'array', { arry: [1, 0] }
+        get 'array', arry: [1, 0]
         last_response.status.should == 200
         last_response.body.should == 'TrueClass'
       end
 
       it 'Bool' do
-        subject.params { requires :bool, coerce: Virtus::Attribute::Boolean }
-        subject.get '/bool' do params[:bool].class; end
+        subject.params do
+          requires :bool, coerce: Virtus::Attribute::Boolean
+        end
+        subject.get '/bool' do
+          params[:bool].class
+        end
 
-        get '/bool', { bool: 1 }
+        get '/bool', bool: 1
         last_response.status.should == 200
         last_response.body.should == 'TrueClass'
 
-        get '/bool', { bool: 0 }
+        get '/bool', bool: 0
         last_response.status.should == 200
         last_response.body.should == 'FalseClass'
 
-        get '/bool', { bool: 'false' }
+        get '/bool', bool: 'false'
         last_response.status.should == 200
         last_response.body.should == 'FalseClass'
 
-        get '/bool', { bool: 'true' }
+        get '/bool', bool: 'true'
         last_response.status.should == 200
         last_response.body.should == 'TrueClass'
       end
 
       it 'file' do
-        subject.params { requires :file, coerce: Rack::Multipart::UploadedFile }
-        subject.post '/upload' do params[:file].filename; end
+        subject.params do
+          requires :file, coerce: Rack::Multipart::UploadedFile
+        end
+        subject.post '/upload' do
+          params[:file].filename
+        end
 
-        post '/upload', { file: Rack::Test::UploadedFile.new(__FILE__) }
+        post '/upload', file: Rack::Test::UploadedFile.new(__FILE__)
         last_response.status.should == 201
         last_response.body.should == File.basename(__FILE__).to_s
       end
 
       it 'Nests integers' do
         subject.params do
-          group :integers do
+          requires :integers, type: Hash do
             requires :int, coerce: Integer
           end
         end
-        subject.get '/int' do params[:integers][:int].class; end
+        subject.get '/int' do
+          params[:integers][:int].class
+        end
 
-        get '/int', { integers: { int: "45" } }
+        get '/int', integers: { int: "45" }
         last_response.status.should == 200
         last_response.body.should == 'Fixnum'
       end