Some maintainance tasks. (#339)

- updates rubocop and make it happy

Author: LeFnord

.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
     - vendor/**/*
     - example/**/*
   TargetRubyVersion: 2.7
+  UseCache: true
+  NewCops: enable
 
 #  Layout stuff
 #
@@ -27,25 +29,18 @@ Layout/SpaceAroundMethodCallOperator:
 
 #  Lint stuff
 #
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/DuplicateElsifCondition:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
+Lint/ConstantDefinitionInBlock:
   Enabled: true
+  Exclude:
+    - spec/**/*
 
 #  Metrics stuff
 #
 Metrics/AbcSize:
   Max: 25
+  IgnoredMethods:
+    # from lib/grape_entity/exposure/nesting_exposure.rb
+    - 'normalized_exposures'
 
 Metrics/BlockLength:
   Exclude:
@@ -64,6 +59,12 @@ Metrics/MethodLength:
 
 Metrics/PerceivedComplexity:
   Max: 11
+  IgnoredMethods:
+    # from lib/grape_entity/entity.rb
+    - 'expose'
+    - 'merge_options'
+    # from lib/grape_entity/exposure/nesting_exposure.rb
+    - 'normalized_exposures'
 
 #  Naming stuff
 #
@@ -73,56 +74,13 @@ Naming:
 
 #  Style stuff
 #
-Style/AccessorGrouping:
-  Enabled: true
-
-Style/ArrayCoercion:
-  Enabled: true
-
-Style/BisectedAttrAccessor:
-  Enabled: true
-
-Style/CaseLikeIf:
-  Enabled: true
-
 Style/Documentation:
   Enabled: false
 
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/HashAsLastArrayItem:
-  Enabled: true
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Style/RedundantFetchBlock:
-  Enabled: true
-
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: true
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/SlicingWithRange:
-  Enabled: true
+Style/OptionalBooleanParameter:
+  AllowedMethods:
+    # from lib/grape_entity/condition/base.rb
+    - 'initialize'
+    # form lib/grape_entity/entity.rb
+    - 'entity_class'
+    - 'present_collection'

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-02-18 16:38:42 +0100 using RuboCop version 0.79.0.
+# on 2020-11-07 00:01:40 UTC using RuboCop version 1.2.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
@@ -14,17 +14,11 @@ Gemspec/RequiredRubyVersion:
     - 'grape-entity.gemspec'
 
 # Offense count: 6
+# Cop supports --auto-correct.
 Lint/BooleanSymbol:
   Exclude:
     - 'spec/grape_entity/exposure_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  Exclude:
-    - 'spec/grape_entity/entity_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.

Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '~> 0.88.0', require: false
+  gem 'rubocop', '~> 1.0', require: false
 end
 
 group :test do

lib/grape_entity/condition/base.rb

@@ -21,7 +21,7 @@ def inversed?
         end
 
         def met?(entity, options)
-          !@inverse ? if_value(entity, options) : unless_value(entity, options)
+          @inverse ? unless_value(entity, options) : if_value(entity, options)
         end
 
         def if_value(_entity, _options)

lib/grape_entity/entity.rb

@@ -139,6 +139,8 @@ def delegation_opts
     def self.inherited(subclass)
       subclass.root_exposure = root_exposure.dup
       subclass.formatters = formatters.dup
+
+      super
     end
 
     # This method is the primary means by which you will declare what attributes

lib/grape_entity/exposure/base.rb

@@ -113,11 +113,9 @@ def key(entity = nil)
           @key.respond_to?(:call) ? entity.exec_with_object(@options, &@key) : @key
         end
 
-        def with_attr_path(entity, options)
+        def with_attr_path(entity, options, &block)
           path_part = attr_path(entity, options)
-          options.with_attr_path(path_part) do
-            yield
-          end
+          options.with_attr_path(path_part, &block)
         end
 
         def override?

lib/grape_entity/exposure/nesting_exposure.rb

@@ -91,6 +91,7 @@ def normalized_exposures(entity, options)
             output[exposure.key(entity)] ||= []
             output[exposure.key(entity)] << exposure
           end
+
           table.map do |key, exposures|
             last_exposure = exposures.last
 

lib/grape_entity/exposure/nesting_exposure/nested_exposures.rb

@@ -36,6 +36,7 @@ def clear
             @exposures.clear
           end
 
+          # rubocop:disable Style/DocumentDynamicEvalDefinition
           %i[
             each
             to_ary to_a
@@ -55,6 +56,7 @@ def #{name}(*args, &block)
               end
             RUBY
           end
+          # rubocop:enable Style/DocumentDynamicEvalDefinition
 
           # Determine if we have any nesting exposures with the same name.
           def deep_complex_nesting?(entity)

lib/grape_entity/exposure/nesting_exposure/output_builder.rb

@@ -9,6 +9,8 @@ def initialize(entity)
             @entity = entity
             @output_hash = {}
             @output_collection = []
+
+            super
           end
 
           def add(exposure, result)
@@ -49,6 +51,7 @@ def output
             output
           end
 
+          # rubocop:disable Lint/EmptyBlock
           # In case if we want to solve collisions providing lambda to :merge option
           def merge_strategy(for_merge)
             if for_merge.respond_to? :call
@@ -57,6 +60,7 @@ def merge_strategy(for_merge)
               -> {}
             end
           end
+          # rubocop:enable Lint/EmptyBlock
         end
       end
     end

spec/grape_entity/entity_spec.rb

@@ -30,7 +30,9 @@
 
         it 'makes sure that :format_with as a proc cannot be used with a block' do
           # rubocop:disable Style/BlockDelimiters
+          # rubocop:disable Lint/EmptyBlock
           expect { subject.expose :name, format_with: proc {} do p 'hi' end }.to raise_error ArgumentError
+          # rubocop:enable Lint/EmptyBlock
           # rubocop:enable Style/BlockDelimiters
         end
 
@@ -1693,10 +1695,12 @@ class FriendEntity < Grape::Entity
             end
           end
 
+          # rubocop:disable Lint/EmptyBlock
           fresh_class.class_eval do
             expose :first_friend, using: EntitySpec::FriendEntity do |_user, _opts|
             end
           end
+          # rubocop:enable Lint/EmptyBlock
 
           rep = subject.value_for(:first_friend)
           expect(rep).to be_kind_of EntitySpec::FriendEntity