ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Benjamin Fleischer
2017-04-23 17:42:30 -05:00
parent ee69293c8f
commit 7d8fb1606b
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/active_model/serializer.rb
View File

@@ -341,7 +341,8 @@ module ActiveModel
next if reflection.excluded?(self)
next unless include_directive.key?(key)
y.yield reflection.build_association(self, instance_options, include_slice)
association = reflection.build_association(self, instance_options, include_slice)
y.yield association
end
end
end
@@ -390,14 +391,12 @@ module ActiveModel
# @api private
def associations_hash(adapter_options, options, adapter_instance)
relationships = {}
include_directive = options.fetch(:include_directive)
associations(include_directive).each do |association|
adapter_opts = adapter_options.merge(include_directive: include_directive[association.key])
relationships[association.key] ||= association.serializable_hash(adapter_opts, adapter_instance)
include_slice = options[:include_slice]
associations(include_directive, include_slice).each_with_object({}) do |association, relationships|
adapter_opts = adapter_options.merge(include_directive: include_directive[association.key], adapter_instance: adapter_instance)
relationships[association.key] = association.serializable_hash(adapter_opts, adapter_instance)
end
relationships
end
protected