grape 1.0.1 → 1.0.2

data/spec/grape/dsl/inside_route_spec.rb

@@ -91,7 +91,7 @@ describe Grape::Endpoint do
   end
 
   describe '#status' do
-    %w(GET PUT OPTIONS).each do |method|
+    %w[GET PUT OPTIONS].each do |method|
       it 'defaults to 200 on GET' do
         request = Grape::Request.new(Rack::MockRequest.env_for('/', method: method))
         expect(subject).to receive(:request).and_return(request)

data/spec/grape/dsl/parameters_spec.rb

@@ -110,7 +110,7 @@ module Grape
         it 'adds an mutally exclusive parameter validation' do
           subject.mutually_exclusive :media, :audio
 
-          expect(subject.validates_reader).to eq([[:media, :audio], { mutual_exclusion: { value: true, message: nil } }])
+          expect(subject.validates_reader).to eq([%i[media audio], { mutual_exclusion: { value: true, message: nil } }])
         end
       end
 
@@ -118,7 +118,7 @@ module Grape
         it 'adds an exactly of one parameter validation' do
           subject.exactly_one_of :media, :audio
 
-          expect(subject.validates_reader).to eq([[:media, :audio], { exactly_one_of: { value: true, message: nil } }])
+          expect(subject.validates_reader).to eq([%i[media audio], { exactly_one_of: { value: true, message: nil } }])
         end
       end
 
@@ -126,7 +126,7 @@ module Grape
         it 'adds an at least one of parameter validation' do
           subject.at_least_one_of :media, :audio
 
-          expect(subject.validates_reader).to eq([[:media, :audio], { at_least_one_of: { value: true, message: nil } }])
+          expect(subject.validates_reader).to eq([%i[media audio], { at_least_one_of: { value: true, message: nil } }])
         end
       end
 
@@ -134,7 +134,7 @@ module Grape
         it 'adds an all or none of parameter validation' do
           subject.all_or_none_of :media, :audio
 
-          expect(subject.validates_reader).to eq([[:media, :audio], { all_or_none_of: { value: true, message: nil } }])
+          expect(subject.validates_reader).to eq([%i[media audio], { all_or_none_of: { value: true, message: nil } }])
         end
       end
 
@@ -155,7 +155,7 @@ module Grape
         describe 'when params argument is an array of hashes' do
           it 'returns values of each hash for @element key' do
             subject.element = :foo
-            expect(subject.params([{ foo: 'bar' }, { foo: 'baz' }])).to eq(%w(bar baz))
+            expect(subject.params([{ foo: 'bar' }, { foo: 'baz' }])).to eq(%w[bar baz])
           end
         end
 

data/spec/grape/dsl/settings_spec.rb

@@ -166,7 +166,7 @@ module Grape
 
           subject.namespace_stackable(:some_thing, :foo_bar_2)
 
-          expect(subject.namespace_stackable(:some_thing)).to eq [:foo_bar, :foo_bar_2]
+          expect(subject.namespace_stackable(:some_thing)).to eq %i[foo_bar foo_bar_2]
 
           subject.namespace_end
           expect(subject.namespace_stackable(:some_thing)).to eq [:foo_bar]
@@ -253,7 +253,7 @@ module Grape
           obj1.top_level_setting.inherit_from obj2_copy.point_in_time_copy
           obj2.top_level_setting.inherit_from obj3_copy.point_in_time_copy
 
-          expect(obj1_copy.namespace_stackable[:some_thing]).to eq [:obj3, :obj2, :obj1]
+          expect(obj1_copy.namespace_stackable[:some_thing]).to eq %i[obj3 obj2 obj1]
         end
       end
     end

data/spec/grape/endpoint_spec.rb

@@ -215,7 +215,7 @@ describe Grape::Endpoint do
         [cookie.name, cookie]
       end]
       expect(cookies.size).to eq(2)
-      %w(and_this delete_this_cookie).each do |cookie_name|
+      %w[and_this delete_this_cookie].each do |cookie_name|
         cookie = cookies[cookie_name]
         expect(cookie).not_to be_nil
         expect(cookie.value).to eq('deleted')
@@ -239,7 +239,7 @@ describe Grape::Endpoint do
         [cookie.name, cookie]
       end]
       expect(cookies.size).to eq(2)
-      %w(and_this delete_this_cookie).each do |cookie_name|
+      %w[and_this delete_this_cookie].each do |cookie_name|
         cookie = cookies[cookie_name]
         expect(cookie).not_to be_nil
         expect(cookie.value).to eq('deleted')
@@ -295,6 +295,9 @@ describe Grape::Endpoint do
             end
           end
         end
+        optional :nested_arr, type: Array do
+          optional :eighth
+        end
       end
     end
 
@@ -366,7 +369,7 @@ describe Grape::Endpoint do
       end
       get '/declared?first=present'
       expect(last_response.status).to eq(200)
