grape 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f03f5db37edb93b40fa1b9addead63466a5c1f49740c4f1c1335eabb3dd93ff1
-  data.tar.gz: 0e42696b25c1ee096e15d6e808262904ba61d85d9faa7d008a052ff3cd553de9
+  metadata.gz: 68c3425fcc271ae7241f0531bbd9cb6c466aca9ccfed37dc37c0a6f83a4500d2
+  data.tar.gz: d98863b6374c5e25bb95a101c891c0c97b4f3746c9be0c6d7cc4b5b03f1f30fd
 SHA512:
-  metadata.gz: d98db4f7e9cf7884f52a349bf28bad16fc62dc93a3019e808c0b7497e872334a7462353a35dd19f6cc09d2566421902984562586d2d22dfd6a6db40e37ac276a
-  data.tar.gz: 210ce14f0ef502d9a18fd4a7b24b111ca5d69b6689fd5b0bb629c8d5c072afd9576a6834f36764e9d5e4e5a92c1372b7962aff9500d9d9f7f561879cc6bac247
+  metadata.gz: '059861dafdf89f21d71b23c09e8f5f618ebd42092af31600a3943e0ba9695abd4ee01e90f3cae97aedb7ae777c96e22e3963cab3d4527fcbf16b82ef19939a99'
+  data.tar.gz: feb02e6b1db04867d06b62d2096931c762028f7b5bf8776f13bf4a5902f4b70b538f016a7f5ada98ffa7fd3f1e22e16054fc229f33fcabf8cf3d8486a956d4c7

data/CHANGELOG.md

