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

Remove Attributes adapter recursion

Browse Source
This commit is contained in:
Benjamin Fleischer 2016-06-01 01:32:14 -05:00
parent 998ca55e3d
commit f28e486d4a
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/active_model_serializers/adapter/attributes.rb
View File

@ -3,44 +3,51 @@ module ActiveModelSerializers
class Attributes < Base class Attributes < Base
def initialize(serializer, options = {}) def initialize(serializer, options = {})
super super
@include_directive =
if options[:include_directive]
options[:include_directive]
elsif options[:include]
JSONAPI::IncludeDirective.new(options[:include], allow_wildcard: true)
else
ActiveModelSerializers.default_include_directive
end
end end
def serializable_hash(options = nil) def serializable_hash(options = nil)
options = serialization_options(options) options = serialization_options(options)
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
serializable_hash_for_collection(options) serializable_hash_for_collection(serializer, options)
else else
serializable_hash_for_single_resource(options) serializable_hash_for_single_resource(serializer, instance_options, options)
end end
end end
private private
def serializable_hash_for_collection(options) def include_directive_from_options(options)
instance_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(serializer, self, @include_directive) if options[:include_directive]
opts = instance_options.merge(include_directive: @include_directive) options[:include_directive]
serializer.map { |s| Attributes.new(s, opts).serializable_hash(options) } elsif options[:include]
JSONAPI::IncludeDirective.new(options[:include], allow_wildcard: true)
else
ActiveModelSerializers.default_include_directive
end
end end
def serializable_hash_for_single_resource(options) def serializable_hash_for_collection(serializers, options)
cached_attributes = instance_options[:cached_attributes] || {} include_directive = include_directive_from_options(instance_options)
instance_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(serializers, self, include_directive)
instance_opts = instance_options.merge(include_directive: include_directive)
serializers.map do |serializer|
serializable_hash_for_single_resource(serializer, instance_opts, options)
end
end
def serializable_hash_for_single_resource(serializer, instance_options, options)
options[:include_directive] ||= include_directive_from_options(instance_options)
cached_attributes = instance_options[:cached_attributes] ||= {}
resource = serializer.cached_attributes(options[:fields], cached_attributes, self) resource = serializer.cached_attributes(options[:fields], cached_attributes, self)
relationships = resource_relationships(options) relationships = resource_relationships(serializer, options)
resource.merge(relationships) resource.merge(relationships)
end end
def resource_relationships(options) def resource_relationships(serializer, options)
relationships = {} relationships = {}
serializer.associations(@include_directive).each do |association| include_directive = options.fetch(:include_directive)
serializer.associations(include_directive).each do |association|
relationships[association.key] ||= relationship_value_for(association, options) relationships[association.key] ||= relationship_value_for(association, options)
end end
@ -51,7 +58,8 @@ module ActiveModelSerializers
return association.options[:virtual_value] if association.options[:virtual_value] return association.options[:virtual_value] if association.options[:virtual_value]
return unless association.serializer && association.serializer.object return unless association.serializer && association.serializer.object
opts = instance_options.merge(include_directive: @include_directive[association.key]) include_directive = options.fetch(:include_directive)
opts = instance_options.merge(include_directive: include_directive[association.key])
relationship_value = Attributes.new(association.serializer, opts).serializable_hash(options) relationship_value = Attributes.new(association.serializer, opts).serializable_hash(options)
if association.options[:polymorphic] && relationship_value if association.options[:polymorphic] && relationship_value