Merge pull request #2106 from dblock/rubocop-a

Enable new cops for RuboCop.

Author: dblock

.rubocop.yml

@@ -1,12 +1,13 @@
-require:
-  - rubocop-performance
-
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.4
   Exclude:
     - vendor/**/*
     - bin/**/*
 
+require:
+  - rubocop-performance
+
 inherit_from: .rubocop_todo.yml
 
 Style/Documentation:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-05-26 08:28:37 -0400 using RuboCop version 0.84.0.
+# on 2020-09-30 12:54:06 -0400 using RuboCop version 0.84.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
@@ -13,7 +13,7 @@ Layout/ClosingHeredocIndentation:
     - 'spec/grape/api_spec.rb'
     - 'spec/grape/entity_spec.rb'
 
-# Offense count: 71
+# Offense count: 73
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
@@ -53,43 +53,37 @@ Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/RedundantCopDisableDirective:
-  Exclude:
-    - 'lib/grape/router/attribute_translator.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Lint/ToJSON:
   Exclude:
     - 'spec/grape/middleware/formatter_spec.rb'
 
-# Offense count: 47
+# Offense count: 50
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 44
+  Max: 43
 
 # Offense count: 6
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 182
 
-# Offense count: 10
+# Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 305
+  Max: 304
 
 # Offense count: 30
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 61
+# Offense count: 69
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 36
+  Max: 32
 
 # Offense count: 12
 # Configuration parameters: CountComments.
@@ -120,13 +114,6 @@ Naming/MethodParameterName:
     - 'lib/grape/middleware/stack.rb'
     - 'spec/grape/api_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
-  Exclude:
-    - 'lib/grape/middleware/error.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Performance/InefficientHashSearch:
@@ -157,25 +144,20 @@ Style/ExpandPathArguments:
 Style/FormatStringToken:
   EnforcedStyle: template
 
-# Offense count: 23
+# Offense count: 19
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/grape/api/instance.rb'
     - 'lib/grape/dsl/desc.rb'
     - 'lib/grape/dsl/request_response.rb'
-    - 'lib/grape/dsl/routing.rb'
     - 'lib/grape/dsl/settings.rb'
     - 'lib/grape/endpoint.rb'
     - 'lib/grape/error_formatter/json.rb'
     - 'lib/grape/error_formatter/xml.rb'
-    - 'lib/grape/middleware/error.rb'
     - 'lib/grape/middleware/formatter.rb'
     - 'lib/grape/middleware/versioner/accept_version_header.rb'
     - 'lib/grape/validations/params_scope.rb'
-    - 'lib/grape/validations/validators/base.rb'
-    - 'lib/grape/validations/validators/default.rb'
-    - 'spec/support/versioned_helpers.rb'
 
 # Offense count: 1
 Style/MethodMissingSuper:
@@ -191,7 +173,7 @@ Style/NumericPredicate:
     - 'spec/**/*'
     - 'lib/grape/middleware/formatter.rb'
 
-# Offense count: 11
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
 # AllowedMethods: present?, blank?, presence, try, try!
@@ -202,18 +184,9 @@ Style/SafeNavigation:
     - 'lib/grape/dsl/inside_route.rb'
     - 'lib/grape/dsl/request_response.rb'
     - 'lib/grape/endpoint.rb'
-    - 'lib/grape/middleware/error.rb'
     - 'lib/grape/middleware/versioner/accept_version_header.rb'
     - 'lib/grape/middleware/versioner/header.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/grape/middleware/error.rb'
-
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinSize, WordRegex.
@@ -223,7 +196,7 @@ Style/WordArray:
     - 'spec/grape/validations/validators/except_values_spec.rb'
     - 'spec/grape/validations/validators/values_spec.rb'
 
-# Offense count: 125
+# Offense count: 131
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https

Gemfile

@@ -2,7 +2,7 @@
 
 # when changing this file, run appraisal install ; rubocop -a gemfiles/*.gemfile
 
-source 'https://rubygems.org'
+source('https://rubygems.org')
 
 gemspec
 

Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'bundler'
-Bundler.setup :default, :test, :development
+require('rubygems')
+require('bundler')
+Bundler.setup(:default, :test, :development)
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require('rspec/core/rake_task')
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.exclude_pattern = 'spec/integration/**/*_spec.rb'
@@ -17,11 +17,11 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec
+task(:spec)
 
-require 'rainbow/ext/string' unless String.respond_to?(:color)
+require('rainbow/ext/string') unless String.respond_to?(:color)
 
-require 'rubocop/rake_task'
+require('rubocop/rake_task')
 RuboCop::RakeTask.new
 
-task default: %i[rubocop spec]
+task(default: %i[rubocop spec])

benchmark/remounting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'grape'
 require 'benchmark/memory'

lib/grape/dsl/helpers.rb

@@ -81,6 +81,7 @@ def inject_api_helpers_to_mod(mod, &_block)
       # to provide some API-specific functionality.
       module BaseHelper
         attr_accessor :api
+
         def params(name, &block)
           @named_params ||= {}
           @named_params[name] = block

lib/grape/middleware/base.rb

@@ -8,6 +8,7 @@ class Base
       include Helpers
 
       attr_reader :app, :env, :options
+
       TEXT_HTML = 'text/html'
 
       include Grape::DSL::Headers

lib/grape/util/lazy_value.rb

@@ -4,6 +4,7 @@ module Grape
   module Util
     class LazyValue
       attr_reader :access_keys
+
       def initialize(value, access_keys = [])
         @value = value
         @access_keys = access_keys

spec/grape/entity_spec.rb

@@ -181,6 +181,7 @@ def first
         subject.get '/example' do
           c = Class.new do
             attr_reader :id
+
             def initialize(id)
               @id = id
             end
@@ -202,6 +203,7 @@ def initialize(id)
         subject.get '/examples' do
           c = Class.new do
             attr_reader :id
+
             def initialize(id)
               @id = id
             end
@@ -226,6 +228,7 @@ def initialize(id)
       subject.get '/example' do
         c = Class.new do
           attr_reader :name
+
           def initialize(args)
             @name = args[:name] || 'no name set'
           end
@@ -255,6 +258,7 @@ def initialize(args)
       subject.get '/example' do
         c = Class.new do
           attr_reader :name
+
           def initialize(args)
             @name = args[:name] || 'no name set'
           end
@@ -284,6 +288,7 @@ def initialize(args)
       subject.get '/example' do
         c = Class.new do
           attr_reader :name
+
           def initialize(args)
             @name = args[:name] || 'no name set'
           end
@@ -302,6 +307,7 @@ def initialize(args)
       it 'present with multiple entities using optional symbol' do
         user = Class.new do
           attr_reader :name
+
           def initialize(args)
             @name = args[:name] || 'no name set'
           end

spec/grape/middleware/stack_spec.rb

@@ -8,6 +8,7 @@ class FooMiddleware; end
     class BarMiddleware; end
     class BlockMiddleware
       attr_reader :block
+
       def initialize(&block)
         @block = block
       end