-      expect(JSON.parse(last_response.body).keys.size).to eq(4)
+      expect(JSON.parse(last_response.body).keys.size).to eq(5)
     end
 
     it 'has a optional param with default value all the time' do
@@ -408,8 +411,8 @@ describe Grape::Endpoint do
       expect(JSON.parse(last_response.body)['nested'].size).to eq 2
     end
 
-    context 'sets nested hash when the param is missing' do
-      it 'to be array when include_missing is true' do
+    context 'sets nested objects when the param is missing' do
+      it 'to be a hash when include_missing is true' do
         subject.get '/declared' do
           declared(params, include_missing: true)
         end
@@ -419,6 +422,16 @@ describe Grape::Endpoint do
         expect(JSON.parse(last_response.body)['nested']).to be_a(Hash)
       end
 
+      it 'to be an array when include_missing is true' do
+        subject.get '/declared' do
+          declared(params, include_missing: true)
+        end
+
+        get '/declared?first=present'
+        expect(last_response.status).to eq(200)
+        expect(JSON.parse(last_response.body)['nested_arr']).to be_a(Array)
+      end
+
       it 'to be nil when include_missing is false' do
         subject.get '/declared' do
           declared(params, include_missing: false)
@@ -515,9 +528,9 @@ describe Grape::Endpoint do
       json = JSON.parse(last_response.body)
       expect(last_response.status).to eq(200)
       expect(json['first']).to eq 'present'
-      expect(json['nested'].keys).to eq %w(fourth fifth nested_nested)
+      expect(json['nested'].keys).to eq %w[fourth fifth nested_nested]
       expect(json['nested']['fourth']).to eq ''
-      expect(json['nested']['nested_nested'].keys).to eq %w(sixth seven)
+      expect(json['nested']['nested_nested'].keys).to eq %w[sixth seven]
       expect(json['nested']['nested_nested']['sixth']).to eq 'sixth'
     end
 
@@ -543,7 +556,7 @@ describe Grape::Endpoint do
       json = JSON.parse(last_response.body)
       expect(last_response.status).to eq(200)
       expect(json['first']).to eq 'present'
-      expect(json['nested'].keys).to eq %w(fourth)
+      expect(json['nested'].keys).to eq %w[fourth]
       expect(json['nested']['fourth']).to eq '4'
     end
   end
@@ -1211,7 +1224,7 @@ describe Grape::Endpoint do
 
       get '/all_filters'
       json = JSON.parse(last_response.body)
-      expect(json.keys).to match_array %w(before before_validation after_validation endpoint after)
+      expect(json.keys).to match_array %w[before before_validation after_validation endpoint after]
     end
 
     context 'when terminating the response with error!' do
@@ -1228,7 +1241,7 @@ describe Grape::Endpoint do
 
         get '/error_filters'
         expect(last_response.status).to eql 500
-        expect(called).to match_array %w(before before_validation)
+        expect(called).to match_array %w[before before_validation]
       end
 
       it 'allows prior and parent filters of same type to run' do
@@ -1246,7 +1259,7 @@ describe Grape::Endpoint do
 
         get '/parent/hello'
         expect(last_response.status).to eql 500
-        expect(called).to match_array %w(parent prior)
+        expect(called).to match_array %w[parent prior]
       end
     end
   end
@@ -1313,7 +1326,7 @@ describe Grape::Endpoint do
     end
 
     describe 'all other' do
-      %w(post get head put options patch).each do |verb|
+      %w[post get head put options patch].each do |verb|
         it "allows for the anchoring option with a #{verb.upcase} method" do
           subject.send(verb, '/example', anchor: true) do
             verb

data/spec/grape/entity_spec.rb

@@ -169,7 +169,7 @@ describe Grape::Entity do
       expect(inner_body).to eql(root: { abc: 'def' })
     end
 
-    [:json, :serializable_hash].each do |format|
+    %i[json serializable_hash].each do |format|
       it "presents with #{format}" do
         entity = Class.new(Grape::Entity)
         entity.root 'examples', 'example'

data/spec/grape/exceptions/invalid_formatter_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Grape::Exceptions::InvalidFormatter do

data/spec/grape/exceptions/invalid_versioner_option_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Grape::Exceptions::InvalidVersionerOption do

data/spec/grape/exceptions/missing_option_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Grape::Exceptions::MissingOption do

data/spec/grape/exceptions/unknown_options_spec.rb

@@ -1,10 +1,9 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Grape::Exceptions::UnknownOptions do
   describe '#message' do
     let(:error) do
-      described_class.new([:a, :b])
+      described_class.new(%i[a b])
     end
 
     it 'contains the problem in the message' do

data/spec/grape/exceptions/unknown_validator_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Grape::Exceptions::UnknownValidator do