@@ -1,8 +1,28 @@
-### 3.1.1 (2026-01-31)
+### 3.2.0 (Next)
+
+#### Features
+
+* [#2662](https://github.com/ruby-grape/grape/pull/2662): Extract `Grape::Util::Translation` for shared I18n fallback logic - [@ericproulx](https://github.com/ericproulx).
+* [#2656](https://github.com/ruby-grape/grape/pull/2656): Remove useless instance_variable_defined? checks - [@ericproulx](https://github.com/ericproulx).
+* [#2619](https://github.com/ruby-grape/grape/pull/2619): Remove TOC from README.md and danger-toc check - [@alexanderadam](https://github.com/alexanderadam).
+* [#2663](https://github.com/ruby-grape/grape/pull/2663): Refactor `ParamsScope` and `Parameters` DSL to use named kwargs - [@ericproulx](https://github.com/ericproulx).
+* [#2664](https://github.com/ruby-grape/grape/pull/2664): Drop `test-prof` dependency - [@ericproulx](https://github.com/ericproulx).
+* [#2665](https://github.com/ruby-grape/grape/pull/2665): Pass `attrs` directly to `AttributesIterator` instead of `validator` - [@ericproulx](https://github.com/ericproulx).
+* [#2657](https://github.com/ruby-grape/grape/pull/2657): Instantiate validators at definition time - [@ericproulx](https://github.com/ericproulx).
+* [#2667](https://github.com/ruby-grape/grape/pull/2667): Skip instrumentation in run_validators when no validators present - [@ericproulx](https://github.com/ericproulx).
+* [#2670](https://github.com/ruby-grape/grape/pull/2670): Added support for Rack 3.2.6 and better handling to rack exceptions - [@ericproulx](https://github.com/ericproulx).
+* [#2671](https://github.com/ruby-grape/grape/pull/2671): Use ruby 3.1 shorthand kwargs syntax - [@ericproulx](https://github.com/ericproulx).
+* [#2672](https://github.com/ruby-grape/grape/pull/2672): Minor ruby optimizations - [@ericproulx](https://github.com/ericproulx).
+* [#2675](https://github.com/ruby-grape/grape/pull/2675): Add `AGENTS.md` to please our future A.I. overlords - [@dblock](https://github.com/dblock).
 
 #### Fixes
 
+* [#2670](https://github.com/ruby-grape/grape/pull/2670): Fix `UnknownAuthStrategy` raised when custom auth strategy class inherits from `Grape::Middleware::Auth::Base` - [@dblock](https://github.com/dblock).
 * [#2655](https://github.com/ruby-grape/grape/pull/2655): Fix `before_each` method to handle `nil` parameter correctly - [@ericproulx](https://github.com/ericproulx).
+* [#2660](https://github.com/ruby-grape/grape/pull/2660): Fix thread safety: move mutable `ParamsScope` state (`index`, `params_meeting_dependency`) into a per-request `ParamScopeTracker` stored in `Fiber[]` - [@ericproulx](https://github.com/ericproulx).
+* [#2666](https://github.com/ruby-grape/grape/pull/2666): Endpoint cleanup and minor optimizations - [@ericproulx](https://github.com/ericproulx).
+* [#2676](https://github.com/ruby-grape/grape/pull/2676): Exclude ruby 3.2 for rails_edge - [@ericproulx](https://github.com/ericproulx).
+* [#2677](https://github.com/ruby-grape/grape/pull/2677): Update actions/checkout to v6 - [@ericproulx](https://github.com/ericproulx).
 
 ### 3.1.0 (2026-01-25)
 

data/README.md

@@ -4,163 +4,13 @@
 [![test](https://github.com/ruby-grape/grape/actions/workflows/test.yml/badge.svg)](https://github.com/ruby-grape/grape/actions/workflows/test.yml)
 [![Coverage Status](https://coveralls.io/repos/github/ruby-grape/grape/badge.svg?branch=master)](https://coveralls.io/github/ruby-grape/grape?branch=master)
 
-## Table of Contents
-
-- [What is Grape?](#what-is-grape)
-- [Stable Release](#stable-release)
-- [Project Resources](#project-resources)
-- [Grape for Enterprise](#grape-for-enterprise)
-- [Installation](#installation)
-- [Basic Usage](#basic-usage)
-- [Rails 7.1](#rails-71)
-- [Mounting](#mounting)
-  - [All](#all)
-  - [Rack](#rack)
-  - [Alongside Sinatra (or other frameworks)](#alongside-sinatra-or-other-frameworks)
-  - [Rails](#rails)
-    - [Zeitwerk](#zeitwerk)
-  - [Modules](#modules)
-- [Remounting](#remounting)
-  - [Mount Configuration](#mount-configuration)
-- [Versioning](#versioning)
-  - [Strategies](#strategies)
-    - [Path](#path)
-    - [Header](#header)
-    - [Accept-Version Header](#accept-version-header)
-    - [Param](#param)
-- [Linting](#linting)
-  - [Bug in Rack::ETag under Rack 3.X](#bug-in-racketag-under-rack-3x)
-- [Describing Methods](#describing-methods)
-- [Configuration](#configuration)
-- [Parameters](#parameters)
-  - [Params Class](#params-class)
-  - [Declared](#declared)
-  - [Include Parent Namespaces](#include-parent-namespaces)
-  - [Include Missing](#include-missing)
-  - [Evaluate Given](#evaluate-given)
-  - [Parameter Precedence](#parameter-precedence)
-- [Parameter Validation and Coercion](#parameter-validation-and-coercion)
-  - [Supported Parameter Types](#supported-parameter-types)
-  - [Integer/Fixnum and Coercions](#integerfixnum-and-coercions)
-  - [Custom Types and Coercions](#custom-types-and-coercions)
-  - [Multipart File Parameters](#multipart-file-parameters)
-  - [First-Class JSON Types](#first-class-json-types)
-  - [Multiple Allowed Types](#multiple-allowed-types)
-  - [Validation of Nested Parameters](#validation-of-nested-parameters)
-  - [Dependent Parameters](#dependent-parameters)
-  - [Group Options](#group-options)
-  - [Renaming](#renaming)
-  - [Built-in Validators](#built-in-validators)
-    - [allow_blank](#allow_blank)
-    - [values](#values)
-    - [except_values](#except_values)
-    - [same_as](#same_as)
-    - [length](#length)
-    - [regexp](#regexp)
-    - [mutually_exclusive](#mutually_exclusive)
-    - [exactly_one_of](#exactly_one_of)
-    - [at_least_one_of](#at_least_one_of)
-    - [all_or_none_of](#all_or_none_of)
-    - [Nested mutually_exclusive, exactly_one_of, at_least_one_of, all_or_none_of](#nested-mutually_exclusive-exactly_one_of-at_least_one_of-all_or_none_of)
-  - [Namespace Validation and Coercion](#namespace-validation-and-coercion)
-  - [Custom Validators](#custom-validators)
-  - [Validation Errors](#validation-errors)
-  - [I18n](#i18n)
-  - [Custom Validation messages](#custom-validation-messages)
-    - [presence, allow_blank, values, regexp](#presence-allow_blank-values-regexp)
-    - [same_as](#same_as-1)
-    - [length](#length-1)
-    - [all_or_none_of](#all_or_none_of-1)
-    - [mutually_exclusive](#mutually_exclusive-1)
-    - [exactly_one_of](#exactly_one_of-1)
-    - [at_least_one_of](#at_least_one_of-1)
-    - [Coerce](#coerce)
-    - [With Lambdas](#with-lambdas)
-    - [Pass symbols for i18n translations](#pass-symbols-for-i18n-translations)
-    - [Overriding Attribute Names](#overriding-attribute-names)
-    - [With Default](#with-default)
-  - [Using dry-validation or dry-schema](#using-dry-validation-or-dry-schema)
-- [Headers](#headers)
-  - [Request](#request)
-    - [Header Case Handling](#header-case-handling)
-  - [Response](#response)
-- [Routes](#routes)
-- [Helpers](#helpers)
-- [Path Helpers](#path-helpers)
-- [Parameter Documentation](#parameter-documentation)
-- [Cookies](#cookies)
-- [HTTP Status Code](#http-status-code)
-- [Redirecting](#redirecting)
-- [Recognizing Path](#recognizing-path)
-- [Allowed Methods](#allowed-methods)
-- [Raising Exceptions](#raising-exceptions)
-  - [Default Error HTTP Status Code](#default-error-http-status-code)
-  - [Handling 404](#handling-404)
-- [Exception Handling](#exception-handling)
-    - [Rescuing exceptions inside namespaces](#rescuing-exceptions-inside-namespaces)
-    - [Unrescuable Exceptions](#unrescuable-exceptions)
-    - [Exceptions that should be rescued explicitly](#exceptions-that-should-be-rescued-explicitly)
-- [Logging](#logging)
-- [API Formats](#api-formats)
-  - [JSONP](#jsonp)
-  - [CORS](#cors)
-- [Content-type](#content-type)
-- [API Data Formats](#api-data-formats)
-- [JSON and XML Processors](#json-and-xml-processors)
-- [RESTful Model Representations](#restful-model-representations)
-  - [Grape Entities](#grape-entities)
-  - [Hypermedia and Roar](#hypermedia-and-roar)
-  - [Rabl](#rabl)
-  - [Active Model Serializers](#active-model-serializers)
-- [Sending Raw or No Data](#sending-raw-or-no-data)
-- [Authentication](#authentication)
-  - [Basic Auth](#basic-auth)
-  - [Register custom middleware for authentication](#register-custom-middleware-for-authentication)
-- [Describing and Inspecting an API](#describing-and-inspecting-an-api)
-- [Current Route and Endpoint](#current-route-and-endpoint)
-- [Before, After and Finally](#before-after-and-finally)
-- [Anchoring](#anchoring)
-- [Instance Variables](#instance-variables)
-- [Using Custom Middleware](#using-custom-middleware)
-  - [Grape Middleware](#grape-middleware)
-  - [Rails Middleware](#rails-middleware)
-  - [Remote IP](#remote-ip)
-- [Writing Tests](#writing-tests)
-  - [Writing Tests with Rack](#writing-tests-with-rack)
-    - [RSpec](#rspec)
-    - [Airborne](#airborne)
-    - [MiniTest](#minitest)
-  - [Writing Tests with Rails](#writing-tests-with-rails)
-    - [RSpec](#rspec-1)
-    - [MiniTest](#minitest-1)
-  - [Stubbing Helpers](#stubbing-helpers)
-- [Reloading API Changes in Development](#reloading-api-changes-in-development)
-  - [Reloading in Rack Applications](#reloading-in-rack-applications)
-  - [Reloading in Rails Applications](#reloading-in-rails-applications)
-    - [Rails 7+ (Zeitwerk)](#rails-7-zeitwerk)
-    - [Rails 6 and Earlier](#rails-6-and-earlier)
-- [Performance Monitoring](#performance-monitoring)
-  - [Active Support Instrumentation](#active-support-instrumentation)
-    - [Hook Points](#hook-points)
-      - [endpoint_run.grape](#endpoint_rungrape)
-      - [endpoint_render.grape](#endpoint_rendergrape)
-      - [endpoint_run_filters.grape](#endpoint_run_filtersgrape)
-      - [endpoint_run_validators.grape](#endpoint_run_validatorsgrape)
-      - [format_response.grape](#format_responsegrape)
-    - [Subscribe to Hooks](#subscribe-to-hooks)
-  - [Monitoring Products](#monitoring-products)
-- [Contributing to Grape](#contributing-to-grape)
-- [Security](#security)
-- [License](#license)
-- [Copyright](#copyright)
-
 ## What is Grape?
 
 Grape is a REST-like API framework for Ruby. It's designed to run on Rack or complement existing web application frameworks such as Rails and Sinatra by providing a simple DSL to easily develop RESTful APIs. It has built-in support for common conventions, including multiple formats, subdomain/prefix restriction, content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 3.1.1.
+You're reading the documentation for the stable release of Grape, 3.2.0.
 
 ## Project Resources
 
@@ -177,7 +27,7 @@ The maintainers of Grape are working with Tidelift to deliver commercial support
 
 ## Installation
 
-Ruby 3.1 or newer is required.
+Ruby 3.2 or newer is required.
 
 Grape is available as a gem, to install it run:
 
@@ -1923,9 +1773,9 @@ end
 ```ruby
 class AlphaNumeric < Grape::Validations::Validators::Base
   def validate_param!(attr_name, params)
-    unless params[attr_name] =~ /\A[[:alnum:]]+\z/
-      raise Grape::Exceptions::Validation.new params: [@scope.full_name(attr_name)], message: 'must consist of alpha-numeric characters'
-    end
+    return if params[attr_name].match?(/\A[[:alnum:]]+\z/)
+
+    validation_error!(attr_name, 'must consist of alpha-numeric characters')
   end
 end
 ```
@@ -1941,9 +1791,9 @@ You can also create custom classes that take parameters.
 ```ruby
 class Length < Grape::Validations::Validators::Base
   def validate_param!(attr_name, params)
-    unless params[attr_name].length <= @option
-      raise Grape::Exceptions::Validation.new params: [@scope.full_name(attr_name)], message: "must be at the most #{@option} characters long"
-    end
+    return if params[attr_name].length <= @options
+
+    validation_error!(attr_name, "must be at the most #{@options} characters long")
   end
 end
 ```
@@ -1965,10 +1815,10 @@ class Admin < Grape::Validations::Validators::Base
     # @attrs being [:admin_field] and once with @attrs being [:admin_false_field]
     return unless request.params.key?(@attrs.first)
     # check if admin flag is set to true
-    return unless @option
+    return unless @options
     # check if user is admin or not
     # as an example get a token from request and check if it's admin or not
-    raise Grape::Exceptions::Validation.new params: @attrs, message: 'Can not set admin-only field.' unless request.headers['X-Access-Token'] == 'admin'
+    validation_error!(@attrs, 'Can not set admin-only field.') unless request.headers['X-Access-Token'] == 'admin'
   end
 end
 ```
@@ -1983,7 +1833,50 @@ params do
 end
 ```
 
-Every validation will have its own instance of the validator, which means that the validator can have a state.
+Each validator is instantiated once at route definition time and frozen. Any setup (option parsing, message building) should happen in `initialize`, not in `validate_param!` or `validate`.
+
+#### Available helpers
+
+The following protected/private helpers are available in any `Grape::Validations::Validators::Base` subclass:
+
+| Helper | Description |
+|---|---|
+| `default_message_key(key)` | Class-level macro. Declares the default I18n key for `validation_error!`. A per-option `:message` override still takes precedence. |
+| `validation_error!(attr_name_or_params, message = @exception_message)` | Raises `Grape::Exceptions::Validation`. Accepts a single attribute name or a pre-computed array of full param names. |
+| `@options` | The validator option value, deep-frozen at initialization. |
+| `@attrs` | Frozen array of attribute names this validator applies to. |
+| `@scope` | The `ParamsScope` — use `@scope.full_name(attr_name)` for the fully-qualified param name. |
+| `option_value` | Returns `@options[:value]` if present, otherwise `@options`. |
+| `options_key?(key)` | Returns true if `@options` is a hash with a non-nil `key`. |
+| `hash_like?(obj)` | Returns true if `obj` responds to `key?`. |
+| `scrub(value)` | Returns `value` with invalid byte sequences scrubbed. |
+| `translate(key, **opts)` | I18n lookup with `:en` fallback and `grape.errors.messages` scope. Called at request time to respect per-request locale. |
+
+Use `default_message_key` for a fixed I18n key. The message is resolved once at route definition time via `message`, so a per-option `:message` override still wins:
+
+```ruby
+class SpecialValidator < Grape::Validations::Validators::Base
+  default_message_key :special
+
+  def validate_param!(attr_name, params)
+    return if valid?(params[attr_name])
+
+    validation_error!(attr_name)
+  end
+end
+```
+
+For interpolated messages that must respect per-request locale, call `translate` directly inside `validate_param!`:
+
+```ruby
+class SpecialValidator < Grape::Validations::Validators::Base
+  def validate_param!(attr_name, params)
+    return if valid?(params[attr_name])
+
+    validation_error!(attr_name, translate(:special, min: 2, max: 10))
+  end
+end
+```
 
 ### Validation Errors
 
@@ -2045,6 +1938,28 @@ Grape supports I18n for parameter-related error messages, but will fallback to E
 
 In case your app enforces available locales only and :en is not included in your available locales, Grape cannot fall back to English and will return the translation key for the error message. To avoid this behaviour, either provide a translation for your default locale or add :en to your available locales.
 
+Custom validators that inherit from `Grape::Validations::Validators::Base` have access to a `translate` helper (see `Grape::Util::Translation`) and should use it instead of calling `I18n` directly. It applies the same `:en` fallback as built-in validators, defaults `scope` to `'grape.errors.messages'`, and handles interpolation without needing `format`:
+
+```ruby
+# Good — scope defaults to 'grape.errors.messages', interpolation forwarded automatically
+translate(:special, min: 2, max: 10)
+
+# Bad — format is unnecessary and risks conflicting with I18n reserved keys
+format I18n.t(:special, scope: 'grape.errors.messages'), min: 2, max: 10
+```
+
+Example custom validator using an interpolated i18n message:
+
+```ruby
+class SpecialValidator < Grape::Validations::Validators::Base
+  def validate_param!(attr_name, params)
+    return if valid?(params[attr_name])
+
+    validation_error!(attr_name, translate(:special, min: 2, max: 10))
+  end
+end
+```
+
 ### Custom Validation messages
 
 Grape supports custom validation messages for parameter-related and coerce-related error messages.

data/UPGRADING.md

@@ -1,6 +1,112 @@
 Upgrading Grape
 ===============
 
+### Upgrading to >= 3.2
+
+#### Rack parameter parsing errors now raise `Grape::Exceptions::RequestError`
+
+Rack errors raised during parameter parsing (malformed multipart, parameter type conflicts, encoding issues, etc.) are now wrapped in `Grape::Exceptions::RequestError` instead of their previous specific exception classes (`Grape::Exceptions::EmptyMessageBody`, `Grape::Exceptions::TooManyMultipartFiles`, `Grape::Exceptions::TooDeepParameters`, `Grape::Exceptions::ConflictingTypes`, `Grape::Exceptions::InvalidParameters`). Those classes have been removed.
+
+If you rescue any of these specific exceptions, update your rescue clauses to use `Grape::Exceptions::RequestError`:
+
+```ruby
+# Before
+rescue Grape::Exceptions::ConflictingTypes, Grape::Exceptions::TooDeepParameters => e
+  # ...
+
+# After
+rescue Grape::Exceptions::RequestError => e
+  # ...
+```
+
+The error message is now forwarded directly from Rack rather than translated through Grape's locale system. On Rack 3, all Rack bad-request errors share the `Rack::BadRequest` marker module and are covered by a single rescue.
+
+#### `endpoint_run_validators.grape` notification no longer fired when there are no validators
+
+`ActiveSupport::Notifications` subscribers listening to `endpoint_run_validators.grape` will no longer receive an event for endpoints that have no validators. If you rely on this notification to measure every request, subscribe to `endpoint_run.grape` instead, which always fires.
+
+#### Custom validators: use `default_message_key` and `validation_error!`
+
+Validators are now instantiated once at definition time and frozen. Any setup should happen in `initialize`, not in `validate_param!`.
+
+If your custom validator did work in `validate_param!` that only depends on the validator's options (not the param value), move it to `initialize`. A common case is compiling a value derived from options — for example, building a `Regexp`. Previously this may have been cached back into `@options`, which now raises `FrozenError` since `@options` and its nested values are deep-frozen by the base class:
+
+**Before:**
+```ruby
+class MyValidator < Grape::Validations::Validators::Base
+  def validate_param!(attr_name, params)
+    # raises FrozenError: @options is frozen, cannot store compiled pattern back into it
+    @options[:compiled] ||= Regexp.new(@options[:pattern])
+    validation_error!(attr_name) unless params[attr_name].match?(@options[:compiled])
+  end
+end
+```
+
+**After:**
+```ruby
+class MyValidator < Grape::Validations::Validators::Base
+  def initialize(attrs, options, required, scope, opts)
+    super
+    @pattern = Regexp.new(@options[:pattern]).freeze
+  end
+
+  def validate_param!(attr_name, params)
+    validation_error!(attr_name) unless params[attr_name].match?(@pattern)
+  end
+end
+```
+
+Any Array or Hash derived from options and stored in an ivar should be frozen, since the validator instance is shared across requests. `@options` itself (and any nested Hash/Array/String values within it) is deep-frozen by the base class, so mutations like `@options[:values] << 'extra'` will also raise a `FrozenError`.
+
+#### Custom validators: rename `@option` to `@options`
+
+The instance variable holding the validator's option value has been renamed from `@option` to `@options`. `@option` remains as an alias for backwards compatibility but will be removed in the next major release. Update any custom validators to use `@options` instead.
+
+Several new helpers are available — see [Available helpers](README.md#available-helpers) in the README for full documentation and examples.
+
+#### `with` now uses keyword arguments
+
+The `with` DSL method now uses `**opts` instead of a positional hash. Calls using bare keyword syntax are unaffected:
+
+```ruby
+# still works
+with(type: String, documentation: { in: 'body' }) { ... }
+```
+
+However, passing an explicit hash literal will now raise an `ArgumentError`:
+
+```ruby
+# raises ArgumentError
+with({ type: String }) { ... }
+```
+
+See [#2663](https://github.com/ruby-grape/grape/pull/2663) for more information.
+
+#### Custom validators: use `translate` instead of `I18n` directly
+
+`Grape::Util::Translation` is now included in `Grape::Validations::Validators::Base`. Custom validators that previously called `I18n.t` or `I18n.translate` directly should switch to the `translate`, which provides the same `:en` fallback logic used by all built-in validators.
+
+Key points:
+- `scope` defaults to `'grape.errors.messages'` — no need to specify it for standard error message keys.
+- Interpolation variables are passed directly to I18n.
+- `format` is no longer needed — `translate` returns the fully interpolated string.
+
+```ruby
+# Before
+raise Grape::Exceptions::Validation.new(
+  params: [@scope.full_name(attr_name)],
+  message: format(I18n.t(:my_key, scope: 'grape.errors.messages'), min: 2, max: 10)
+)
+
+# After
+raise Grape::Exceptions::Validation.new(
+  params: [@scope.full_name(attr_name)],
+  message: translate(:my_key, min: 2, max: 10)
+)
+```
+
+See [#2662](https://github.com/ruby-grape/grape/pull/2662) for more information.
+
 ### Upgrading to >= 3.1
 
 #### Explicit kwargs for `namespace` and `route_param`

data/grape.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     'rubygems_mfa_required' => 'true'
   }
 
-  s.add_dependency 'activesupport', '>= 7.1'
+  s.add_dependency 'activesupport', '>= 7.2'
   s.add_dependency 'dry-configurable'
   s.add_dependency 'dry-types', '>= 1.1'
   s.add_dependency 'mustermann-grape', '~> 1.1.0'
@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
 
   s.files = Dir['lib/**/*', 'CHANGELOG.md', 'CONTRIBUTING.md', 'README.md', 'grape.png', 'UPGRADING.md', 'LICENSE', 'grape.gemspec']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 3.1'
+  s.required_ruby_version = '>= 3.2'
 end

data/lib/grape/api/instance.rb

@@ -170,7 +170,7 @@ module Grape
           allow_header = namespace_inheritable[:do_not_route_options] ? allowed_methods : [Rack::OPTIONS] | allowed_methods
           last_route.app.options[:options_route_enabled] = true unless namespace_inheritable[:do_not_route_options] || allowed_methods.include?(Rack::OPTIONS)
 
-          greedy_route = Grape::Router::GreedyRoute.new(last_route.pattern, endpoint: last_route.app, allow_header: allow_header)
+          greedy_route = Grape::Router::GreedyRoute.new(last_route.pattern, endpoint: last_route.app, allow_header:)
           @router.associate_routes(greedy_route)
         end
       end

data/lib/grape/api.rb

@@ -44,7 +44,7 @@ module Grape
       def override_all_methods!
         (base_instance.methods - Class.methods - NON_OVERRIDABLE).each do |method_override|
           define_singleton_method(method_override) do |*args, **kwargs, &block|
-            add_setup(method: method_override, args: args, kwargs: kwargs, block: block)
+            add_setup(method: method_override, args:, kwargs:, block:)
           end
         end
       end

data/lib/grape/declared_params_handler.rb

@@ -12,9 +12,9 @@ module Grape
     def call(passed_params, declared_params, route_params, renamed_params)
       recursive_declared(
         passed_params,
-        declared_params: declared_params,
-        route_params: route_params,
-        renamed_params: renamed_params
+        declared_params:,
+        route_params:,
+        renamed_params:
       )
     end
 

data/lib/grape/dsl/declared.rb

@@ -23,7 +23,7 @@ module Grape
         raise MethodNotYetAvailable unless before_filter_passed
 
         contract_key_map = inheritable_setting.namespace_stackable[:contract_key_map]
-        handler = DeclaredParamsHandler.new(include_missing:, evaluate_given:, stringify:, contract_key_map: contract_key_map)
+        handler = DeclaredParamsHandler.new(include_missing:, evaluate_given:, stringify:, contract_key_map:)
         declared_params = include_parent_namespaces ? inheritable_setting.route[:declared_params] : (inheritable_setting.namespace_stackable[:declared_params].last || [])
         renamed_params = inheritable_setting.route[:renamed_params] || {}
         route_params = options.dig(:route_options, :params) || {} # options = endpoint's option

data/lib/grape/dsl/desc.rb

@@ -55,7 +55,7 @@ module Grape
             endpoint_config = defined?(configuration) ? configuration : nil
             Grape::Util::ApiDescription.new(description, endpoint_config, &config_block).settings
           else
-            options.merge(description: description)
+            options.merge(description:)
           end
         inheritable_setting.namespace[:description] = settings
         inheritable_setting.route[:description] = settings

data/lib/grape/dsl/inside_route.rb

@@ -29,11 +29,11 @@ module Grape
         status = self.status(status || inheritable_setting.namespace_inheritable[:default_error_status])
         headers = additional_headers.present? ? header.merge(additional_headers) : header
         throw :error,
-              message: message,
-              status: status,
-              headers: headers,
-              backtrace: backtrace,
-              original_exception: original_exception
+              message:,
+              status:,
+              headers:,
+              backtrace:,
+              original_exception:
       end
 
       # Redirect to a new url.
@@ -70,12 +70,12 @@ module Grape
         when Integer
           @status = status
         when nil
-          return @status if instance_variable_defined?(:@status) && @status
+          return @status if @status
 
           if request.post?
             201
           elsif request.delete?
-            if instance_variable_defined?(:@body) && @body.present?
+            if @body.present?
               200
             else
               204
@@ -114,7 +114,7 @@ module Grape
           @body = ''
           status 204
         else
-          instance_variable_defined?(:@body) ? @body : nil
+          @body
         end
       end
 
@@ -272,7 +272,7 @@ module Grape
       # @return the representation of the given object as done through
       #   the given entity_class.
       def entity_representation_for(entity_class, object, options)
-        embeds = { env: env }
+        embeds = { env: }
         embeds[:version] = env[Grape::Env::API_VERSION] if env.key?(Grape::Env::API_VERSION)
         entity_class.represent(object, **embeds, **options)
       end

data/lib/grape/dsl/parameters.rb

@@ -124,13 +124,13 @@ module Grape
       #     end
       def requires(*attrs, **opts, &block)
         opts[:presence] = { value: true, message: opts[:message] }
-        opts = @group.deep_merge(opts) if instance_variable_defined?(:@group) && @group
+        opts = @group.deep_merge(opts) if @group
 
         if opts[:using]
-          require_required_and_optional_fields(attrs.first, opts)
+          require_required_and_optional_fields(attrs.first, using: opts[:using], except: opts[:except])
         else
-          validate_attributes(attrs, opts, &block)
-          block ? new_scope(attrs, opts, &block) : push_declared_params(attrs, opts.slice(:as))
+          validate_attributes(attrs, **opts, &block)
+          block ? new_scope(attrs.first, type: opts[:type], as: opts[:as], &block) : push_declared_params(attrs, as: opts[:as])
         end
       end
 
@@ -140,7 +140,7 @@ module Grape
       # @option (see #requires)
       def optional(*attrs, **opts, &block)
         type = opts[:type]
-        opts = @group.deep_merge(opts) if instance_variable_defined?(:@group) && @group
+        opts = @group.deep_merge(opts) if @group
 
         # check type for optional parameter group
         if attrs && block
@@ -149,25 +149,25 @@ module Grape
         end
 
         if opts[:using]
-          require_optional_fields(attrs.first, opts)
+          require_optional_fields(attrs.first, using: opts[:using], except: opts[:except])
         else
-          validate_attributes(attrs, opts, &block)
+          validate_attributes(attrs, **opts, &block)
 
-          block ? new_scope(attrs, opts, true, &block) : push_declared_params(attrs, opts.slice(:as))
+          block ? new_scope(attrs.first, type: opts[:type], as: opts[:as], optional: true, &block) : push_declared_params(attrs, as: opts[:as])
         end
       end
 
       # Define common settings for one or more parameters
       # @param (see #requires)
       # @option (see #requires)
-      def with(*attrs, &)
-        new_group_attrs = [@group, attrs.clone.first].compact.reduce(&:deep_merge)
-        new_group_scope([new_group_attrs], &)
+      def with(**opts, &)
+        new_group_attrs = @group&.deep_merge(opts) || opts
+        new_group_scope(new_group_attrs, &)
       end
 
       %i[mutually_exclusive exactly_one_of at_least_one_of all_or_none_of].each do |validator|
         define_method validator do |*attrs, message: nil|
-          validates(attrs, validator => { value: true, message: message })
+          validates(attrs, validator => { value: true, message: })
         end
       end
 
@@ -224,8 +224,8 @@ module Grape
       # @return hash of parameters relevant for the current scope
       # @api private
       def params(params)
-        params = @parent.params_meeting_dependency.presence || @parent.params(params) if instance_variable_defined?(:@parent) && @parent
-        params = map_params(params, @element) if instance_variable_defined?(:@element) && @element
+        params = @parent.qualifying_params.presence || @parent.params(params) if @parent
+        params = map_params(params, @element) if @element
         params
       end