Update RuboCop to 1.86.0 and autocorrect offenses

ericproulx · claude · ericproulx · commit abfcbb6737bc · 2026-04-08T23:05:42.000+02:00
Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,6 +5,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - bin/**/*
+    - benchmark/**/*
 
 plugins:
   - rubocop-performance
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-01-31 18:13:50 UTC using RuboCop version 1.84.0.
+# on 2026-04-08 20:39:39 UTC using RuboCop version 1.86.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -59,7 +59,7 @@ RSpec/IndexedLet:
     - 'spec/grape/presenters/presenter_spec.rb'
     - 'spec/shared/versioning_examples.rb'
 
-# Offense count: 40
+# Offense count: 41
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -84,19 +84,16 @@ RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/grape/middleware/exception_spec.rb'
 
-# Offense count: 12
+# Offense count: 6
 RSpec/RepeatedDescription:
   Exclude:
     - 'spec/grape/api_spec.rb'
     - 'spec/grape/endpoint_spec.rb'
-    - 'spec/grape/validations/validators/allow_blank_validator_spec.rb'
-    - 'spec/grape/validations/validators/values_validator_spec.rb'
 
-# Offense count: 6
+# Offense count: 2
 RSpec/RepeatedExample:
   Exclude:
     - 'spec/grape/middleware/versioner/accept_version_header_spec.rb'
-    - 'spec/grape/validations/validators/allow_blank_validator_spec.rb'
 
 # Offense count: 8
 RSpec/RepeatedExampleGroupDescription:
@@ -144,15 +141,14 @@ Style/CombinableLoops:
   Exclude:
     - 'spec/grape/endpoint_spec.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/grape/dsl/parameters.rb'
     - 'lib/grape/endpoint.rb'
     - 'lib/grape/serve_stream/sendfile_response.rb'
-    - 'lib/grape/validations/params_scope.rb'
     - 'lib/grape/validations/types/array_coercer.rb'
     - 'lib/grape/validations/types/custom_type_collection_coercer.rb'
     - 'lib/grape/validations/types/dry_type_coercer.rb'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 #### Fixes
 
+* [#2678](https://github.com/ruby-grape/grape/pull/2678): Update rubocop to 1.86.0 and autocorrect offenses - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 ### 3.2.0 (2026-04-08)
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ group :development, :test do
   gem 'builder', require: false
   gem 'bundler'
   gem 'rake'
-  gem 'rubocop', '1.84.0', require: false
+  gem 'rubocop', '1.86.0', require: false
   gem 'rubocop-performance', '1.26.1', require: false
   gem 'rubocop-rspec', '3.9.0', require: false
 end
diff --git a/lib/grape/request.rb b/lib/grape/request.rb
@@ -132,8 +132,8 @@ class Request < Rack::Request
       X-UA-Compatible
       X-WebKit-CS
       X-XSS-Protection
-    ].each_with_object({}) do |header, response|
-      response["HTTP_#{header.upcase.tr('-', '_')}"] = header
+    ].to_h do |header|
+      ["HTTP_#{header.upcase.tr('-', '_')}", header]
     end.freeze
 
     alias rack_params params
diff --git a/lib/grape/util/stackable_values.rb b/lib/grape/util/stackable_values.rb
@@ -19,8 +19,8 @@ def []=(name, value)
       end
 
       def to_hash
-        keys.each_with_object({}) do |key, result|
-          result[key] = self[key]
+        keys.to_h do |key|
+          [key, self[key]]
         end
       end
 
diff --git a/lib/grape/validations/params_documentation.rb b/lib/grape/validations/params_documentation.rb
@@ -9,8 +9,8 @@ module ParamsDocumentation
       def document_params(attrs, validations, type = nil, values = nil, except_values = nil)
         return validations.except!(:desc, :description, :documentation) if @api.inheritable_setting.namespace_inheritable[:do_not_document]
 
-        documented_attrs = attrs.each_with_object({}) do |name, memo|
-          memo[full_name(name)] = extract_details(validations, type, values, except_values)
+        documented_attrs = attrs.to_h do |name|
+          [full_name(name), extract_details(validations, type, values, except_values)]
         end
         @api.inheritable_setting.namespace_stackable[:params] = documented_attrs
       end
