Merge branch 'master' into master

Author: LeFnord

lib/grape_entity/entity.rb

@@ -527,7 +527,9 @@ 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'
+ raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0' if e.is_a?(ArgumentError)
+
+ raise e.class, e.message
  end
 
  def exec_with_attribute(attribute, &block)

spec/grape_entity/entity_spec.rb

@@ -262,30 +262,40 @@ class BogusEntity < Grape::Entity
  end
  end
 
- context 'with block passed via &' do
- it 'with does not pass options when block is passed via &' do
- class SomeObject
- def method_without_args
- 'result'
- end
+ describe 'blocks' do
+ class SomeObject
+ def method_without_args
+ 'result'
  end
+ end
 
- subject.expose :that_method_without_args do |object|
- object.method_without_args
- end
+ describe 'with block passed in' do
+ specify do
+ subject.expose :that_method_without_args do |object|
+ object.method_without_args
+ end
 
- subject.expose :that_method_without_args_again, &:method_without_args
+  object = SomeObject.new
 
- object = SomeObject.new
+ value = subject.represent(object).value_for(:that_method_without_args)
+ expect(value).to eq('result')
+ end
+ end
 
- value = subject.represent(object).value_for(:that_method_without_args)
- expect(value).to eq('result')
+ context 'with block passed in via &' do
+ specify do
+ subject.expose :that_method_without_args_again, &:method_without_args
 
- if RUBY_VERSION.start_with?('3')
- expect { subject.represent(object).value_for(:that_method_without_args_again) }.to raise_error Grape::Entity::Deprecated
- else
- value2 = subject.represent(object).value_for(:that_method_without_args_again)
- expect(value2).to eq('result')
+ object = SomeObject.new
+
+ if RUBY_VERSION.start_with?('3')
+ expect do
+ subject.represent(object).value_for(:that_method_without_args_again)
+ end.to raise_error Grape::Entity::Deprecated
+ else
+ value2 = subject.represent(object).value_for(:that_method_without_args_again)
+ expect(value2).to eq('result')
+ end
  end
  end
  end