data/spec/grape/exceptions/validation_errors_spec.rb

@@ -69,7 +69,7 @@ describe Grape::Exceptions::ValidationErrors do
       get '/exactly_one_of', beer: 'string', wine: 'anotherstring'
       expect(last_response.status).to eq(400)
       expect(JSON.parse(last_response.body)).to eq([
-                                                     'params' => %w(beer wine),
+                                                     'params' => %w[beer wine],
                                                      'messages' => ['are mutually exclusive']
                                                    ])
     end

data/spec/grape/middleware/exception_spec.rb

@@ -11,6 +11,15 @@ describe Grape::Middleware::Error do
       end
     end
 
+    # raises a non-StandardError (ScriptError) exception
+    class OtherExceptionApp
+      class << self
+        def call(_env)
+          raise NotImplementedError, 'snow!'
+        end
+      end
+    end
+
     # raises a hash error
     class ErrorHashApp
       class << self
@@ -68,20 +77,35 @@ describe Grape::Middleware::Error do
   end
 
   context 'with rescue_all' do
-    subject do
-      Rack::Builder.app do
-        use Spec::Support::EndpointFaker
-        use Grape::Middleware::Error, rescue_all: true
-        run ExceptionSpec::ExceptionApp
+    context 'StandardError exception' do
+      subject do
+        Rack::Builder.app do
+          use Spec::Support::EndpointFaker
+          use Grape::Middleware::Error, rescue_all: true
+          run ExceptionSpec::ExceptionApp
+        end
+      end
+      it 'sets the message appropriately' do
+        get '/'
+        expect(last_response.body).to eq('rain!')
+      end
+      it 'defaults to a 500 status' do
+        get '/'
+        expect(last_response.status).to eq(500)
       end
     end
-    it 'sets the message appropriately' do
-      get '/'
-      expect(last_response.body).to eq('rain!')
-    end
-    it 'defaults to a 500 status' do
-      get '/'
-      expect(last_response.status).to eq(500)
+
+    context 'Non-StandardError exception' do
+      subject do
+        Rack::Builder.app do
+          use Spec::Support::EndpointFaker
+          use Grape::Middleware::Error, rescue_all: true
+          run ExceptionSpec::OtherExceptionApp
+        end
+      end
+      it 'does not trap errors other than StandardError' do
+        expect { get '/' }.to raise_error(NotImplementedError, 'snow!')
+      end
     end
   end
 

data/spec/grape/middleware/formatter_spec.rb

@@ -223,7 +223,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
-    %w(POST PATCH PUT DELETE).each do |method|
+    %w[POST PATCH PUT DELETE].each do |method|
       ['application/json', 'application/json; charset=utf-8'].each do |content_type|
         context content_type do
           it "parses the body from #{method} and copies values into rack.request.form_hash" do

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

@@ -241,7 +241,7 @@ describe Grape::Middleware::Versioner::Header do
 
   context 'when multiple versions are specified' do
     before do
-      @options[:versions] = %w(v1 v2)
+      @options[:versions] = %w[v1 v2]
     end
 
     it 'succeeds with v1' do

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

@@ -35,7 +35,7 @@ describe Grape::Middleware::Versioner::Param do
   end
 
   context 'with specified versions' do
-    let(:options) { { versions: %w(v1 v2) } }
+    let(:options) { { versions: %w[v1 v2] } }
     it 'throws an error if a non-allowed version is specified' do
       env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v3' })
       expect(catch(:error) { subject.call(env) }[:status]).to eq(404)

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

@@ -28,7 +28,7 @@ describe Grape::Middleware::Versioner::Path do
     end
   end
 
-  [%w(v1 v2), [:v1, :v2], [:v1, 'v2'], ['v1', :v2]].each do |versions|
+  [%w[v1 v2], %i[v1 v2], [:v1, 'v2'], ['v1', :v2]].each do |versions|
     context "with specified versions as #{versions}" do
       let(:options) { { versions: versions } }
 

data/spec/grape/path_spec.rb

@@ -31,8 +31,8 @@ module Grape
       end
 
       it 'splits the mount path' do
-        path = Path.new(anything, anything, mount_path: %w(foo bar))
-        expect(path.mount_path).to eql(%w(foo bar))
+        path = Path.new(anything, anything, mount_path: %w[foo bar])
+        expect(path.mount_path).to eql(%w[foo bar])
       end
     end
 
@@ -49,7 +49,7 @@ module Grape
 
       it 'splits the mount path' do
         path = Path.new(anything, anything, root_prefix: 'hello/world')
-        expect(path.root_prefix).to eql(%w(hello world))
+        expect(path.root_prefix).to eql(%w[hello world])
       end
     end
 

data/spec/grape/util/inheritable_setting_spec.rb

