Autocorrect Rubocop offenses

ruby-grape · Dec 13, 2023 · 0b1360f · 0b1360f
1 parent e45fcc8
commit 0b1360f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/lib/grape_entity/condition/base.rb b/lib/grape_entity/condition/base.rb
@@ -4,8 +4,8 @@ module Grape
   class Entity
     module Condition
       class Base
-        def self.new(inverse, *args, &block)
-          super(inverse).tap { |e| e.setup(*args, &block) }
+        def self.new(inverse, *, &block)
+          super(inverse).tap { |e| e.setup(*, &block) }
         end
 
         def initialize(inverse = false)

diff --git a/lib/grape_entity/entity.rb b/lib/grape_entity/entity.rb
@@ -598,10 +598,10 @@ def self.merge_options(options)
           if existing_val.is_a?(Hash) && new_val.is_a?(Hash)
             existing_val.merge(new_val)
           elsif new_val.is_a?(Hash)
-            (opts["#{key}_extras".to_sym] ||= []) << existing_val
+            (opts[:"#{key}_extras"] ||= []) << existing_val
             new_val
           else
-            (opts["#{key}_extras".to_sym] ||= []) << new_val
+            (opts[:"#{key}_extras"] ||= []) << new_val
             existing_val
           end
         else

diff --git a/lib/grape_entity/exposure/base.rb b/lib/grape_entity/exposure/base.rb
@@ -9,8 +9,8 @@ module Exposure
       class Base
         attr_reader :attribute, :is_safe, :documentation, :override, :conditions, :for_merge
 
-        def self.new(attribute, options, conditions, *args, &block)
-          super(attribute, options, conditions).tap { |e| e.setup(*args, &block) }
+        def self.new(attribute, options, conditions, *, &block)
+          super(attribute, options, conditions).tap { |e| e.setup(*, &block) }
         end
 
         def initialize(attribute, options, conditions)

diff --git a/spec/grape_entity/entity_spec.rb b/spec/grape_entity/entity_spec.rb
@@ -30,9 +30,11 @@
 
         it 'makes sure that :format_with as a proc cannot be used with a block' do
           # rubocop:disable Style/BlockDelimiters
-          # rubocop:disable Lint/Debugger
-          expect { subject.expose :name, format_with: proc {} do p 'hi' end }.to raise_error ArgumentError
-          # rubocop:enable Lint/Debugger
+          expect {
+            subject.expose :name, format_with: proc {} do
+              p 'hi'
+            end
+          }.to raise_error ArgumentError
           # rubocop:enable Style/BlockDelimiters
         end