Rubocop todo fixes (#2004)

* Fix Style/HashTransformValues

* Fix Lint/RedundantRequireStatement

* Fix Lint/RedundantRequireStatement

* Fix Style/MutableConstant

* Fix Lint/DisjunctiveAssignmentInConstructor

Author: dblock

.rubocop_todo.yml

@@ -47,14 +47,6 @@ Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/grape/dsl/routing_spec.rb'
 
-# Offense count: 4
-Lint/DisjunctiveAssignmentInConstructor:
-  Exclude:
-    - 'lib/grape/namespace.rb'
-    - 'lib/grape/path.rb'
-    - 'lib/grape/router.rb'
-    - 'lib/grape/router/pattern.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Lint/NonDeterministicRequireOrder:
@@ -67,12 +59,6 @@ Lint/RedundantCopDisableDirective:
   Exclude:
     - 'lib/grape/router/attribute_translator.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/RedundantRequireStatement:
-  Exclude:
-    - 'lib/grape.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Lint/ToJSON:
@@ -144,12 +130,6 @@ Performance/InefficientHashSearch:
   Exclude:
     - 'spec/grape/validations/validators/values_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/grape/middleware/versioner/path.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 Style/EmptyLambdaParameter:
@@ -174,12 +154,6 @@ Style/ExpandPathArguments:
 Style/FormatStringToken:
   EnforcedStyle: template
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/HashTransformValues:
-  Exclude:
-    - 'lib/grape/api.rb'
-
 # Offense count: 23
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
@@ -205,15 +179,6 @@ Style/MethodMissingSuper:
   Exclude:
     - 'lib/grape/router/attribute_translator.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'lib/grape/middleware/versioner/header.rb'
-    - 'lib/grape/router/route.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.

CHANGELOG.md

@@ -8,7 +8,7 @@
 * [#2002](https://github.com/ruby-grape/grape/pull/2002): Objects allocation optimization (lazy_lookup) - [@ericproulx](https://github.com/ericproulx).
 
 #### Fixes
-
+* [#2004](https://github.com/ruby-grape/grape/pull/2004): Rubocop fixes - [@ericproulx](https://github.com/ericproulx).
 * [#1995](https://github.com/ruby-grape/grape/pull/1995): Fix: "undefined instance variables" and "method redefined" warnings - [@nbeyer](https://github.com/nbeyer).
 * [#1994](https://github.com/ruby-grape/grape/pull/1993): Fix typos in README - [@bellmyer](https://github.com/bellmyer).
 * [#1993](https://github.com/ruby-grape/grape/pull/1993): Lazy join allow header - [@ericproulx](https://github.com/ericproulx).

lib/grape.rb

@@ -20,7 +20,6 @@
 require 'active_support/dependencies/autoload'
 require 'active_support/notifications'
 require 'i18n'
-require 'thread'
 
 I18n.load_path << File.expand_path('../grape/locale/en.yml', __FILE__)
 

lib/grape/api.rb

@@ -175,7 +175,7 @@ def evaluate_arguments(configuration, *args)
           if argument.respond_to?(:lazy?) && argument.lazy?
             argument.evaluate_from(configuration)
           elsif argument.is_a?(Hash)
-            argument.map { |key, value| [key, evaluate_arguments(configuration, value).first] }.to_h
+            argument.transform_values { |value| evaluate_arguments(configuration, value).first }
           elsif argument.is_a?(Array)
             evaluate_arguments(configuration, *argument)
           else

lib/grape/middleware/versioner/header.rb

@@ -26,10 +26,10 @@ module Versioner
       # route.
       class Header < Base
         VENDOR_VERSION_HEADER_REGEX =
-          /\Avnd\.([a-z0-9.\-_!#\$&\^]+?)(?:-([a-z0-9*.]+))?(?:\+([a-z0-9*\-.]+))?\z/
+          /\Avnd\.([a-z0-9.\-_!#\$&\^]+?)(?:-([a-z0-9*.]+))?(?:\+([a-z0-9*\-.]+))?\z/.freeze
 
-        HAS_VENDOR_REGEX = /\Avnd\.[a-z0-9.\-_!#\$&\^]+/
-        HAS_VERSION_REGEX = /\Avnd\.([a-z0-9.\-_!#\$&\^]+?)(?:-([a-z0-9*.]+))+/
+        HAS_VENDOR_REGEX = /\Avnd\.[a-z0-9.\-_!#\$&\^]+/.freeze
+        HAS_VERSION_REGEX = /\Avnd\.([a-z0-9.\-_!#\$&\^]+?)(?:-([a-z0-9*.]+))+/.freeze
 
         def before
           strict_header_checks if strict?

lib/grape/middleware/versioner/path.rb

@@ -36,7 +36,7 @@ def before
 
           pieces = path.split('/')
           potential_version = pieces[1]
-          return unless potential_version =~ options[:pattern]
+          return unless potential_version&.match?(options[:pattern])
           throw :error, status: 404, message: '404 API Version Not Found' if options[:versions] && !options[:versions].find { |v| v.to_s == potential_version }
           env[Grape::Env::API_VERSION] = potential_version
         end

lib/grape/namespace.rb

@@ -38,7 +38,7 @@ def self.joined_space_path(settings)
 
     class JoinedSpaceCache < Grape::Util::Cache
       def initialize
-        @cache ||= Hash.new do |h, joined_space|
+        @cache = Hash.new do |h, joined_space|
           h[joined_space] = -joined_space.join('/')
         end
       end

lib/grape/path.rb

@@ -75,7 +75,7 @@ def to_s
 
     class PartsCache < Grape::Util::Cache
       def initialize
-        @cache ||= Hash.new do |h, parts|
+        @cache = Hash.new do |h, parts|
           h[parts] = -parts.join('/')
         end
       end

lib/grape/router.rb

@@ -19,7 +19,7 @@ def initialize(pattern, regexp, index, **attributes)
 
     class NormalizePathCache < Grape::Util::Cache
       def initialize
-        @cache ||= Hash.new do |h, path|
+        @cache = Hash.new do |h, path|
           normalized_path = +"/#{path}"
           normalized_path.squeeze!('/')
           normalized_path.sub!(%r{/+\Z}, '')

lib/grape/router/pattern.rb

@@ -57,7 +57,7 @@ def extract_capture(requirements: {}, **options)
 
       class PatternCache < Grape::Util::Cache
         def initialize
-          @cache ||= Hash.new do |h, (pattern, suffix)|
+          @cache = Hash.new do |h, (pattern, suffix)|
             h[[pattern, suffix]] = -"#{pattern}#{suffix}"
           end
         end