grape 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34ddc6f9f11346067b19a6d7f8e333e433a14c1866e68714815a9e8a457487a
-  data.tar.gz: c95b6956bcb2e5f2e61035ec4af7ee3dcaaa53f7743bde69e7363c9a24edc317
+  metadata.gz: fc2b398e9ad95e7e4bb2641bbdaada929d992cd50fb551b56dbafe5f03a75589
+  data.tar.gz: 03765fbe9d5dafb28b531f2a454f06b2ac59d16ea28691036de797b8e64ced06
 SHA512:
-  metadata.gz: fef19eceff9814554a70cc0fa04d24e2cdbbba91af8f663a07a3278694c4cda2664b521d5390a57f8f1ccf7dc41dff85d602423d47aa27c87ca7d73b9d6e64ba
-  data.tar.gz: f1b2f404754216ba613e0250a6788ce9bbd02bd0560f2981c1847ca917398ede0f429ae03cdaf31bd3447e20248310f4ba7837511fe811ceb4ddee3b7c59df23
+  metadata.gz: a078c1c951ff6e5dfee34c78ab04e1f2866be316af23de469db12301ec3c86eb53bcdc9c8ac478aabe02bd3dc34f4772166e49bdf85ef731a051a8d0de73441f
+  data.tar.gz: 7146c097cfced8308f1efb314fb3ace44f30013af8a58a01e9a41a9aca497bd5591c060cabdcc542f25d5660b842548916282541fe869f627538ef51bb083c66

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.5.1 (2020/11/15)
+
+#### Fixes
+
+* Your contribution here.
+* [#2129](https://github.com/ruby-grape/grape/pull/2129): Fix validation error when Required Array nested inside an optional array, for Multiparam validators - [@dwhenry](https://github.com/dwhenry).
+* [#2128](https://github.com/ruby-grape/grape/pull/2128): Fix validation error when Required Array nested inside an optional array - [@dwhenry](https://github.com/dwhenry).
+* [#2127](https://github.com/ruby-grape/grape/pull/2127): Fix a performance issue with dependent params - [@dnesteryuk](https://github.com/dnesteryuk).
+* [#2126](https://github.com/ruby-grape/grape/pull/2126): Fix warnings about redefined attribute accessors in `AttributeTranslator` - [@samsonjs](https://github.com/samsonjs).
+* [#2121](https://github.com/ruby-grape/grape/pull/2121): Fix 2.7 deprecation warning in validator_factory - [@Legogris](https://github.com/Legogris).
+* [#2115](https://github.com/ruby-grape/grape/pull/2115): Fix declared_params regression with multiple allowed types - [@stanhu](https://github.com/stanhu).
+* [#2123](https://github.com/ruby-grape/grape/pull/2123): Fix 2.7 deprecation warning in middleware/stack - [@Legogris](https://github.com/Legogris).
+
 ### 1.5.0 (2020/10/05)
 
 #### Fixes

data/README.md

@@ -156,8 +156,7 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 1.5.0.
-Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
+You're reading the documentation for the stable release of Grape, 1.5.1.
 
 ## Project Resources
 
@@ -2039,10 +2038,10 @@ end
 
 # is NOT the same as
 
-get ':status' do # this makes param[:status] available
+get ':status' do # this makes params[:status] available
 end
 
-# This will make both param[:status_id] and param[:id] available
+# This will make both params[:status_id] and params[:id] available
 
 get 'statuses/:status_id/reviews/:id' do
 end

data/UPGRADING.md

@@ -1,6 +1,28 @@
 Upgrading Grape
 ===============
 
+### Upgrading to >= 1.5.1
+
+#### Dependent params
+
+If you use [dependent params](https://github.com/ruby-grape/grape#dependent-parameters) with
+`Grape::Extensions::Hash::ParamBuilder`, make sure a parameter to be dependent on is set as a Symbol.
+If a String is given, a parameter that other parameters depend on won't be found even if it is present.
+
+_Correct_:
+```ruby
+given :matrix do
+  # dependent params
+end
+```
+
+_Wrong_:
+```ruby
+given 'matrix' do
+  # dependent params
+end
+```
+
 ### Upgrading to >= 1.5.0
 
 Prior to 1.3.3, the `declared` helper would always return the complete params structure if `include_missing=true` was set. In 1.3.3 a regression was introduced such that a missing Hash with or without nested parameters would always resolve to `{}`.

data/lib/grape/dsl/inside_route.rb

@@ -94,7 +94,7 @@ module Grape
 
           if type == 'Hash' && !has_children
             {}
-          elsif type == 'Array' || type&.start_with?('[')
+          elsif type == 'Array' || type&.start_with?('[') && !type&.include?(',')
             []
           elsif type == 'Set' || type&.start_with?('#<Set')
             Set.new

data/lib/grape/dsl/parameters.rb

@@ -227,13 +227,17 @@ module Grape
 
       alias group requires
 
-      def map_params(params, element)
+      class EmptyOptionalValue; end
+
+      def map_params(params, element, is_array = false)
         if params.is_a?(Array)
           params.map do |el|
-            map_params(el, element)
+            map_params(el, element, true)
           end
         elsif params.is_a?(Hash)
-          params[element] || {}
+          params[element] || (@optional && is_array ? EmptyOptionalValue : {})
+        elsif params == EmptyOptionalValue
+          EmptyOptionalValue
         else
           {}
         end

data/lib/grape/middleware/stack.rb

@@ -70,9 +70,9 @@ module Grape
         middlewares[i]
       end
 
-      def insert(index, *args, &block)
+      def insert(index, *args, **kwargs, &block)
         index = assert_index(index, :before)
-        middleware = self.class::Middleware.new(*args, &block)
+        middleware = self.class::Middleware.new(*args, **kwargs, &block)
         middlewares.insert(index, middleware)
       end
 
@@ -83,8 +83,8 @@ module Grape
         insert(index + 1, *args, &block)
       end
 
-      def use(*args, &block)
-        middleware = self.class::Middleware.new(*args, &block)
+      def use(*args, **kwargs, &block)
+        middleware = self.class::Middleware.new(*args, **kwargs, &block)
         middlewares.push(middleware)
       end
 

data/lib/grape/router/attribute_translator.rb

@@ -4,7 +4,7 @@ module Grape
   class Router
     # this could be an OpenStruct, but doesn't work in Ruby 2.3.0, see https://bugs.ruby-lang.org/issues/12251
     class AttributeTranslator
-      attr_reader :attributes, :request_method, :requirements
+      attr_reader :attributes
 
       ROUTE_ATTRIBUTES = %i[
         prefix

data/lib/grape/validations/attributes_iterator.rb

@@ -48,6 +48,14 @@ module Grape
       def yield_attributes(_resource_params, _attrs)
         raise NotImplementedError
       end
+
+      # This is a special case so that we can ignore tree's where option
+      # values are missing lower down. Unfortunately we can remove this
+      # are the parameter parsing stage as they are required to ensure
+      # the correct indexing is maintained
+      def skip?(val)
+        val == Grape::DSL::Parameters::EmptyOptionalValue
+      end
     end
   end
 end

data/lib/grape/validations/multiple_attributes_iterator.rb

@@ -6,7 +6,7 @@ module Grape
       private
 
       def yield_attributes(resource_params, _attrs)
-        yield resource_params
+        yield resource_params, skip?(resource_params)
       end
     end
   end

data/lib/grape/validations/params_scope.rb

@@ -61,8 +61,9 @@ module Grape
         end
 
         return params.any? { |param| meets_dependency?(param, request_params) } if params.is_a?(Array)
-        return false unless params.respond_to?(:with_indifferent_access)
-        params = params.with_indifferent_access
+
+        # params might be anything what looks like a hash, so it must implement a `key?` method
+        return false unless params.respond_to?(:key?)
 
         @dependent_on.each do |dependency|
           if dependency.is_a?(Hash)

data/lib/grape/validations/single_attribute_iterator.rb

@@ -7,7 +7,7 @@ module Grape
 
       def yield_attributes(val, attrs)
         attrs.each do |attr_name|
-          yield val, attr_name, empty?(val)
+          yield val, attr_name, empty?(val), skip?(val)
         end
       end
 

data/lib/grape/validations/validator_factory.rb

@@ -8,7 +8,7 @@ module Grape
                                       options[:options],
                                       options[:required],
                                       options[:params_scope],
-                                      options[:opts])
+                                      **options[:opts])
       end
     end
   end

data/lib/grape/validations/validators/base.rb

@@ -43,7 +43,8 @@ module Grape
         # there may be more than one error per field
         array_errors = []
 
-        attributes.each do |val, attr_name, empty_val|
+        attributes.each do |val, attr_name, empty_val, skip_value|
+          next if skip_value
           next if !@scope.required? && empty_val
           next unless @scope.meets_dependency?(val, params)
           begin

data/lib/grape/validations/validators/multiple_params_base.rb

@@ -7,7 +7,8 @@ module Grape
         attributes = MultipleAttributesIterator.new(self, @scope, params)
         array_errors = []
 
-        attributes.each do |resource_params|
+        attributes.each do |resource_params, skip_value|
+          next if skip_value
           begin
             validate_params!(resource_params)
           rescue Grape::Exceptions::Validation => e

data/lib/grape/version.rb

@@ -2,5 +2,5 @@
 
 module Grape
   # The current version of Grape.
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/spec/grape/endpoint/declared_spec.rb

@@ -16,6 +16,7 @@ describe Grape::Endpoint do
         requires :first
         optional :second
         optional :third, default: 'third-default'
+        optional :multiple_types, types: [Integer, String]
         optional :nested, type: Hash do
           optional :fourth
           optional :fifth
@@ -96,6 +97,16 @@ describe Grape::Endpoint do
       expect(JSON.parse(last_response.body)['nested']['fourth']).to be_nil
     end
 
+    it 'should show nil for multiple allowed types if 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)['multiple_types']).to be_nil
+    end
+
     it 'does not work in a before filter' do
       subject.before do
         declared(params)
@@ -113,7 +124,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(10)
+      expect(JSON.parse(last_response.body).keys.size).to eq(11)
     end
 
     it 'has a optional param with default value all the time' do

data/spec/grape/validations/multiple_attributes_iterator_spec.rb

@@ -13,8 +13,8 @@ describe Grape::Validations::MultipleAttributesIterator do
         { first: 'string', second: 'string' }
       end
 
-      it 'yields the whole params hash without the list of attrs' do
-        expect { |b| iterator.each(&b) }.to yield_with_args(params)
+      it 'yields the whole params hash and the skipped flag without the list of attrs' do
+        expect { |b| iterator.each(&b) }.to yield_with_args(params, false)
       end
     end
 
@@ -24,7 +24,17 @@ describe Grape::Validations::MultipleAttributesIterator do
       end
 
       it 'yields each element of the array without the list of attrs' do
-        expect { |b| iterator.each(&b) }.to yield_successive_args(params[0], params[1])
+        expect { |b| iterator.each(&b) }.to yield_successive_args([params[0], false], [params[1], false])
+      end
+    end
+
+    context 'when params is empty optional placeholder' do
+      let(:params) do
+        [Grape::DSL::Parameters::EmptyOptionalValue, { first: 'string2', second: 'string2' }]
+      end
+
+      it 'yields each element of the array without the list of attrs' do
+        expect { |b| iterator.each(&b) }.to yield_successive_args([Grape::DSL::Parameters::EmptyOptionalValue, true], [params[1], false])
       end
     end
   end

data/spec/grape/validations/single_attribute_iterator_spec.rb

@@ -15,7 +15,7 @@ describe Grape::Validations::SingleAttributeIterator do
 
       it 'yields params and every single attribute from the list' do
         expect { |b| iterator.each(&b) }
-          .to yield_successive_args([params, :first, false], [params, :second, false])
+          .to yield_successive_args([params, :first, false, false], [params, :second, false, false])
       end
     end
 
@@ -26,8 +26,8 @@ describe Grape::Validations::SingleAttributeIterator do
 
       it 'yields every single attribute from the list for each of the array elements' do
         expect { |b| iterator.each(&b) }.to yield_successive_args(
-          [params[0], :first, false], [params[0], :second, false],
-          [params[1], :first, false], [params[1], :second, false]
+          [params[0], :first, false, false], [params[0], :second, false, false],
+          [params[1], :first, false, false], [params[1], :second, false, false]
         )
       end
 
@@ -36,9 +36,20 @@ describe Grape::Validations::SingleAttributeIterator do
 
         it 'marks params with empty values' do
           expect { |b| iterator.each(&b) }.to yield_successive_args(
-            [params[0], :first, true], [params[0], :second, true],
-            [params[1], :first, true], [params[1], :second, true],
-            [params[2], :first, false], [params[2], :second, false]
+            [params[0], :first, true, false], [params[0], :second, true, false],
+            [params[1], :first, true, false], [params[1], :second, true, false],
+            [params[2], :first, false, false], [params[2], :second, false, false]
+          )
+        end
+      end
+
+      context 'when missing optional value' do
+        let(:params) { [Grape::DSL::Parameters::EmptyOptionalValue, 10] }
+
+        it 'marks params with skipped values' do
+          expect { |b| iterator.each(&b) }.to yield_successive_args(
+            [params[0], :first, false, true], [params[0], :second, false, true],
+            [params[1], :first, false, false], [params[1], :second, false, false],
           )
         end
       end

data/spec/grape/validations_spec.rb

@@ -883,6 +883,274 @@ describe Grape::Validations do
         end
         expect(declared_params).to eq([items: [:key, { optional_subitems: [:value] }, { required_subitems: [:value] }]])
       end
+
+      context <<~DESC do
+        Issue occurs whenever:
+        * param structure with at least three levels
+        * 1st level item is a required Array that has >1 entry with an optional item present and >1 entry with an optional item missing  
+        * 2nd level is an optional Array or Hash 
+        * 3rd level is a required item (can be any type)
+        * additional levels do not effect the issue from occuring
+      DESC
+
+        it "example based off actual real world use case" do
+          subject.params do
+            requires :orders, type: Array do
+              requires :id, type: Integer
+              optional :drugs, type: Array do
+                requires :batches, type: Array do
+                  requires :batch_no, type: String
+                end
+              end
+            end
+          end
+
+          subject.get '/validate_required_arrays_under_optional_arrays' do
+            'validate_required_arrays_under_optional_arrays works!'
+          end
+
+          data = {
+            orders: [
+              { id: 77, drugs: [{batches: [{batch_no: "A1234567"}]}]},
+              { id: 70 }
+            ]
+          }
+
+          get '/validate_required_arrays_under_optional_arrays', data
+          expect(last_response.body).to eq("validate_required_arrays_under_optional_arrays works!")
+          expect(last_response.status).to eq(200)
+        end
+
+        it "simplest example using Arry -> Array -> Hash -> String" do
+          subject.params do
+            requires :orders, type: Array do
+              requires :id, type: Integer
+              optional :drugs, type: Array do
+                requires :batch_no, type: String
+              end
+            end
+          end
+
+          subject.get '/validate_required_arrays_under_optional_arrays' do
+            'validate_required_arrays_under_optional_arrays works!'
+          end
+
+          data = {
+            orders: [
+              { id: 77, drugs: [{batch_no: "A1234567"}]},
+              { id: 70 }
+            ]
+          }
+
+          get '/validate_required_arrays_under_optional_arrays', data
+          expect(last_response.body).to eq("validate_required_arrays_under_optional_arrays works!")
+          expect(last_response.status).to eq(200)
+        end
+
+        it "simplest example using Arry -> Hash -> String" do
+          subject.params do
+            requires :orders, type: Array do
+              requires :id, type: Integer
+              optional :drugs, type: Hash do
+                requires :batch_no, type: String
+              end
+            end
+          end
+
+          subject.get '/validate_required_arrays_under_optional_arrays' do
+            'validate_required_arrays_under_optional_arrays works!'
+          end
+
+          data = {
+            orders: [
+              { id: 77, drugs: {batch_no: "A1234567"}},
+              { id: 70 }
+            ]
+          }
+
+          get '/validate_required_arrays_under_optional_arrays', data
+          expect(last_response.body).to eq("validate_required_arrays_under_optional_arrays works!")
+          expect(last_response.status).to eq(200)
+        end
+
+        it "correctly indexes invalida data" do
+          subject.params do
+            requires :orders, type: Array do
+              requires :id, type: Integer
+              optional :drugs, type: Array do
+                requires :batch_no, type: String
+                requires :quantity, type: Integer
+              end
+            end
+          end
+
+          subject.get '/correctly_indexes' do
+            'correctly_indexes works!'
+          end
+
+          data = {
+            orders: [
+              { id: 70 },
+              { id: 77, drugs: [{batch_no: "A1234567", quantity: 12}, {batch_no: "B222222"}]}
+            ]
+          }
+
+          get '/correctly_indexes', data
+          expect(last_response.body).to eq("orders[1][drugs][1][quantity] is missing")
+          expect(last_response.status).to eq(400)
+        end
+
+        context "multiple levels of optional and requires settings" do
+          before do
+            subject.params do
+              requires :top, type: Array do
+                requires :top_id, type: Integer, allow_blank: false
+                optional :middle_1, type: Array do
+                  requires :middle_1_id, type: Integer, allow_blank: false
+                  optional :middle_2, type: Array do
+                    requires :middle_2_id, type: String, allow_blank: false
+                    optional :bottom, type: Array do
+                      requires :bottom_id, type: Integer, allow_blank: false
+                    end
+                  end
+                end
+              end
+            end
+
+            subject.get '/multi_level' do
+              'multi_level works!'
+            end
+          end
+
+          it "with valid data" do
+            data = {
+              top: [
+                { top_id: 1, middle_1: [
+                  {middle_1_id: 11}, {middle_1_id: 12, middle_2: [
+                    {middle_2_id: 121}, {middle_2_id: 122, bottom: [{bottom_id: 1221}]}]}]},
+                { top_id: 2, middle_1: [
+                  {middle_1_id: 21}, {middle_1_id: 22, middle_2: [
+                  {middle_2_id: 221}]}]},
+                { top_id: 3, middle_1: [
+                  {middle_1_id: 31}, {middle_1_id: 32}]},
+                { top_id: 4 }
+              ]
+            }
+
+            get '/multi_level', data
+            expect(last_response.body).to eq("multi_level works!")
+            expect(last_response.status).to eq(200)
+          end
+
+          it "with invalid data" do
+            data = {
+              top: [
+                { top_id: 1, middle_1: [
+                  {middle_1_id: 11}, {middle_1_id: 12, middle_2: [
+                  {middle_2_id: 121}, {middle_2_id: 122, bottom: [{bottom_id: nil}]}]}]},
+                { top_id: 2, middle_1: [
+                  {middle_1_id: 21}, {middle_1_id: 22, middle_2: [{middle_2_id: nil}]}]},
+                { top_id: 3, middle_1: [
+                  {middle_1_id: nil}, {middle_1_id: 32}]},
+                { top_id: nil, missing_top_id: 4 }
+              ]
+            }
+            # debugger
+            get '/multi_level', data
+            expect(last_response.body.split(", ")).to match_array([
+              "top[3][top_id] is empty",
+              "top[2][middle_1][0][middle_1_id] is empty",
+              "top[1][middle_1][1][middle_2][0][middle_2_id] is empty",
+              "top[0][middle_1][1][middle_2][1][bottom][0][bottom_id] is empty"
+            ])
+            expect(last_response.status).to eq(400)
+          end
+        end
+      end
+
+      it "exactly_one_of" do
+        subject.params do
+          requires :orders, type: Array do
+            requires :id, type: Integer
+            optional :drugs, type: Hash do
+              optional :batch_no, type: String
+              optional :batch_id, type: String
+              exactly_one_of :batch_no, :batch_id
+            end
+          end
+        end
+
+        subject.get '/exactly_one_of' do
+          'exactly_one_of works!'
+        end
+
+        data = {
+          orders: [
+            { id: 77, drugs: {batch_no: "A1234567"}},
+            { id: 70 }
+          ]
+        }
+
+        get '/exactly_one_of', data
+        expect(last_response.body).to eq("exactly_one_of works!")
+        expect(last_response.status).to eq(200)
+      end
+
+      it "at_least_one_of" do
+        subject.params do
+          requires :orders, type: Array do
+            requires :id, type: Integer
+            optional :drugs, type: Hash do
+              optional :batch_no, type: String
+              optional :batch_id, type: String
+              at_least_one_of :batch_no, :batch_id
+            end
+          end
+        end
+
+        subject.get '/at_least_one_of' do
+          'at_least_one_of works!'
+        end
+
+        data = {
+          orders: [
+            { id: 77, drugs: {batch_no: "A1234567"}},
+            { id: 70 }
+          ]
+        }
+
+        get '/at_least_one_of', data
+        expect(last_response.body).to eq("at_least_one_of works!")
+        expect(last_response.status).to eq(200)
+      end
+
+      it "all_or_none_of" do
+        subject.params do
+          requires :orders, type: Array do
+            requires :id, type: Integer
+            optional :drugs, type: Hash do
+              optional :batch_no, type: String
+              optional :batch_id, type: String
+              all_or_none_of :batch_no, :batch_id
+            end
+          end
+        end
+
+        subject.get '/all_or_none_of' do
+          'all_or_none_of works!'
+        end
+
+        data = {
+          orders: [
+            { id: 77, drugs: {batch_no: "A1234567", batch_id: "12"}},
+            { id: 70 }
+          ]
+        }
+
+        get '/all_or_none_of', data
+        expect(last_response.body).to eq("all_or_none_of works!")
+        expect(last_response.status).to eq(200)
+      end
     end
 
     context 'multiple validation errors' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Michael Bleigh
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -369,10 +369,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.5.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/1.5.0
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.5.0
-post_install_message:
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.5.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/1.5.1
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.5.1
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -387,123 +387,123 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
-- spec/spec_helper.rb
-- spec/integration/eager_load/eager_load_spec.rb
-- spec/integration/multi_xml/xml_spec.rb
-- spec/integration/multi_json/json_spec.rb
 - spec/shared/versioning_examples.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/endpoint_faker.rb
-- spec/support/chunks.rb
-- spec/support/file_streamer.rb
 - spec/support/versioned_helpers.rb
 - spec/support/content_type_helpers.rb
 - spec/support/eager_load.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/file_streamer.rb
+- spec/support/chunks.rb
+- spec/support/endpoint_faker.rb
 - spec/support/integer_helpers.rb
-- spec/grape/middleware/error_spec.rb
-- spec/grape/middleware/globals_spec.rb
-- spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/auth/strategies_spec.rb
-- spec/grape/middleware/auth/dsl_spec.rb
-- spec/grape/middleware/auth/base_spec.rb
-- spec/grape/middleware/stack_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/versioner_spec.rb
-- spec/grape/middleware/versioner/accept_version_header_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/base_spec.rb
-- spec/grape/config_spec.rb
-- spec/grape/loading_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/api_spec.rb
-- spec/grape/util/reverse_stackable_values_spec.rb
-- spec/grape/util/stackable_values_spec.rb
-- spec/grape/util/inheritable_setting_spec.rb
-- spec/grape/util/strict_hash_configuration_spec.rb
-- spec/grape/util/inheritable_values_spec.rb
-- spec/grape/integration/rack_spec.rb
-- spec/grape/integration/rack_sendfile_spec.rb
-- spec/grape/integration/global_namespace_function_spec.rb
-- spec/grape/validations_spec.rb
-- spec/grape/entity_spec.rb
-- spec/grape/exceptions/validation_spec.rb
-- spec/grape/exceptions/invalid_accept_header_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/invalid_response_spec.rb
-- spec/grape/exceptions/body_parse_errors_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/validation_errors_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/base_spec.rb
-- spec/grape/presenters/presenter_spec.rb
-- spec/grape/validations/single_attribute_iterator_spec.rb
+- spec/grape/api/namespace_parameters_in_route_spec.rb
+- spec/grape/api/routes_with_requirements_spec.rb
+- spec/grape/api/nested_helpers_spec.rb
+- spec/grape/api/required_parameters_in_route_spec.rb
+- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
+- spec/grape/api/parameters_modification_spec.rb
+- spec/grape/api/optional_parameters_in_route_spec.rb
+- spec/grape/api/inherited_helpers_spec.rb
+- spec/grape/api/required_parameters_with_invalid_method_spec.rb
+- spec/grape/api/custom_validations_spec.rb
+- spec/grape/api/defines_boolean_in_params_spec.rb
+- spec/grape/api/shared_helpers_spec.rb
+- spec/grape/api/invalid_format_spec.rb
+- spec/grape/api/deeply_included_options_spec.rb
+- spec/grape/api/instance_spec.rb
+- spec/grape/api/patch_method_helpers_spec.rb
+- spec/grape/api/recognize_path_spec.rb
+- spec/grape/api_remount_spec.rb
+- spec/grape/validations/types_spec.rb
 - spec/grape/validations/attributes_iterator_spec.rb
-- spec/grape/validations/types/primitive_coercer_spec.rb
-- spec/grape/validations/types/set_coercer_spec.rb
 - spec/grape/validations/types/array_coercer_spec.rb
-- spec/grape/validations/params_scope_spec.rb
-- spec/grape/validations/instance_behaivour_spec.rb
-- spec/grape/validations/multiple_attributes_iterator_spec.rb
-- spec/grape/validations/types_spec.rb
+- spec/grape/validations/types/set_coercer_spec.rb
+- spec/grape/validations/types/primitive_coercer_spec.rb
 - spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/default_spec.rb
+- spec/grape/validations/validators/values_spec.rb
+- spec/grape/validations/validators/same_as_spec.rb
 - spec/grape/validations/validators/mutual_exclusion_spec.rb
-- spec/grape/validations/validators/exactly_one_of_spec.rb
 - spec/grape/validations/validators/except_values_spec.rb
-- spec/grape/validations/validators/presence_spec.rb
-- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/validators/exactly_one_of_spec.rb
 - spec/grape/validations/validators/allow_blank_spec.rb
-- spec/grape/validations/validators/same_as_spec.rb
-- spec/grape/validations/validators/default_spec.rb
-- spec/grape/validations/validators/values_spec.rb
-- spec/grape/validations/validators/at_least_one_of_spec.rb
 - spec/grape/validations/validators/coerce_spec.rb
+- spec/grape/validations/validators/presence_spec.rb
+- spec/grape/validations/validators/at_least_one_of_spec.rb
 - spec/grape/validations/validators/zh-CN.yml
-- spec/grape/extensions/param_builders/hashie/mash_spec.rb
-- spec/grape/extensions/param_builders/hash_spec.rb
-- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
+- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/params_scope_spec.rb
+- spec/grape/validations/multiple_attributes_iterator_spec.rb
+- spec/grape/validations/instance_behaivour_spec.rb
+- spec/grape/validations/single_attribute_iterator_spec.rb
+- spec/grape/config_spec.rb
 - spec/grape/parser_spec.rb
-- spec/grape/request_spec.rb
+- spec/grape/exceptions/body_parse_errors_spec.rb
+- spec/grape/exceptions/missing_option_spec.rb
+- spec/grape/exceptions/invalid_accept_header_spec.rb
+- spec/grape/exceptions/validation_spec.rb
+- spec/grape/exceptions/unknown_validator_spec.rb
+- spec/grape/exceptions/validation_errors_spec.rb
+- spec/grape/exceptions/invalid_response_spec.rb
+- spec/grape/exceptions/unknown_options_spec.rb
+- spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/invalid_versioner_option_spec.rb
+- spec/grape/exceptions/missing_mime_type_spec.rb
+- spec/grape/exceptions/base_spec.rb
+- spec/grape/path_spec.rb
+- spec/grape/util/stackable_values_spec.rb
+- spec/grape/util/strict_hash_configuration_spec.rb
+- spec/grape/util/inheritable_setting_spec.rb
+- spec/grape/util/reverse_stackable_values_spec.rb
+- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
+- spec/grape/extensions/param_builders/hash_spec.rb
+- spec/grape/extensions/param_builders/hashie/mash_spec.rb
+- spec/grape/integration/rack_spec.rb
+- spec/grape/integration/rack_sendfile_spec.rb
+- spec/grape/integration/global_namespace_function_spec.rb
 - spec/grape/endpoint/declared_spec.rb
-- spec/grape/api/parameters_modification_spec.rb
-- spec/grape/api/patch_method_helpers_spec.rb
-- spec/grape/api/required_parameters_with_invalid_method_spec.rb
-- spec/grape/api/nested_helpers_spec.rb
-- spec/grape/api/defines_boolean_in_params_spec.rb
-- spec/grape/api/invalid_format_spec.rb
-- spec/grape/api/required_parameters_in_route_spec.rb
-- spec/grape/api/instance_spec.rb
-- spec/grape/api/namespace_parameters_in_route_spec.rb
-- spec/grape/api/recognize_path_spec.rb
-- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
-- spec/grape/api/inherited_helpers_spec.rb
-- spec/grape/api/shared_helpers_spec.rb
-- spec/grape/api/deeply_included_options_spec.rb
-- spec/grape/api/routes_with_requirements_spec.rb
-- spec/grape/api/custom_validations_spec.rb
-- spec/grape/api/optional_parameters_in_route_spec.rb
-- spec/grape/api_remount_spec.rb
-- spec/grape/named_api_spec.rb
-- spec/grape/dsl/request_response_spec.rb
-- spec/grape/dsl/desc_spec.rb
-- spec/grape/dsl/logger_spec.rb
+- spec/grape/presenters/presenter_spec.rb
+- spec/grape/endpoint_spec.rb
+- spec/grape/api_spec.rb
+- spec/grape/middleware/exception_spec.rb
+- spec/grape/middleware/versioner/param_spec.rb
+- spec/grape/middleware/versioner/header_spec.rb
+- spec/grape/middleware/versioner/path_spec.rb
+- spec/grape/middleware/versioner/accept_version_header_spec.rb
+- spec/grape/middleware/globals_spec.rb
+- spec/grape/middleware/stack_spec.rb
+- spec/grape/middleware/formatter_spec.rb
+- spec/grape/middleware/error_spec.rb
+- spec/grape/middleware/auth/dsl_spec.rb
+- spec/grape/middleware/auth/strategies_spec.rb
+- spec/grape/middleware/auth/base_spec.rb
+- spec/grape/middleware/versioner_spec.rb
+- spec/grape/middleware/base_spec.rb
+- spec/grape/entity_spec.rb
+- spec/grape/dsl/settings_spec.rb
+- spec/grape/dsl/callbacks_spec.rb
+- spec/grape/dsl/middleware_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
 - spec/grape/dsl/configuration_spec.rb
-- spec/grape/dsl/validations_spec.rb
 - spec/grape/dsl/parameters_spec.rb
+- spec/grape/dsl/logger_spec.rb
 - spec/grape/dsl/helpers_spec.rb
-- spec/grape/dsl/middleware_spec.rb
-- spec/grape/dsl/headers_spec.rb
-- spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/settings_spec.rb
+- spec/grape/dsl/request_response_spec.rb
 - spec/grape/dsl/routing_spec.rb
-- spec/grape/dsl/inside_route_spec.rb
-- spec/grape/path_spec.rb
+- spec/grape/dsl/headers_spec.rb
+- spec/grape/dsl/validations_spec.rb
+- spec/grape/dsl/desc_spec.rb
+- spec/grape/validations_spec.rb
+- spec/grape/named_api_spec.rb
+- spec/grape/loading_spec.rb
+- spec/grape/request_spec.rb
+- spec/integration/eager_load/eager_load_spec.rb
+- spec/integration/multi_xml/xml_spec.rb
+- spec/integration/multi_json/json_spec.rb
+- spec/spec_helper.rb