Skip to content

Commit 3112419

Browse files
committed
Nested exposures, defined in inherited entities, should be merged with same nested exposures from parent classes
ruby-grape#63
1 parent 353a8be commit 3112419

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/grape_entity/entity.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def nested_exposures
195195
value = nested_exposures_hash
196196

197197
if superclass.respond_to? :nested_exposures
198-
value = superclass.nested_exposures.merge(value)
198+
value = superclass.nested_exposures.deep_merge(value)
199199
end
200200

201201
value

spec/grape_entity/entity_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ class Parent < Person
155155
ClassRoom.represent({}).serializable_hash.should == {
156156
parents: [
157157
{
158-
user: { id: "value", in_first: 'value' },
158+
user: { in_first: 'value' },
159159
children: [
160160
{ user: { in_first: 'value', user_id: "value", display_id: "value" } },
161161
{ user: { in_first: 'value', user_id: "value", display_id: "value" } }
162162
]
163163
},
164164
{
165-
user: { id: "value", in_first: 'value' },
165+
user: { in_first: 'value' },
166166
children: [
167167
{ user: { in_first: 'value', user_id: "value", display_id: "value" } },
168168
{ user: { in_first: 'value', user_id: "value", display_id: "value" } }

0 commit comments

Comments
 (0)