grape 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13bf4d5de206b76e7cccbe4ffa454512986457b8f5d055cde0cfac5d4f164a9
-  data.tar.gz: 1177df9af2a24d80e01366f3d705f29e4180898f4cc1ac7e0221e8412e36dcf1
+  metadata.gz: 40277732454d8810e4e96f638da9e6bd4ab818e39ac9c30788791cb4bd429871
+  data.tar.gz: b075dd96ba3dda6fcd05e6b1c126255b5e206b2d6bb9bf9b52f9cd6ec25a6efc
 SHA512:
-  metadata.gz: 32a0d1d9ae7d16b9760f8919814b2aa362ec95a666159a6dc8314946e8a9fd2461d8c074f705ac7afa21939d2a43bec4196a8b7803efdae967b2d01acd1ae77a
-  data.tar.gz: 5ca9d54a6db6bc63107c2bd0b17cb747f293ec72bc3c0d57a7f7514f0c1122774bce82c5411f4fa19f1c7b435d2c3d1d87102e3f83ff5c31aa8a0dc531817e4d
+  metadata.gz: 61d1ef36c90927e08119b6abf57b87fc5317b7b4ac73587d14bc23c9b671e0e76930b89b22d15ec806861f2c60c582647a4f95bc6a1100dca07066be1853d4e6
+  data.tar.gz: 42a4595d466b2092759dee55ad467a6733e29912b0faaf3abe203c18ab1c84b53b6a1d45868102ac16e6b431254664a6762b3ec0b8e52217c777f99adcf965cc

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 1.7.1 (2023/05/14)
+
+#### Features
+
+* [#2288](https://github.com/ruby-grape/grape/pull/2288): Droped support for Ruby 2.5 - [@ericproulx](https://github.com/ericproulx).
+* [#2288](https://github.com/ruby-grape/grape/pull/2288): Updated rubocop to 1.41.0 - [@ericproulx](https://github.com/ericproulx).
+* [#2296](https://github.com/ruby-grape/grape/pull/2296): Fix cops and enables some - [@ericproulx](https://github.com/ericproulx).
+* [#2302](https://github.com/ruby-grape/grape/pull/2302): Rack < 3 and update rack-test - [@ericproulx](https://github.com/ericproulx).
+* [#2303](https://github.com/ruby-grape/grape/pull/2302): Rack >= 1.3.0 - [@ericproulx](https://github.com/ericproulx).
+* [#2301](https://github.com/ruby-grape/grape/pull/2301): Revisit GH workflows - [@ericproulx](https://github.com/ericproulx).
+* [#2311](https://github.com/ruby-grape/grape/pull/2311): Fix tests by pinning rack-test to < 2.1 - [@duffn](https://github.com/duffn).
+* [#2310](https://github.com/ruby-grape/grape/pull/2310): Fix YARD docs markdown rendering - [@duffn](https://github.com/duffn).
+* [#2317](https://github.com/ruby-grape/grape/pull/2317): Remove maruku and rubocop-ast as direct development/testing dependencies - [@ericproulx](https://github.com/ericproulx).
+* [#2292](https://github.com/ruby-grape/grape/pull/2292): Introduce Docker to local development - [@ericproulx](https://github.com/ericproulx).
+* [#2325](https://github.com/ruby-grape/grape/pull/2325): Change edge test workflows only run on demand - [@dblock](https://github.com/dblock).
+* [#2324](https://github.com/ruby-grape/grape/pull/2324): Expose default in the description dsl - [@dhruvCW](https://github.com/dhruvCW).
+
+#### Fixes
+
+* [#2299](https://github.com/ruby-grape/grape/pull/2299): Fix, do not use kwargs for empty args  - [@dm1try](https://github.com/dm1try).
+* [#2307](https://github.com/ruby-grape/grape/pull/2307): Fixed autoloading of InvalidValue - [@fixlr](https://github.com/fixlr).
+* [#2315](https://github.com/ruby-grape/grape/pull/2315): Update rspec - [@ericproulx](https://github.com/ericproulx).
+* [#2319](https://github.com/ruby-grape/grape/pull/2319): Update rubocop - [@ericproulx](https://github.com/ericproulx).
+* [#2323](https://github.com/ruby-grape/grape/pull/2323): Fix using endless ranges for values parameter - [@dhruvCW](https://github.com/dhruvCW).
+
 ### 1.7.0 (2022/12/20)
 
 #### Features

data/CONTRIBUTING.md

@@ -23,6 +23,34 @@ git pull upstream master
 git checkout -b my-feature-branch
 ```
 
+### Docker
+
+If you're familiar with [Docker](https://www.docker.com/), you can run everything through the following command:
+
+```
+docker-compose run --rm --build grape <command_and_parameters>
+```
+
+About the execution process:
+ - displays Ruby, Rubygems, Bundle and Gemfile version when starting:
+    ```
+    ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux-musl]
+    rubygems 3.4.12
+    Bundler version 2.4.1 (2022-12-24 commit f3175f033c)
+    Running default Gemfile
+    ```
+ - keeps the gems to the latest possible version
+ - executes under `bundle exec`
+
+Here are some examples:
+
+- running all specs `docker-compose run --rm --build grape rspec`
+- running rspec on a specific file `docker-compose run --rm --build grape rspec spec/:file_path`
+- running task `docker-compose run --rm --build grape rake <task_name>`
+- running rubocop `docker-compose run --rm --build grape rubocop`
+- running all specs on a specific ruby version (e.g 2.7.7) `RUBY_VERSION=2.7.7 docker-compose run --rm --build grape rspec`
+- running specs on a specific gemfile (e.g rails_7_0.gemfile) `docker-compose run -e GEMFILE=rails_7_0 --rm --build grape rspec`
+
 #### Bundle Install and Test
 
 Ensure that you can build the project and run tests.
@@ -58,6 +86,8 @@ Make sure that `bundle exec rake` completes without errors.
 
 Document any external behavior in the [README](README.md).
 
+You should also document code as necessary, using current code as examples. This project uses [YARD](https://yardoc.org/). You can run and preview the docs locally by [installing `yard`](https://yardoc.org/), running `yard server --reload` and view the docs at http://localhost:8808.
+
 #### Update Changelog
 
 Add a line to [CHANGELOG](CHANGELOG.md) under *Next Release*. Make it look like every other line, including your name and link to your Github account.

data/README.md

@@ -159,7 +159,7 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 1.7.0.
+You're reading the documentation for the stable release of Grape, 1.7.1.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Project Resources
@@ -538,12 +538,12 @@ end
 
 class V1 < Grape::API
   version 'v1'
-  mount BasicAPI, with: { entity: mounted { configuration[:entity] || API::Enitities::Status } }
+  mount BasicAPI, with: { entity: mounted { configuration[:entity] || API::Entities::Status } }
 end
 
 class V2 < Grape::API
   version 'v2'
-  mount BasicAPI, with: { entity: mounted { configuration[:entity] || API::Enitities::V2::Status } }
+  mount BasicAPI, with: { entity: mounted { configuration[:entity] || API::Entities::V2::Status } }
 end
 ```
 
@@ -638,6 +638,7 @@ desc 'Returns your public timeline.' do
   params  API::Entities::Status.documentation
   success API::Entities::Entity
   failure [[401, 'Unauthorized', 'Entities::Error']]
+  default { code: 500, message: 'InvalidRequest', model: Entities::Error }
   named 'My named route'
   headers XAuthToken: {
             description: 'Validates your identity',
@@ -662,8 +663,9 @@ end
 
 * `detail`: A more enhanced description
 * `params`: Define parameters directly from an `Entity`
-* `success`: (former entity) The `Entity` to be used to present by default this route
-* `failure`: (former http_codes) A definition of the used failure HTTP Codes and Entities
+* `success`: (former entity) The `Entity` to be used to present the success response for this route.
+* `failure`: (former http_codes) A definition of the used failure HTTP Codes and Entities.
+* `default`: The definition and `Entity` used to present the default response for this route.
 * `named`: A helper to give a route a name and find it with this name in the documentation Hash
 * `headers`: A definition of the used Headers
 * Other options can be found in [grape-swagger][grape-swagger]
@@ -1586,6 +1588,15 @@ params do
 end
 ```
 
+Note endless ranges are also supported with ActiveSupport >= 6.0, but they require that the type be provided.
+
+```ruby
+params do
+  requires :minimum, type: Integer, values: 10..
+  optional :maximum, type: Integer, values: ..10 
+end
+```
+
 Note that *both* range endpoints have to be a `#kind_of?` your `:type` option (if you don't supply the `:type` option, it will be guessed to be equal to the class of the range's first endpoint). So the following is invalid:
 
 ```ruby
@@ -3340,6 +3351,17 @@ end
 
 Use `body false` to return `204 No Content` without any data or content-type.
 
+If you want to empty the body with an HTTP status code other than `204 No Content`, you can override the status code after specifying `body false` as follows
+
+```ruby
+class API < Grape::API
+  get '/' do
+    body false
+    status 304
+  end
+end
+```
+
 You can also set the response to a file with `sendfile`. This works with the
 [Rack::Sendfile](https://www.rubydoc.info/gems/rack/Rack/Sendfile) middleware to optimally send
 the file through your web server software.

data/grape.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'builder'
   s.add_runtime_dependency 'dry-types', '>= 1.1'
   s.add_runtime_dependency 'mustermann-grape', '~> 1.0.0'
-  s.add_runtime_dependency 'rack', '>= 1.3.0'
+  s.add_runtime_dependency 'rack', '>= 1.3.0', '< 3'
   s.add_runtime_dependency 'rack-accept'
 
   s.files         = %w[CHANGELOG.md CONTRIBUTING.md README.md grape.png UPGRADING.md LICENSE]
@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.files        += Dir['lib/**/*']
   s.test_files    = Dir['spec/**/*']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 end

data/lib/grape/dsl/desc.rb

@@ -98,7 +98,8 @@ module Grape
             :produces,
             :consumes,
             :security,
-            :tags
+            :tags,
+            :default
           )
           config_context.define_singleton_method(:configuration) do
             endpoint_configuration

data/lib/grape/dsl/inside_route.rb

@@ -95,7 +95,7 @@ module Grape
           return yield if has_passed_children
 
           key = params_nested_path[0]
-          key += "[#{params_nested_path[1..-1].join('][')}]" if params_nested_path.size > 1
+          key += "[#{params_nested_path[1..].join('][')}]" if params_nested_path.size > 1
 
           route_options_params = options[:route_options][:params] || {}
           type = route_options_params.dig(key, :type)

data/lib/grape/dsl/parameters.rb

@@ -62,7 +62,12 @@ module Grape
           params_block = named_params.fetch(name) do
             raise "Params :#{name} not found!"
           end
-          instance_exec(**options, &params_block)
+
+          if options.empty?
+            instance_exec(options, &params_block)
+          else
+            instance_exec(**options, &params_block)
+          end
         end
       end
       alias use_scope use

data/lib/grape/dsl/request_response.rb

@@ -125,7 +125,7 @@ module Grape
                 :base_only_rescue_handlers
               end
 
-            namespace_reverse_stackable handler_type, args.map { |arg| [arg, handler] }.to_h
+            namespace_reverse_stackable(handler_type, args.to_h { |arg| [arg, handler] })
           end
 
           namespace_stackable(:rescue_options, options)

data/lib/grape/endpoint.rb

@@ -299,7 +299,7 @@ module Grape
 
       if namespace_inheritable(:version)
         stack.use Grape::Middleware::Versioner.using(namespace_inheritable(:version_options)[:using]),
-                  versions: namespace_inheritable(:version) ? namespace_inheritable(:version).flatten : nil,
+                  versions: namespace_inheritable(:version)&.flatten,
                   version_options: namespace_inheritable(:version_options),
                   prefix: namespace_inheritable(:root_prefix),
                   mount_path: namespace_stackable(:mount_path).first
@@ -325,7 +325,7 @@ module Grape
     private :build_stack, :build_helpers
 
     def execute
-      @block ? @block.call(self) : nil
+      @block&.call(self)
     end
 
     def helpers

data/lib/grape/exceptions/base.rb

@@ -10,9 +10,10 @@ module Grape
       attr_reader :status, :headers
 
       def initialize(status: nil, message: nil, headers: nil, **_options)
+        super(message)
+
         @status  = status
         @headers = headers
-        super(message)
       end
 
       def [](index)

data/lib/grape/middleware/stack.rb

@@ -95,7 +95,7 @@ module Grape
 
       # @return [Rack::Builder] the builder object with our middlewares applied
       def build(builder = Rack::Builder.new)
-        others.shift(others.size).each(&method(:merge_with))
+        others.shift(others.size).each { |m| merge_with(m) }
         middlewares.each do |m|
           m.use_in(builder)
         end

data/lib/grape/request.rb

@@ -47,7 +47,7 @@ module Grape
     end
 
     def transform_header(header)
-      -header[5..-1].split('_').each(&:capitalize!).join('-')
+      -header[5..].split('_').each(&:capitalize!).join('-')
     end
   end
 end

data/lib/grape/router/attribute_translator.rb

@@ -39,7 +39,7 @@ module Grape
 
       def method_missing(method_name, *args)
         if setter?(method_name[-1])
-          attributes[method_name[0..-1]] = *args
+          attributes[method_name[0..]] = *args
         else
           attributes[method_name]
         end

data/lib/grape/types/invalid_value.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# only exists to make it shorter for external use
+module Grape
+  module Types
+    InvalidValue = Class.new(Grape::Validations::Types::InvalidValue)
+  end
+end

data/lib/grape/util/cache.rb

@@ -1,4 +1,4 @@
-# frozen_String_literal: true
+# frozen_string_literal: true
 
 require 'singleton'
 require 'forwardable'

data/lib/grape/validations/params_scope.rb

@@ -485,7 +485,7 @@ module Grape
         values_list.each do |values|
           next if !values || values.is_a?(Proc)
 
-          value_types = values.is_a?(Range) ? [values.begin, values.end] : values
+          value_types = values.is_a?(Range) ? [values.begin, values.end].compact : values
           value_types = value_types.map { |type| Grape::API::Boolean.build(type) } if coerce_type == Grape::API::Boolean
           raise Grape::Exceptions::IncompatibleOptionValues.new(:type, coerce_type, :values, values) unless value_types.all?(coerce_type)
         end

data/lib/grape/validations/types/invalid_value.rb

@@ -15,10 +15,3 @@ module Grape
     end
   end
 end
-
-# only exists to make it shorter for external use
-module Grape
-  module Types
-    InvalidValue = Class.new(Grape::Validations::Types::InvalidValue)
-  end
-end

data/lib/grape/version.rb

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

data/lib/grape.rb

@@ -277,6 +277,14 @@ module Grape
       end
     end
   end
+
+  module Types
+    extend ::ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :InvalidValue
+    end
+  end
 end
 
 require 'grape/config'

data/spec/grape/api_spec.rb

@@ -103,22 +103,6 @@ describe Grape::API do
         }
       end
     end
-
-    # Behavior as defined by rfc2616 when no header is defined
-    # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-    describe 'no specified accept header' do
-      # subject.version 'v1', using: :header
-      # subject.get '/hello' do
-      #   'hello'
-      # end
-
-      # it 'routes' do
-      #   get '/hello'
-      #   last_response.status.should eql 200
-      # end
-    end
-
-    # pending 'routes if any media type is allowed'
   end
 
   describe '.version using accept_version_header' do
@@ -448,9 +432,10 @@ describe Grape::API do
       expect(last_response.body).to eql 'hiya'
     end
 
+    objects = ['string', :symbol, 1, -1.1, {}, [], true, false, nil].freeze
     %i[put post].each do |verb|
       context verb.to_s do
-        ['string', :symbol, 1, -1.1, {}, [], true, false, nil].each do |object|
+        objects.each do |object|
           it "allows a(n) #{object.class} json object in params" do
             subject.format :json
             subject.send(verb) do
@@ -1601,7 +1586,7 @@ describe Grape::API do
 
       subject.get(:hello) { 'Hello, world.' }
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      expect(basic_auth_context).to be_a_kind_of(Grape::Endpoint)
+      expect(basic_auth_context).to be_a(Grape::Endpoint)
     end
 
     it 'has access to helper methods' do
@@ -3067,7 +3052,7 @@ describe Grape::API do
       expect(route.description).to eq('first method')
       expect(route.route_foo).to be_nil
       expect(route.params).to eq({})
-      expect(route.options).to be_a_kind_of(Hash)
+      expect(route.options).to be_a(Hash)
     end
 
     it 'has params which does not include format and version as named captures' do
@@ -3725,7 +3710,7 @@ describe Grape::API do
     it 'sets the instance' do
       expect(subject.instance).to be_nil
       subject.compile
-      expect(subject.instance).to be_kind_of(subject.base_instance)
+      expect(subject.instance).to be_a(subject.base_instance)
     end
   end
 

data/spec/grape/dsl/desc_spec.rb

@@ -26,6 +26,7 @@ module Grape
             detail: 'more details',
             params: { first: :param },
             entity: Object,
+            default: { code: 400, message: 'Invalid' },
             http_codes: [[401, 'Unauthorized', 'Entities::Error']],
             named: 'My named route',
             body_name: 'My body name',
@@ -54,6 +55,7 @@ module Grape
             detail 'more details'
             params(first: :param)
             success Object
+            default code: 400, message: 'Invalid'
             failure [[401, 'Unauthorized', 'Entities::Error']]
             named 'My named route'
             body_name 'My body name'

data/spec/grape/endpoint_spec.rb

@@ -75,7 +75,7 @@ describe Grape::Endpoint do
   it 'sets itself in the env upon call' do
     subject.get('/') { 'Hello world.' }
     get '/'
-    expect(last_request.env['api.endpoint']).to be_kind_of(described_class)
+    expect(last_request.env['api.endpoint']).to be_a(described_class)
   end
 
   describe '#status' do
@@ -140,7 +140,8 @@ describe Grape::Endpoint do
       get '/headers'
       expect(JSON.parse(last_response.body)).to eq(
         'Host' => 'example.org',
-        'Cookie' => ''
+        'Cookie' => '',
+        'Version' => 'HTTP/1.0'
       )
     end
 
@@ -213,10 +214,10 @@ describe Grape::Endpoint do
       end
       get '/test', {}, 'HTTP_COOKIE' => 'delete_this_cookie=1; and_this=2'
       expect(last_response.body).to eq('3')
-      cookies = last_response.headers['Set-Cookie'].split("\n").map do |set_cookie|
+      cookies = last_response.headers['Set-Cookie'].split("\n").to_h do |set_cookie|
         cookie = CookieJar::Cookie.from_set_cookie 'http://localhost/test', set_cookie
         [cookie.name, cookie]
-      end.to_h
+      end
       expect(cookies.size).to eq(2)
       %w[and_this delete_this_cookie].each do |cookie_name|
         cookie = cookies[cookie_name]
@@ -237,10 +238,10 @@ describe Grape::Endpoint do
       end
       get('/test', {}, 'HTTP_COOKIE' => 'delete_this_cookie=1; and_this=2')
       expect(last_response.body).to eq('3')
-      cookies = last_response.headers['Set-Cookie'].split("\n").map do |set_cookie|
+      cookies = last_response.headers['Set-Cookie'].split("\n").to_h do |set_cookie|
         cookie = CookieJar::Cookie.from_set_cookie 'http://localhost/test', set_cookie
         [cookie.name, cookie]
-      end.to_h
+      end
       expect(cookies.size).to eq(2)
       %w[and_this delete_this_cookie].each do |cookie_name|
         cookie = cookies[cookie_name]
@@ -432,7 +433,7 @@ describe Grape::Endpoint do
         end
         post '/upload', { file: '' }, 'CONTENT_TYPE' => 'multipart/form-data; boundary=foobar'
         expect(last_response.status).to eq(400)
-        expect(last_response.body).to eq('empty message body supplied with multipart/form-data; boundary=foobar content-type')
+        expect(last_response.body).to eq('file is invalid')
       end
     end
 

data/spec/grape/exceptions/invalid_accept_header_spec.rb

@@ -10,11 +10,13 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       expect(last_response.body).to eq('beer received')
     end
   end
+
   shared_examples_for 'a cascaded request' do
     it 'does not find a matching route' do
       expect(last_response.status).to eq 404
     end
   end
+
   shared_examples_for 'a not-cascaded request' do
     it 'does not include the X-Cascade=pass header' do
       expect(last_response.headers['X-Cascade']).to be_nil
@@ -24,6 +26,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       expect(last_response.status).to eq 406
     end
   end
+
   shared_examples_for 'a rescued request' do
     it 'does not include the X-Cascade=pass header' do
       expect(last_response.headers['X-Cascade']).to be_nil

data/spec/grape/integration/rack_spec.rb

@@ -27,19 +27,20 @@ describe Rack do
   end
 
   context 'when the app is mounted' do
-    def app
-      @main_app ||= Class.new(Grape::API) do
+    let(:ping_mount) do
+      Class.new(Grape::API) do
         get 'ping'
       end
     end
 
-    let!(:base) do
-      app_to_mount = app
-      Class.new(Grape::API) do
+    let(:app) do
+      app_to_mount = ping_mount
+      app = Class.new(Grape::API) do
         namespace 'namespace' do
           mount app_to_mount
         end
       end
+      Rack::Builder.new(app)
     end
 
     it 'finds the app on the namespace' do

data/spec/grape/middleware/base_spec.rb

@@ -70,18 +70,18 @@ describe Grape::Middleware::Base do
 
   it 'is able to access the response' do
     subject.call({})
-    expect(subject.response).to be_kind_of(Rack::Response)
+    expect(subject.response).to be_a(Rack::Response)
   end
 
   describe '#response' do
     subject do
-      puts described_class
       described_class.new(response)
     end
 
     before { subject.call({}) }
 
     context 'when Array' do
+      let(:rack_response) { Rack::Response.new('test', 204, abc: 1) }
       let(:response) { ->(_) { [204, { abc: 1 }, 'test'] } }
 
       it 'status' do
@@ -97,12 +97,14 @@ describe Grape::Middleware::Base do
       end
 
       it 'returns the memoized Rack::Response instance' do
-        expect(subject.response).to be(subject.response)
+        allow(Rack::Response).to receive(:new).and_return(rack_response)
+        expect(subject.response).to eq(rack_response)
       end
     end
 
     context 'when Rack::Response' do
-      let(:response) { ->(_) { Rack::Response.new('test', 204, abc: 1) } }
+      let(:rack_response) { Rack::Response.new('test', 204, abc: 1) }
+      let(:response) { ->(_) { rack_response } }
 
       it 'status' do
         expect(subject.response.status).to eq(204)
@@ -117,7 +119,7 @@ describe Grape::Middleware::Base do
       end
 
       it 'returns the memoized Rack::Response instance' do
-        expect(subject.response).to be(subject.response)
+        expect(subject.response).to eq(rack_response)
       end
     end
   end

data/spec/grape/middleware/formatter_spec.rb

@@ -13,7 +13,7 @@ describe Grape::Middleware::Formatter do
 
     it 'looks at the bodies for possibly serializable data' do
       _, _, bodies = *subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json')
-      bodies.each { |b| expect(b).to eq(::Grape::Json.dump(body)) }
+      bodies.each { |b| expect(b).to eq(::Grape::Json.dump(body)) } # rubocop:disable RSpec/IteratedExpectation
     end
 
     context 'default format' do
@@ -26,7 +26,7 @@ describe Grape::Middleware::Formatter do
           end
         end
 
-        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('"bar"') }
+        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('"bar"') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
 
@@ -40,7 +40,7 @@ describe Grape::Middleware::Formatter do
           end
         end
 
-        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').to_a.last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') }
+        subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').to_a.last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
 
@@ -53,8 +53,7 @@ describe Grape::Middleware::Formatter do
             '<bar/>'
           end
         end
-
-        subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('<bar/>') }
+        subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('<bar/>') } # rubocop:disable RSpec/IteratedExpectation
       end
     end
   end
@@ -243,6 +242,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
+    content_types = ['application/json', 'application/json; charset=utf-8'].freeze
     %w[POST PATCH PUT DELETE].each do |method|
       context 'when body is not nil or empty' do
         context 'when Content-Type is supported' do
@@ -320,7 +320,7 @@ describe Grape::Middleware::Formatter do
         end
       end
 
-      ['application/json', 'application/json; charset=utf-8'].each do |content_type|
+      content_types.each do |content_type|
         context content_type do
           it "parses the body from #{method} and copies values into rack.request.form_hash" do
             io = StringIO.new('{"is_boolean":true,"string":"thing"}')

data/spec/grape/validations/validators/values_spec.rb

@@ -114,6 +114,13 @@ describe Grape::Validations::Validators::ValuesValidator do
         { type: params[:type] }
       end
 
+      params do
+        optional :type, type: Integer, values: 1..
+      end
+      get '/endless' do
+        { type: params[:type] }
+      end
+
       params do
         requires :type, values: ->(v) { ValuesModel.include? v }
       end
@@ -374,6 +381,18 @@ describe Grape::Validations::Validators::ValuesValidator do
     expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
   end
 
+  it 'validates against values in an endless range', if: ActiveSupport::VERSION::MAJOR >= 6 do
+    get('/endless', type: 10)
+    expect(last_response.status).to eq 200
+    expect(last_response.body).to eq({ type: 10 }.to_json)
+  end
+
+  it 'does not allow an invalid value for a parameter using an endless range', if: ActiveSupport::VERSION::MAJOR >= 6 do
+    get('/endless', type: 0)
+    expect(last_response.status).to eq 400
+    expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
+  end
+
   it 'does not allow non-numeric string value for int value using lambda' do
     get('/lambda_int_val', number: 'foo')
     expect(last_response.status).to eq 400

data/spec/grape/validations_spec.rb

@@ -1071,12 +1071,12 @@ describe Grape::Validations do
             }
             # 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.body.split(', ')).to contain_exactly(
+              '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
@@ -1509,6 +1509,29 @@ describe Grape::Validations do
       end
     end
 
+    context 'with block and empty args' do
+      before do
+        subject.helpers do
+          params :shared_params do |empty_args|
+            optional :param, default: empty_args[:some]
+          end
+        end
+        subject.format :json
+        subject.params do
+          use :shared_params
+        end
+        subject.get '/shared_params' do
+          :ok
+        end
+      end
+
+      it 'works' do
+        get '/shared_params'
+
+        expect(last_response.status).to eq(200)
+      end
+    end
+
     context 'all or none' do
       context 'optional params' do
         before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Michael Bleigh
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +209,7 @@ files:
 - lib/grape/serve_stream/file_body.rb
 - lib/grape/serve_stream/sendfile_response.rb
 - lib/grape/serve_stream/stream_response.rb
+- lib/grape/types/invalid_value.rb
 - lib/grape/util/base_inheritable.rb
 - lib/grape/util/cache.rb
 - lib/grape/util/endpoint_configuration.rb
@@ -276,7 +283,6 @@ files:
 - spec/grape/api_spec.rb
 - spec/grape/config_spec.rb
 - spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/configuration_spec.rb
 - spec/grape/dsl/desc_spec.rb
 - spec/grape/dsl/headers_spec.rb
 - spec/grape/dsl/helpers_spec.rb
@@ -337,7 +343,6 @@ files:
 - spec/grape/util/stackable_values_spec.rb
 - spec/grape/util/strict_hash_configuration_spec.rb
 - spec/grape/validations/attributes_doc_spec.rb
-- spec/grape/validations/attributes_iterator_spec.rb
 - spec/grape/validations/instance_behaivour_spec.rb
 - spec/grape/validations/multiple_attributes_iterator_spec.rb
 - spec/grape/validations/params_scope_spec.rb
@@ -377,10 +382,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.7.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/1.7.0
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.7.0
-post_install_message:
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.7.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/1.7.1
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.7.1
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -388,133 +393,131 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-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/grape/api/custom_validations_spec.rb
-- spec/grape/api/deeply_included_options_spec.rb
-- spec/grape/api/defines_boolean_in_params_spec.rb
-- spec/grape/api/documentation_spec.rb
-- spec/grape/api/inherited_helpers_spec.rb
-- spec/grape/api/instance_spec.rb
-- spec/grape/api/invalid_format_spec.rb
-- spec/grape/api/namespace_parameters_in_route_spec.rb
-- spec/grape/api/nested_helpers_spec.rb
-- spec/grape/api/optional_parameters_in_route_spec.rb
-- spec/grape/api/parameters_modification_spec.rb
-- spec/grape/api/patch_method_helpers_spec.rb
-- spec/grape/api/recognize_path_spec.rb
-- spec/grape/api/required_parameters_in_route_spec.rb
-- spec/grape/api/required_parameters_with_invalid_method_spec.rb
-- spec/grape/api/routes_with_requirements_spec.rb
-- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
-- spec/grape/api/shared_helpers_spec.rb
-- spec/grape/api_remount_spec.rb
-- spec/grape/api_spec.rb
-- spec/grape/config_spec.rb
-- spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/configuration_spec.rb
-- spec/grape/dsl/desc_spec.rb
-- spec/grape/dsl/headers_spec.rb
-- spec/grape/dsl/helpers_spec.rb
-- spec/grape/dsl/inside_route_spec.rb
-- spec/grape/dsl/logger_spec.rb
-- spec/grape/dsl/middleware_spec.rb
-- spec/grape/dsl/parameters_spec.rb
-- spec/grape/dsl/request_response_spec.rb
-- spec/grape/dsl/routing_spec.rb
-- spec/grape/dsl/settings_spec.rb
-- spec/grape/dsl/validations_spec.rb
-- spec/grape/endpoint/declared_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/entity_spec.rb
-- spec/grape/exceptions/base_spec.rb
-- spec/grape/exceptions/body_parse_errors_spec.rb
-- spec/grape/exceptions/invalid_accept_header_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/invalid_response_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/missing_group_type_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/exceptions/unsupported_group_type_spec.rb
-- spec/grape/exceptions/validation_errors_spec.rb
-- spec/grape/exceptions/validation_spec.rb
-- spec/grape/extensions/param_builders/hash_spec.rb
-- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
-- spec/grape/extensions/param_builders/hashie/mash_spec.rb
-- spec/grape/integration/global_namespace_function_spec.rb
-- spec/grape/integration/rack_sendfile_spec.rb
-- spec/grape/integration/rack_spec.rb
-- spec/grape/loading_spec.rb
-- spec/grape/middleware/auth/base_spec.rb
-- spec/grape/middleware/auth/dsl_spec.rb
-- spec/grape/middleware/auth/strategies_spec.rb
-- spec/grape/middleware/base_spec.rb
+- 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/integer_helpers.rb
 - spec/grape/middleware/error_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/formatter_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/param_spec.rb
 - spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner_spec.rb
-- spec/grape/named_api_spec.rb
-- spec/grape/parser_spec.rb
-- spec/grape/path_spec.rb
-- spec/grape/presenters/presenter_spec.rb
-- spec/grape/request_spec.rb
-- spec/grape/util/inheritable_setting_spec.rb
-- spec/grape/util/inheritable_values_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/validations/attributes_doc_spec.rb
-- spec/grape/validations/attributes_iterator_spec.rb
-- spec/grape/validations/instance_behaivour_spec.rb
-- spec/grape/validations/multiple_attributes_iterator_spec.rb
-- spec/grape/validations/params_scope_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/missing_group_type_spec.rb
+- spec/grape/exceptions/unsupported_group_type_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/validations/types/array_coercer_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/attributes_doc_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/validators/all_or_none_spec.rb
-- spec/grape/validations/validators/allow_blank_spec.rb
-- spec/grape/validations/validators/at_least_one_of_spec.rb
-- spec/grape/validations/validators/coerce_spec.rb
-- spec/grape/validations/validators/default_spec.rb
+- spec/grape/validations/validators/regexp_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/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/presence_spec.rb
-- spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/all_or_none_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/zh-CN.yml
-- spec/grape/validations_spec.rb
-- spec/integration/eager_load/eager_load_spec.rb
-- spec/integration/multi_json/json_spec.rb
-- spec/integration/multi_xml/xml_spec.rb
-- spec/shared/versioning_examples.rb
-- spec/spec_helper.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/chunks.rb
-- spec/support/content_type_helpers.rb
-- spec/support/endpoint_faker.rb
-- spec/support/file_streamer.rb
-- spec/support/integer_helpers.rb
-- spec/support/versioned_helpers.rb
+- 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/parser_spec.rb
+- spec/grape/request_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/documentation_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/dsl/validations_spec.rb
+- spec/grape/dsl/parameters_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/routing_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/path_spec.rb

data/spec/grape/dsl/configuration_spec.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Grape
-  module DSL
-    module ConfigurationSpec
-      class Dummy
-        include Grape::DSL::Configuration
-      end
-    end
-    describe Configuration do
-      subject { Class.new(ConfigurationSpec::Dummy) }
-    end
-  end
-end

data/spec/grape/validations/attributes_iterator_spec.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-describe Grape::Validations::AttributesIterator do
-end