[#288] Entity#exec_with_object should not call &block with options when block accepts only one argument (#288)

Author: DmitryTsepelev

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 #### Fixes
 
+* [#288](https://github.com/ruby-grape/grape-entity/pull/288) Fix wrong argument exception when &:block passed to the expose method  - [@DmitryTsepelev](https://github.com/DmitryTsepelev)
+
 * Your contribution here.
 
 ### 0.6.1 (2017-01-09)

lib/grape_entity/entity.rb

@@ -492,7 +492,11 @@ def serializable_hash(runtime_options = {})
     end
 
     def exec_with_object(options, &block)
-      instance_exec(object, options, &block)
+      if block.parameters.count == 1
+        instance_exec(object, &block)
+      else
+        instance_exec(object, options, &block)
+      end
     end
 
     def exec_with_attribute(attribute, &block)

spec/grape_entity/entity_spec.rb

@@ -114,6 +114,30 @@ 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
+            end
+
+            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
+
+            value = subject.represent(object).value_for(:that_method_without_args)
+            expect(value).to eq('result')
+
+            value2 = subject.represent(object).value_for(:that_method_without_args_again)
+            expect(value2).to eq('result')
+          end
+        end
+
         context 'with no parameters passed to the block' do
           it 'adds a nested exposure' do
             subject.expose :awesome do