@@ -192,7 +192,7 @@ module Grape
           expect(cloned_obj.namespace_stackable[:namespace_stackable_thing]).to eq [:namespace_stackable_foo_bar]
 
           subject.namespace_stackable[:namespace_stackable_thing] = :other_thing
-          expect(subject.namespace_stackable[:namespace_stackable_thing]).to eq [:namespace_stackable_foo_bar, :other_thing]
+          expect(subject.namespace_stackable[:namespace_stackable_thing]).to eq %i[namespace_stackable_foo_bar other_thing]
           expect(cloned_obj.namespace_stackable[:namespace_stackable_thing]).to eq [:namespace_stackable_foo_bar]
         end
 
@@ -200,7 +200,7 @@ module Grape
           expect(cloned_obj.namespace_reverse_stackable[:namespace_reverse_stackable_thing]).to eq [:namespace_reverse_stackable_foo_bar]
 
           subject.namespace_reverse_stackable[:namespace_reverse_stackable_thing] = :other_thing
-          expect(subject.namespace_reverse_stackable[:namespace_reverse_stackable_thing]).to eq [:other_thing, :namespace_reverse_stackable_foo_bar]
+          expect(subject.namespace_reverse_stackable[:namespace_reverse_stackable_thing]).to eq %i[other_thing namespace_reverse_stackable_foo_bar]
           expect(cloned_obj.namespace_reverse_stackable[:namespace_reverse_stackable_thing]).to eq [:namespace_reverse_stackable_foo_bar]
         end
 

data/spec/grape/util/reverse_stackable_values_spec.rb

@@ -9,7 +9,7 @@ module Grape
         it 'returns all keys' do
           subject[:some_thing] = :foo_bar
           subject[:some_thing_else] = :foo_bar
-          expect(subject.keys).to eq [:some_thing, :some_thing_else].sort
+          expect(subject.keys).to eq %i[some_thing some_thing_else].sort
         end
 
         it 'returns merged keys with parent' do
@@ -19,7 +19,7 @@ module Grape
           subject[:some_thing] = :foo_bar
           subject[:some_thing_more] = :foo_bar
 
-          expect(subject.keys).to eq [:some_thing, :some_thing_else, :some_thing_more].sort
+          expect(subject.keys).to eq %i[some_thing some_thing_else some_thing_more].sort
         end
       end
 
@@ -52,7 +52,7 @@ module Grape
         it 'combines parent and actual values (actual first)' do
           parent[:some_thing] = :foo
           subject[:some_thing] = :foo_bar
-          expect(subject[:some_thing]).to eq [:foo_bar, :foo]
+          expect(subject[:some_thing]).to eq %i[foo_bar foo]
         end
 
         it 'parent values are not changed' do
@@ -71,28 +71,28 @@ module Grape
         it 'pushes further values' do
           subject[:some_thing] = :foo
           subject[:some_thing] = :bar
-          expect(subject[:some_thing]).to eq [:foo, :bar]
+          expect(subject[:some_thing]).to eq %i[foo bar]
         end
 
         it 'can handle array values' do
           subject[:some_thing] = :foo
-          subject[:some_thing] = [:bar, :more]
-          expect(subject[:some_thing]).to eq [:foo, [:bar, :more]]
+          subject[:some_thing] = %i[bar more]
+          expect(subject[:some_thing]).to eq [:foo, %i[bar more]]
 
-          parent[:some_thing_else] = [:foo, :bar]
-          subject[:some_thing_else] = [:some, :bar, :foo]
+          parent[:some_thing_else] = %i[foo bar]
+          subject[:some_thing_else] = %i[some bar foo]
 
-          expect(subject[:some_thing_else]).to eq [[:some, :bar, :foo], [:foo, :bar]]
+          expect(subject[:some_thing_else]).to eq [%i[some bar foo], %i[foo bar]]
         end
       end
 
       describe '#to_hash' do
         it 'returns a Hash representation' do
           parent[:some_thing] = :foo
-          subject[:some_thing] = [:bar, :more]
+          subject[:some_thing] = %i[bar more]
           subject[:some_thing_more] = :foo_bar
           expect(subject.to_hash).to eq(
-            some_thing: [[:bar, :more], :foo],
+            some_thing: [%i[bar more], :foo],
             some_thing_more: [:foo_bar]
           )
         end
@@ -106,12 +106,12 @@ module Grape
           grandchild = described_class.new child
 
           parent[:some_thing] = :foo
-          child[:some_thing] = [:bar, :more]
+          child[:some_thing] = %i[bar more]
           grandchild[:some_thing] = :grand_foo_bar
           grandchild[:some_thing_more] = :foo_bar
 
           expect(grandchild.clone.to_hash).to eq(
-            some_thing: [:grand_foo_bar, [:bar, :more], :foo],
+            some_thing: [:grand_foo_bar, %i[bar more], :foo],
             some_thing_more: [:foo_bar]
           )
         end