Don't suppress regular ArgumentError exceptions (#366)

* Don't suppress regular ArgumentError exceptions

Account specifically for the following scenario:

  expose :foo, &:bar

Note that `:bar.to_proc.parameters` always returns `[[:req], [:rest]]`.

We should not swallow ArgumentError exceptions in any other instance.

* Update rubocop todos

* Test Ruby 3.1 on CI

* Skip code coverage on Ruby >= 3.1

See simplecov-ruby/simplecov#1003

Author: splattael

.github/workflows/ruby.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', head, jruby, truffleruby]
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', head, jruby, truffleruby]
 
     steps:
     - uses: actions/checkout@v2

.rubocop_todo.yml

@@ -1,11 +1,27 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-07 00:01:40 UTC using RuboCop version 1.2.0.
+# on 2022-07-26 21:29:59 UTC using RuboCop version 1.32.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
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/DeprecatedAttributeAssignment:
+  Exclude:
+    - 'grape-entity.gemspec'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - 'grape-entity.gemspec'
+
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/*.gemspec
@@ -14,14 +30,20 @@ Gemspec/RequiredRubyVersion:
     - 'grape-entity.gemspec'
 
 # Offense count: 6
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/BooleanSymbol:
   Exclude:
     - 'spec/grape_entity/exposure_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
+# Offense count: 15
+Style/OpenStructUse:
+  Exclude:
+    - 'lib/grape_entity/delegator.rb'
+    - 'spec/grape_entity/entity_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods, AllowComments.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:

lib/grape_entity/entity.rb

@@ -522,7 +522,10 @@ def exec_with_object(options, &block)
       end
     rescue StandardError => e
       # it handles: https://github.com/ruby/ruby/blob/v3_0_0_preview1/NEWS.md#language-changes point 3, Proc
-      raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0' if e.is_a?(ArgumentError)
+      # accounting for expose :foo, &:bar
+      if e.is_a?(ArgumentError) && block.parameters == [[:req], [:rest]]
+        raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0'
+      end
 
       raise e
     end

spec/grape_entity/entity_spec.rb

@@ -389,6 +389,10 @@ class SomeObject
             def method_without_args
               'result'
             end
+
+            def raises_argument_error
+              raise ArgumentError, 'something different'
+            end
           end
 
           describe 'with block passed in' do
@@ -402,6 +406,17 @@ def method_without_args
               value = subject.represent(object).value_for(:that_method_without_args)
               expect(value).to eq('result')
             end
+
+            it 'does not suppress ArgumentError' do
+              subject.expose :raises_argument_error do |object|
+                object.raises_argument_error
+              end
+
+              object = SomeObject.new
+              expect do
+                subject.represent(object).value_for(:raises_argument_error)
+              end.to raise_error(ArgumentError, 'something different')
+            end
           end
 
           context 'with block passed in via &' do

spec/spec_helper.rb

@@ -9,12 +9,16 @@
                                           ActiveSupport::VERSION::MAJOR &&
                                           ActiveSupport::VERSION::MAJOR < 4
 
-SimpleCov.start do
-  add_filter 'spec/'
+# Skip code covarge on Ruby >= 3.1
+# See https://github.com/simplecov-ruby/simplecov/issues/1003
+unless RUBY_VERSION >= '3.1'
+  SimpleCov.start do
+    add_filter 'spec/'
+  end
+
+  Coveralls.wear! unless RUBY_PLATFORM.eql? 'java'
 end
 
-Coveralls.wear! unless RUBY_PLATFORM.eql? 'java'
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))