fix-serializable-hash-option

CHANGELOG.md

@@ -2,6 +2,7 @@
 ============
 
 * [#215](https://github.com/ruby-grape/grape-entity/pull/217): Fix: `#delegate_attribute` no longer delegates to methods included with `Kernel` - [@maltoe](https://github.com/maltoe).
+* [#219](https://github.com/ruby-grape/grape-entity/pull/219): Fix: double pass options in serializable_hash - [@sbatykov](https://github.com/sbatykov).
 * Your contribution here.
 
 0.5.1 (2016-4-4)

lib/grape_entity/exposure/base.rb

@@ -63,7 +63,7 @@ def serializable_value(entity, options)
           partial_output = valid_value(entity, options)
 
           if partial_output.respond_to?(:serializable_hash)
-            partial_output.serializable_hash(options)
+            partial_output.serializable_hash
           elsif partial_output.is_a?(Array) && partial_output.all? { |o| o.respond_to?(:serializable_hash) }
             partial_output.map(&:serializable_hash)
           elsif partial_output.is_a?(Hash)

spec/grape_entity/hash_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Grape::Entity do
+  it 'except option for nested entity' do
+    module EntitySpec
+      class Address < Grape::Entity
+        expose :post, if: :full
+        expose :city
+        expose :street
+        expose :house
+      end
+
+      class Company < Grape::Entity
+        expose :full_name, if: :full
+        expose :name
+        expose :address do |c, o|
+          Address.represent c[:address], Grape::Entity::Options.new(o.opts_hash.except(:full))
+        end
+      end
+    end
+
+    company = {
+      full_name: 'full_name',
+      name: 'name',
+      address: {
+        post: '123456',
+        city: 'city',
+        street: 'street',
+        house: 'house',
+        something_else: 'something_else'
+      }
+    }
+
+    expect(EntitySpec::Company.represent(company).serializable_hash).to eq \
+      company.slice(:name).merge(address: company[:address].slice(:city, :street, :house))
+
+    expect(EntitySpec::Company.represent(company, full: true).serializable_hash).to eq \
+      company.slice(:full_name, :name).merge(address: company[:address].slice(:city, :street, :house))
+  end
+end