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

Fix bugs with included resources

Browse Source 
Make sure they're cached along with the including resource and remove duplicates
This commit is contained in:
Mateo Murphy 2015-03-24 20:07:25 -04:00
parent 5e560ddbef
commit 9aebc6cb11
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,7 @@ module ActiveModel
def initialize(serializer, options = {}) def initialize(serializer, options = {})
super super
serializer.root = true serializer.root = true
@hash = {} @hash = { data: [] }
@top = @options.fetch(:top) { @hash }
if fields = options.delete(:fields) if fields = options.delete(:fields)
@fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key) @fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
@ -17,8 +16,14 @@ module ActiveModel
def serializable_hash(options = {}) def serializable_hash(options = {})
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
@hash[:data] = serializer.map do |s| serializer.each do |s|
self.class.new(s, @options.merge(top: @top, fieldset: @fieldset)).serializable_hash[:data] result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash
@hash[:data] << result[:data]
if result[:included]
@hash[:included] ||= []
@hash[:included] |= result[:included]
end
end end
else else
@hash = cached_object do @hash = cached_object do
@ -53,14 +58,14 @@ 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)
@top[:included] ||= [] @hash[:included] ||= []
serializers.each do |serializer| serializers.each do |serializer|
attrs = attributes_for_serializer(serializer, @options) attrs = attributes_for_serializer(serializer, @options)
add_resource_links(attrs, serializer, add_included: false) add_resource_links(attrs, serializer, add_included: false)
@top[:included].push(attrs) unless @top[:included].include?(attrs) @hash[:included].push(attrs) unless @hash[:included].include?(attrs)
end end
end end