diff --git a/lib/grape/validations/params_scope.rb b/lib/grape/validations/params_scope.rb
@@ -317,7 +317,7 @@ def configure_declared_params
         push_renamed_param(full_path, @element_renamed) if @element_renamed
 
         if nested?
-          @parent.push_declared_params [@element => @declared_params]
+          @parent.push_declared_params [{ @element => @declared_params }]
         else
           @api.inheritable_setting.namespace_stackable[:declared_params] = @declared_params
         end
diff --git a/spec/grape/api_spec.rb b/spec/grape/api_spec.rb
@@ -119,7 +119,7 @@
       dummy_presenter_klass = Class.new
       represent_object = Class.new
       subject.represent represent_object, with: dummy_presenter_klass
-      expect(subject.inheritable_setting.namespace_stackable[:representations]).to eq([represent_object => dummy_presenter_klass])
+      expect(subject.inheritable_setting.namespace_stackable[:representations]).to eq([{ represent_object => dummy_presenter_klass }])
     end
   end
 
diff --git a/spec/grape/dsl/desc_spec.rb b/spec/grape/dsl/desc_spec.rb
@@ -19,68 +19,76 @@
       expect(subject.route_setting(:description)).to eq(options.merge(description: desc_text))
     end
 
-    it 'can be set with a block' do
-      expected_options = {
-        summary: 'summary',
-        description: 'The description',
-        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',
-        headers: [
-          XAuthToken: {
-            description: 'Valdates your identity',
-            required: true
-          },
-          XOptionalHeader: {
-            description: 'Not really needed',
-            required: false
-          }
-        ],
-        hidden: false,
-        deprecated: false,
-        is_array: true,
-        nickname: 'nickname',
-        produces: %w[array of mime_types],
-        consumes: %w[array of mime_types],
-        tags: %w[tag1 tag2],
-        security: %w[array of security schemes]
-      }
-
-      subject.desc 'The description' do
-        summary 'summary'
-        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'
-        headers [
-          XAuthToken: {
-            description: 'Valdates your identity',
-            required: true
-          },
-          XOptionalHeader: {
-            description: 'Not really needed',
-            required: false
-          }
-        ]
-        hidden false
-        deprecated false
-        is_array true
-        nickname 'nickname'
-        produces %w[array of mime_types]
-        consumes %w[array of mime_types]
-        tags %w[tag1 tag2]
-        security %w[array of security schemes]
+    context 'when a block is passed' do
+      let(:expected_options) do
+        {
+          summary: 'summary',
+          description: 'The description',
+          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',
+          headers: [
+            {
+              XAuthToken: {
+                description: 'Valdates your identity',
+                required: true
+              },
+              XOptionalHeader: {
+                description: 'Not really needed',
+                required: false
+              }
+            }
+          ],
+          hidden: false,
+          deprecated: false,
+          is_array: true,
+          nickname: 'nickname',
+          produces: %w[array of mime_types],
+          consumes: %w[array of mime_types],
+          tags: %w[tag1 tag2],
+          security: %w[array of security schemes]
+        }
       end
 
-      expect(subject.namespace_setting(:description)).to eq(expected_options)
-      expect(subject.route_setting(:description)).to eq(expected_options)
+      it 'can be set with a block' do
+        subject.desc 'The description' do
+          summary 'summary'
+          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'
+          headers [
+            {
+              XAuthToken: {
+                description: 'Valdates your identity',
+                required: true
+              },
+              XOptionalHeader: {
+                description: 'Not really needed',
+                required: false
+              }
+            }
+          ]
+          hidden false
+          deprecated false
+          is_array true
+          nickname 'nickname'
+          produces %w[array of mime_types]
+          consumes %w[array of mime_types]
+          tags %w[tag1 tag2]
+          security %w[array of security schemes]
+        end
+
+        expect(subject.namespace_setting(:description)).to eq(expected_options)
+        expect(subject.route_setting(:description)).to eq(expected_options)
+      end
     end
   end
 end
