grape 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8464d92025577bf0a660c5b99780bf51dcbd9f3d7821179dcae7df46f4558a17
-  data.tar.gz: feb009c07e937353a4296583565157df9a379341250ace82bcbee5f0f6afa7ff
+  metadata.gz: 47f5b2c65d5d4fb054f4b602fd97bd02be043e1ae40ded0d52dc70c2888a4ca7
+  data.tar.gz: f6bb78e2afc50d777dc0edf0447098908b6532c7e523f0291e693aacbff065c6
 SHA512:
-  metadata.gz: d18914103ad6a218dc4abd3bcca9f6cefe7d409aea2c5319da0e796081bfb73470b21195e468033864f01ef7e8cef3afafdad97210b3df4b1d8fb75622b2f4c8
-  data.tar.gz: e5c4755ff3eb6192db865c555a27f0eeeb2e1bec7a9ef9d9e42ef11606e3feb022785e29d09ad6431a7b3e6745134c22e1504eda02490b69e523bcab98367415
+  metadata.gz: 910ad023e4cbfca1ba429adcccaa71018e5bad3f88e2195fe8becb26aa4736ed18b5b87f997e71fa11d4211e817f5b6d2aff518fda31ad93105b6e51c6f4d4b7
+  data.tar.gz: 85f489446889da6c3645842672790246e66b636d63af6d3734a8bbaa5163c3ec22086e6e066cda8eac52dfd1c4f4834f4536aab39211585297ab25b1efa4d6d9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 3.3.2 (2026-07-05)
+
+#### Fixes
+
+* [#2773](https://github.com/ruby-grape/grape/pull/2773): Fix middleware build crash when a top-level `::Options` constant is in scope - [@ericproulx](https://github.com/ericproulx).
+* Your contribution here.
+
 ### 3.3.1 (2026-06-28)
 
 #### 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.1.
+You're reading the documentation for the stable release of Grape, 3.3.2.
 
 ## Project Resources
 

data/lib/grape/middleware/base.rb

@@ -16,10 +16,8 @@ module Grape
       #   subclass's `DEFAULT_OPTIONS` Hash (legacy path) and frozen.
       def initialize(app, **options)
         @app = app
-        if self.class.const_defined?(:Options)
-          # Search ancestors so subclasses (e.g. Versioner::Path → Versioner::Base)
-          # inherit their parent's Options Data class without redeclaring it.
-          @config = self.class::Options.new(**options)
+        if (config_class = options_data_class)
+          @config = config_class.new(**options)
           @options = @config.to_h.freeze
         else
           @options = merge_default_options(options).freeze
@@ -92,9 +90,25 @@ module Grape
 
       def merge_default_options(options)
         return default_options.deep_merge(options) if respond_to?(:default_options)
-        return self.class::DEFAULT_OPTIONS.deep_merge(options) if self.class.const_defined?(:DEFAULT_OPTIONS)
 
-        options
+        default_options_constant&.deep_merge(options) || options
+      end
+
+      # self.class::Options honours middleware inheritance (e.g. Versioner::Path
+      # → Versioner::Base) and, unlike const_defined?, never resolves a
+      # top-level ::Options on Object. Absent an own/inherited Options class,
+      # the lookup raises NameError and we fall back to the legacy path.
+      def options_data_class
+        self.class::Options
+      rescue NameError
+        nil
+      end
+
+      # Same idea as {#options_data_class} for the legacy DEFAULT_OPTIONS Hash.
+      def default_options_constant
+        self.class::DEFAULT_OPTIONS
+      rescue NameError
+        nil
       end
 
       def try_scrub(obj)

data/lib/grape/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Michael Bleigh
@@ -281,9 +281,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.1/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/3.3.1
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v3.3.1
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v3.3.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/3.3.2
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v3.3.2
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: