Modernize RuboCop configuration and fix offenses (#1660)

- migrate from `require` to `plugins`
- remove explicit new cops in favour of `NewCops: enable`
- remove version boundaries from `rubocop-packaging` and `rubocop-performance` gems
- add and enable `rubocop-rake` gem
- auto-correct (safe only) a bunch of offenses
- manually correct "useless private scoping of constant" offences
- regen `.rubocop_todo.yml` to add remaining few complex offences

Author: larouxn

.rubocop.yml

@@ -1,13 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
-require:
+plugins:
   - rubocop-packaging
   - rubocop-performance
+  - rubocop-rake
 
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   TargetRubyVersion: 3.0
+  NewCops: enable
 
 # Custom config
 Gemspec/RequireMFA: # we don't know if this works with auto-deployments yet
@@ -32,169 +34,3 @@ Style/DoubleNegation:
   Enabled: false
 Style/IfUnlessModifier:
   Enabled: false
-
-# New cops
-Gemspec/DeprecatedAttributeAssignment: # new in 1.30
-  Enabled: true
-Layout/LineContinuationLeadingSpace: # new in 1.31
-  Enabled: true
-Layout/LineContinuationSpacing: # new in 1.31
-  Enabled: true
-Layout/LineEndStringConcatenationIndentation: # new in 1.18
-  Enabled: true
-Layout/SpaceBeforeBrackets: # new in 1.7
-  Enabled: true
-Lint/AmbiguousAssignment: # new in 1.7
-  Enabled: true
-Lint/AmbiguousOperatorPrecedence: # new in 1.21
-  Enabled: true
-Lint/AmbiguousRange: # new in 1.19
-  Enabled: true
-Lint/ConstantOverwrittenInRescue: # new in 1.31
-  Enabled: true
-Lint/DeprecatedConstants: # new in 1.8
-  Enabled: true
-Lint/DuplicateBranch: # new in 1.3
-  Enabled: true
-Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
-  Enabled: true
-Lint/EmptyBlock: # new in 1.1
-  Enabled: true
-Lint/EmptyClass: # new in 1.3
-  Enabled: true
-Lint/EmptyInPattern: # new in 1.16
-  Enabled: true
-Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
-  Enabled: true
-Lint/LambdaWithoutLiteralBlock: # new in 1.8
-  Enabled: true
-Lint/NoReturnInBeginEndBlocks: # new in 1.2
-  Enabled: true
-Lint/NonAtomicFileOperation: # new in 1.31
-  Enabled: true
-Lint/NumberedParameterAssignment: # new in 1.9
-  Enabled: true
-Lint/OrAssignmentToConstant: # new in 1.9
-  Enabled: true
-Lint/RedundantDirGlobSort: # new in 1.8
-  Enabled: true
-Lint/RefinementImportMethods: # new in 1.27
-  Enabled: true
-Lint/RequireRangeParentheses: # new in 1.32
-  Enabled: true
-Lint/RequireRelativeSelfPath: # new in 1.22
-  Enabled: true
-Lint/SymbolConversion: # new in 1.9
-  Enabled: true
-Lint/ToEnumArguments: # new in 1.1
-  Enabled: true
-Lint/TripleQuotes: # new in 1.9
-  Enabled: true
-Lint/UnexpectedBlockArity: # new in 1.5
-  Enabled: true
-Lint/UnmodifiedReduceAccumulator: # new in 1.1
-  Enabled: true
-Lint/UselessRuby2Keywords: # new in 1.23
-  Enabled: true
-Naming/BlockForwarding: # new in 1.24
-  Enabled: true
-Security/CompoundHash: # new in 1.28
-  Enabled: true
-Security/IoMethods: # new in 1.22
-  Enabled: true
-Style/ArgumentsForwarding: # new in 1.1
-  Enabled: true
-Style/CollectionCompact: # new in 1.2
-  Enabled: true
-Style/DocumentDynamicEvalDefinition: # new in 1.1
-  Enabled: true
-Style/EmptyHeredoc: # new in 1.32
-  Enabled: true
-Style/EndlessMethod: # new in 1.8
-  Enabled: true
-Style/EnvHome: # new in 1.29
-  Enabled: true
-Style/FetchEnvVar: # new in 1.28
-  Enabled: true
-Style/FileRead: # new in 1.24
-  Enabled: true
-Style/FileWrite: # new in 1.24
-  Enabled: true
-Style/HashConversion: # new in 1.10
-  Enabled: true
-Style/HashExcept: # new in 1.7
-  Enabled: true
-Style/IfWithBooleanLiteralBranches: # new in 1.9
-  Enabled: true
-Style/InPatternThen: # new in 1.16
-  Enabled: true
-Style/MapCompactWithConditionalBlock: # new in 1.30
-  Enabled: true
-Style/MapToHash: # new in 1.24
-  Enabled: true
-Style/MultilineInPatternThen: # new in 1.16
-  Enabled: true
-Style/NegatedIfElseCondition: # new in 1.2
-  Enabled: true
-Style/NestedFileDirname: # new in 1.26
-  Enabled: true
-Style/NilLambda: # new in 1.3
-  Enabled: true
-Style/NumberedParameters: # new in 1.22
-  Enabled: true
-Style/NumberedParametersLimit: # new in 1.22
-  Enabled: true
-Style/ObjectThen: # new in 1.28
-  Enabled: true
-Style/OpenStructUse: # new in 1.23
-  Enabled: true
-Style/QuotedSymbols: # new in 1.16
-  Enabled: true
-Style/RedundantArgument: # new in 1.4
-  Enabled: true
-Style/RedundantInitialize: # new in 1.27
-  Enabled: true
-Style/RedundantSelfAssignmentBranch: # new in 1.19
-  Enabled: true
-Style/SelectByRegexp: # new in 1.22
-  Enabled: true
-Style/StringChars: # new in 1.12
-  Enabled: true
-Style/SwapValues: # new in 1.1
-  Enabled: true
-Performance/AncestorsInclude: # new in 1.7
-  Enabled: true
-Performance/BigDecimalWithNumericArgument: # new in 1.7
-  Enabled: true
-Performance/BlockGivenWithExplicitBlock: # new in 1.9
-  Enabled: true
-Performance/CollectionLiteralInLoop: # new in 1.8
-  Enabled: true
-Performance/ConcurrentMonotonicTime: # new in 1.12
-  Enabled: true
-Performance/ConstantRegexp: # new in 1.9
-  Enabled: true
-Performance/MapCompact: # new in 1.11
-  Enabled: true
-Performance/MethodObjectAsBlock: # new in 1.9
-  Enabled: true
-Performance/RedundantEqualityComparisonBlock: # new in 1.10
-  Enabled: true
-Performance/RedundantSortBlock: # new in 1.7
-  Enabled: true
-Performance/RedundantSplitRegexpArgument: # new in 1.10
-  Enabled: true
-Performance/RedundantStringChars: # new in 1.7
-  Enabled: true
-Performance/ReverseFirst: # new in 1.7
-  Enabled: true
-Performance/SortReverse: # new in 1.7
-  Enabled: true
-Performance/Squeeze: # new in 1.7
-  Enabled: true
-Performance/StringIdentifierArgument: # new in 1.13
-  Enabled: true
-Performance/StringInclude: # new in 1.7
-  Enabled: true
-Performance/Sum: # new in 1.8
-  Enabled: true

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-12-27 11:12:52 UTC using RuboCop version 1.59.0.
+# on 2026-02-07 23:35:21 UTC using RuboCop version 1.84.1.
 # 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
@@ -23,22 +23,29 @@ Lint/EmptyBlock:
     - 'spec/faraday/rack_builder_spec.rb'
     - 'spec/faraday/response_spec.rb'
 
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+Lint/UselessDefaultValueArgument:
+  Exclude:
+    - 'spec/faraday/options/options_spec.rb'
+
 # Offense count: 13
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 42
+  Max: 41
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 235
+  Max: 231
 
-# Offense count: 9
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 27
+# Offense count: 28
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 33
@@ -53,7 +60,15 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 14
 
-# Offense count: 19
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/faraday/adapter/test.rb'
+
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
 # RedundantRestArgumentNames: args, arguments
@@ -62,10 +77,16 @@ Metrics/PerceivedComplexity:
 Style/ArgumentsForwarding:
   Exclude:
     - 'lib/faraday.rb'
-    - 'lib/faraday/rack_builder.rb'
 
 # Offense count: 3
 Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'lib/faraday/connection.rb'
     - 'lib/faraday/options.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Style/ReturnNilInPredicateMethodDefinition:
+  Exclude:
+    - 'lib/faraday/adapter/test.rb'

Gemfile

@@ -21,8 +21,9 @@ end
 group :development, :lint do
   gem 'racc', '~> 1.7' # for RuboCop, on Ruby 3.3
   gem 'rubocop'
-  gem 'rubocop-packaging', '~> 0.5'
-  gem 'rubocop-performance', '~> 1.0'
+  gem 'rubocop-packaging'
+  gem 'rubocop-performance'
+  gem 'rubocop-rake'
   gem 'yard-junk'
 end
 

lib/faraday/adapter.rb

@@ -8,6 +8,12 @@ class Adapter
 
     CONTENT_LENGTH = 'Content-Length'
 
+    TIMEOUT_KEYS = {
+      read: :read_timeout,
+      open: :open_timeout,
+      write: :write_timeout
+    }.freeze
+
     # This module marks an Adapter as supporting parallel requests.
     module Parallelism
       attr_writer :supports_parallel
@@ -23,6 +29,7 @@ def inherited(subclass)
     end
 
     extend Parallelism
+
     self.supports_parallel = false
 
     def initialize(_app = nil, opts = {}, &block)
@@ -89,12 +96,6 @@ def request_timeout(type, options)
       end
       options[key] || options[:timeout]
     end
-
-    TIMEOUT_KEYS = {
-      read: :read_timeout,
-      open: :open_timeout,
-      write: :write_timeout
-    }.freeze
   end
 end
 

lib/faraday/encoders/flat_params_encoder.rb

@@ -6,6 +6,7 @@ module Faraday
   module FlatParamsEncoder
     class << self
       extend Forwardable
+
       def_delegators :'Faraday::Utils', :escape, :unescape
     end
 

lib/faraday/encoders/nested_params_encoder.rb

@@ -170,6 +170,7 @@ class << self
       attr_accessor :sort_params, :array_indices
 
       extend Forwardable
+
       def_delegators :'Faraday::Utils', :escape, :unescape
     end
 

lib/faraday/error.rb

@@ -172,7 +172,7 @@ class ServerError < Error
   # A unified client error for timeouts.
   class TimeoutError < ServerError
     def initialize(exc = 'timeout', response = nil)
-      super(exc, response)
+      super
     end
   end
 

lib/faraday/middleware.rb

@@ -65,7 +65,7 @@ def close
       if app.respond_to?(:close)
         app.close
       else
-        warn "#{app} does not implement \#close!"
+        warn "#{app} does not implement #close!"
       end
     end
   end

lib/faraday/options.rb

@@ -186,7 +186,7 @@ def self.memoized_attributes
     def [](key)
       key = key.to_sym
       if (method = self.class.memoized_attributes[key])
-        super(key) || (self[key] = instance_eval(&method))
+        super || (self[key] = instance_eval(&method))
       else
         super
       end

lib/faraday/options/env.rb

@@ -78,7 +78,7 @@ module Faraday
     # @param value [Object] a value fitting Option.from(v).
     # @return [Env] from given value
     def self.from(value)
-      env = super(value)
+      env = super
       if value.respond_to?(:custom_members)
         env.custom_members.update(value.custom_members)
       end
@@ -90,7 +90,7 @@ def [](key)
       return self[current_body] if key == :body
 
       if in_member_set?(key)
-        super(key)
+        super
       else
         custom_members[key]
       end
@@ -105,7 +105,7 @@ def []=(key, value)
       end
 
       if in_member_set?(key)
-        super(key, value)
+        super
       else
         custom_members[key] = value
       end