diff --git a/spec/grape/dsl/request_response_spec.rb b/spec/grape/dsl/request_response_spec.rb
@@ -36,14 +36,14 @@
   describe '.formatter' do
     it 'sets the formatter for a content type' do
       subject.formatter c_type, :formatter
-      expect(subject.inheritable_setting.namespace_stackable[:formatters]).to eq([c_type.to_sym => :formatter])
+      expect(subject.inheritable_setting.namespace_stackable[:formatters]).to eq([{ c_type.to_sym => :formatter }])
     end
   end
 
   describe '.parser' do
     it 'sets a parser for a content type' do
       subject.parser c_type, :parser
-      expect(subject.inheritable_setting.namespace_stackable[:parsers]).to eq([c_type.to_sym => :parser])
+      expect(subject.inheritable_setting.namespace_stackable[:parsers]).to eq([{ c_type.to_sym => :parser }])
     end
   end
 
@@ -70,7 +70,7 @@
   describe '.content_type' do
     it 'sets a content type for a format' do
       subject.content_type format, c_type
-      expect(subject.inheritable_setting.namespace_stackable[:content_types]).to eq([format.to_sym => c_type])
+      expect(subject.inheritable_setting.namespace_stackable[:content_types]).to eq([{ format.to_sym => c_type }])
     end
   end
 
@@ -201,34 +201,34 @@
     describe 'list of exceptions is passed' do
       it 'sets hash of exceptions as rescue handlers' do
         subject.rescue_from StandardError
-        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([StandardError => nil])
+        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([{ StandardError => nil }])
         expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([{}])
       end
 
       it 'rescues only base handlers if rescue_subclasses: false option is passed' do
         subject.rescue_from StandardError, rescue_subclasses: false
-        expect(subject.inheritable_setting.namespace_reverse_stackable[:base_only_rescue_handlers]).to eq([StandardError => nil])
-        expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([rescue_subclasses: false])
+        expect(subject.inheritable_setting.namespace_reverse_stackable[:base_only_rescue_handlers]).to eq([{ StandardError => nil }])
+        expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([{ rescue_subclasses: false }])
       end
 
       it 'sets given proc as rescue handler for each key in hash' do
         rescue_handler_proc = proc {}
         subject.rescue_from StandardError, rescue_handler_proc
-        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([StandardError => rescue_handler_proc])
+        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([{ StandardError => rescue_handler_proc }])
         expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([{}])
       end
 
       it 'sets given block as rescue handler for each key in hash' do
         rescue_handler_proc = proc {}
         subject.rescue_from StandardError, &rescue_handler_proc
-        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([StandardError => rescue_handler_proc])
+        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([{ StandardError => rescue_handler_proc }])
         expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([{}])
       end
 
       it 'sets a rescue handler declared through :with option for each key in hash' do
         with_block = -> { 'hello' }
         subject.rescue_from StandardError, with: with_block
-        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([StandardError => with_block])
+        expect(subject.inheritable_setting.namespace_reverse_stackable[:rescue_handlers]).to eq([{ StandardError => with_block }])
         expect(subject.inheritable_setting.namespace_stackable[:rescue_options]).to eq([{}])
       end
     end
@@ -238,7 +238,7 @@
     it 'sets a presenter for a class' do
       presenter = Class.new
       subject.represent :ThisClass, with: presenter
-      expect(subject.inheritable_setting.namespace_stackable[:representations]).to eq([ThisClass: presenter])
+      expect(subject.inheritable_setting.namespace_stackable[:representations]).to eq([{ ThisClass: presenter }])
     end
   end
 end
diff --git a/spec/grape/exceptions/validation_errors_spec.rb b/spec/grape/exceptions/validation_errors_spec.rb
@@ -81,8 +81,10 @@ def app
       expect(last_response).to be_bad_request
       expect(JSON.parse(last_response.body)).to eq(
         [
-          'params' => %w[beer wine],
-          'messages' => ['are mutually exclusive']
+          {
+            'params' => %w[beer wine],
+            'messages' => ['are mutually exclusive']
+          }
         ]
       )
     end
diff --git a/spec/grape/validations_spec.rb b/spec/grape/validations_spec.rb
diff --git a/spec/support/cookie_jar.rb b/spec/support/cookie_jar.rb
