ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename resource_objects_for to primary_data_for.

Browse Source
This commit is contained in:
Lucas Hosseini 2015-09-02 19:27:40 +02:00
parent f8c553a0ed
commit 3793f3ff4b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/active_model/serializer/adapter/json_api.rb
View File

@ -36,10 +36,10 @@ module ActiveModel
add_links(options) add_links(options)
else else
resource_objects = resource_objects_for(serializer, options) primary_data = primary_data_for(serializer, options)
relationships = relationships_for(serializer) relationships = relationships_for(serializer)
included = included_for(serializer) included = included_for(serializer)
@hash[:data] = resource_objects @hash[:data] = primary_data
@hash[:data][:relationships] = relationships if relationships.any? @hash[:data][:relationships] = relationships if relationships.any?
@hash[:included] = included if included.any? @hash[:included] = included if included.any?
end end
@ -87,7 +87,7 @@ module ActiveModel
end end
end end
def resource_objects_for(serializer, options) def primary_data_for(serializer, options)
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
serializer.map { |s| resource_object_for(s, options) } serializer.map { |s| resource_object_for(s, options) }
else else
@ -126,10 +126,10 @@ module ActiveModel
resource_path = [parent, resource_name].compact.join('.') resource_path = [parent, resource_name].compact.join('.')
if include_assoc?(resource_path) if include_assoc?(resource_path)
resource_object = resource_object_for(serializer, @options) primary_data = primary_data_for(serializer, @options)
relationships = relationships_for(serializer) relationships = relationships_for(serializer)
resource_object[:relationships] = relationships if relationships.any? primary_data[:relationships] = relationships if relationships.any?
result.push(resource_object) result.push(primary_data)
end end
if include_nested_assoc?(resource_path) if include_nested_assoc?(resource_path)