Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
beauby committed Sep 2, 2015
1 parent a8a0566 commit f8c553a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/active_model/serializer/adapter/json_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ def serializable_hash(options = nil)

add_links(options)
else
@hash[:data] = resource_objects_for(serializer, options)
resource_objects = resource_objects_for(serializer, options)
relationships = relationships_for(serializer)
@hash[:data][:relationships] = relationships if relationships.any?
included = included_for(serializer)
@hash[:data] = resource_objects
@hash[:data][:relationships] = relationships if relationships.any?
@hash[:included] = included if included.any?
end
@hash
Expand Down Expand Up @@ -109,7 +110,7 @@ def relationship_value_for(serializer, options = {})
end

def relationships_for(serializer)
serializer.associations.map { |association| [ association.key, { data: relationship_value_for(association.serializer, association.options) } ] }.to_h
Hash[serializer.associations.map { |association| [ association.key, { data: relationship_value_for(association.serializer, association.options) } ] }]
end

def included_for(serializer)
Expand Down

0 comments on commit f8c553a

Please sign in to comment.