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

Further cleanup included_for.

Browse Source
This commit is contained in:
Lucas Hosseini 2015-09-01 20:15:27 +02:00
parent 91c5cbe0b9
commit bae4951e05
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,8 @@ module ActiveModel
@hash[:data] = attributes_for(serializer, options) @hash[:data] = attributes_for(serializer, options)
relationships = relationships_for(serializer) relationships = relationships_for(serializer)
@hash[:data][:relationships] = relationships if relationships.any? @hash[:data][:relationships] = relationships if relationships.any?
add_included_relationships(serializer) included = included_for(serializer)
@hash[:included] = included if included.any?
end end
@hash @hash
end end
@ -116,40 +117,37 @@ module ActiveModel
relationships relationships
end end
def add_included_relationships(serializer) def included_for(serializer)
serializer.associations.each do |association| serializer.associations.flat_map { |assoc| _included_for(assoc.key, assoc.serializer) }.uniq
Array(association.serializer).each do |assoc_serializer|
add_included(association.key, assoc_serializer)
end
end
end end
def add_included(resource_name, serializer, parent = nil) def _included_for(resource_name, serializer, parent = nil)
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
serializer.each { |s| add_included(resource_name, s, parent) } serializer.flat_map { |s| _included_for(resource_name, s, parent) }.uniq
return
else else
return unless serializer.object result = []
end if serializer && serializer.object
resource_path = [parent, resource_name].compact.join('.') resource_path = [parent, resource_name].compact.join('.')
if include_assoc?(resource_path) if include_assoc?(resource_path)
@hash[:included] ||= []
attrs = attributes_for(serializer, @options) attrs = attributes_for(serializer, @options)
relationships = relationships_for(serializer) relationships = relationships_for(serializer)
attrs[:relationships] = relationships if relationships.any? attrs[:relationships] = relationships if relationships.any?
result.push(attrs)
@hash[:included].push(attrs) unless @hash[:included].include?(attrs)
end end
if include_nested_assoc?(resource_path) if include_nested_assoc?(resource_path)
serializer.associations.each do |association| serializer.associations.each do |association|
add_included(association.key, association.serializer, resource_path) if association.serializer if association.serializer
result.concat(_included_for(association.key, association.serializer, resource_path))
result.uniq!
end end
end end
end end
end
result
end
end
def include_assoc?(assoc) def include_assoc?(assoc)
check_assoc("#{assoc}$") check_assoc("#{assoc}$")