grape 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4db45369305583b4816671ba1e0934dc034bda07ad61bc68b1b9d09d67d776
-  data.tar.gz: fcb5fc7921a0f619f3d644a8c7caee4e306f71215c05f01770df4a94d301db34
+  metadata.gz: 88b3fe1928173a2d9b71c919863413baee3e1723865bce98ba8c1f10d970c85a
+  data.tar.gz: 5fb846fdaea070aa997ebcbda8746ebd1b1507a62589b1afe0027d3369e4b986
 SHA512:
-  metadata.gz: ea6e0e3bab2b7f79e395e2aa649d5a15bfc0fef1d22be86465a650d1c92c73ed3cb6133fbb67d184aad3cf9ba0f7e920ec507e5d94bc3fb55b7ca9d0c54ea89a
-  data.tar.gz: ab97e8a2ed312cfce30641914ed08986aeee8bad45742deabea86b7b41177c402daab21ffd16f023ea7be8e83d1e202407ad10bbbcf41703a0834ad9183f82cd
+  metadata.gz: 91f9c61cd123a0a5f8cc8bf457fa06ba7dc37591b7eeab09cdc4be7f5d97e1ec13eeccdb4167e976196b9a3d3322ab3eec63c875c3053b3b2f913d433ea02d5a
+  data.tar.gz: 5d859c1f5bbf13d553bbffd0bcf15433ba8aff40b4660db09b61790612f726e6f9fac90c9ab7d531ff4444d465ac440e28e2f3303be32c4a4c3886ae728e6f65

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 3.3.5 (2026-07-30)
+
+#### Fixes
+
+* [#2814](https://github.com/ruby-grape/grape/pull/2814): Fix `type: [A, B]` combined with `values:`/`except_values:` raising `IncompatibleOptionValues` at definition time - [@ericproulx](https://github.com/ericproulx).
+* [#2833](https://github.com/ruby-grape/grape/pull/2833): Fix `Grape::API::Instance.to_s` returning an empty string instead of the class name when the instance has no base (regression since 3.0.0) - [@ericproulx](https://github.com/ericproulx).
+* [#2834](https://github.com/ruby-grape/grape/pull/2834): Fix cascaded routes (`X-Cascade: pass`) leaking `route_info` and path captures into the next matched route's `route` and `params` - [@ericproulx](https://github.com/ericproulx).
+
 ### 3.3.4 (2026-07-25)
 
 #### Fixes

data/README.md

@@ -10,7 +10,7 @@ Grape is a REST-like API framework for Ruby. It's designed to run on Rack or com
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 3.3.4.
+You're reading the documentation for the stable release of Grape, 3.3.5.
 
 ## Project Resources
 

data/lib/grape/api/instance.rb

@@ -21,11 +21,11 @@ module Grape
       Boolean = Grape::API::Boolean
 
       class << self
-        extend Forwardable
-
         attr_accessor :configuration
 
-        def_delegators :@base, :to_s
+        def to_s
+          @base&.to_s || super
+        end
 
         def base=(grape_api)
           @base = grape_api

data/lib/grape/router.rb

@@ -126,10 +126,14 @@ module Grape
       !cascade
     end
 
+    # Routing args are rebuilt for every attempt: when a route cascades
+    # (X-Cascade pass), the next candidate must not observe the previous
+    # attempt's +route_info+ or path captures.
     def process_route(route, input, env, include_allow_header: false)
       route_params = route.params(input)
-      env[Grape::Env::GRAPE_ROUTING_ARGS] ||= { route_info: route }
-      env[Grape::Env::GRAPE_ROUTING_ARGS].merge!(route_params) if route_params.present?
+      routing_args = { route_info: route }
+      routing_args.merge!(route_params) if route_params.present?
+      env[Grape::Env::GRAPE_ROUTING_ARGS] = routing_args
       env[Grape::Env::GRAPE_ALLOWED_METHODS] = route.allow_header if include_allow_header
       route.call(env)
     end

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

@@ -6,6 +6,9 @@ module Grape
       # This class wraps {MultipleTypeCoercer}, for use with collections
       # that allow members of more than one type.
       class VariantCollectionCoercer
+        # @return [Array<Class>,Set<Class>] the member types as declared in the DSL
+        attr_reader :types
+
         # Construct a new coercer that will attempt to coerce
         # a list of values such that all members are of one of
         # the given types. The container may also optionally be

data/lib/grape/validations/validations_spec.rb

@@ -51,7 +51,7 @@ module Grape
         @allow_blank = resolve_value(raw[:allow_blank])
         @fail_fast = raw[:fail_fast] || false
 
-        @guessed_coerce_type = guess_coerce_type(@coerce_type, @values, @except_values)
+        @guessed_coerce_type = guess_coerce_type(declared_coerce_type, @values, @except_values)
         @shared_opts = { allow_blank: @allow_blank, fail_fast: @fail_fast }.freeze
         @validator_entries = build_validator_entries(raw)
 
@@ -140,6 +140,16 @@ module Grape
         opt.is_a?(Hash) ? opt[:value] : opt
       end
 
+      # The type as written in the DSL. Identical to +@coerce_type+ except for
+      # a multiple-type declaration (+type: [Integer, String]+), where
+      # {#parse_coerce} wraps the declared list in a
+      # {Types::VariantCollectionCoercer} for runtime coercion — the
+      # definition-time coherence checks need the list back, since the wrapper
+      # matches nothing under +===+.
+      def declared_coerce_type
+        @coerce_type.is_a?(Types::VariantCollectionCoercer) ? @coerce_type.types : @coerce_type
+      end
+
       def guess_coerce_type(coerce_type, *values_list)
         return coerce_type unless coerce_type == Array
 

data/lib/grape/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grape
-  VERSION = '3.3.4'
+  VERSION = '3.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Michael Bleigh
@@ -282,9 +282,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v3.3.4/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/3.3.4
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v3.3.4
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v3.3.5/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/3.3.5
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v3.3.5
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: