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

Handle correctly null associations

Browse Source 
null belongs_to associations are now serialized as nil instead
of raise an error during serialization.
This commit is contained in:
Guillermo Iguaran
2014-10-30 09:35:05 -05:00
parent baf3db1365
commit 19ac139880
12 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/active_model/serializer/adapter/json.rb
View File

@@ -13,7 +13,11 @@ module ActiveModel
array_serializer = association
@result[name] = array_serializer.map { |item| item.attributes(opts) }
else
@result[name] = association.attributes(options)
if association
@result[name] = association.attributes(options)
else
@result[name] = nil
end
end
end
end

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

@@ -44,13 +44,17 @@ module ActiveModel
end
def add_link(name, serializer, options)
@hash[@root][:links][name] = serializer.id.to_s
if serializer
@hash[@root][:links][name] = serializer.id.to_s
unless options[:embed] == :ids
plural_name = name.to_s.pluralize.to_sym
unless options[:embed] == :ids
plural_name = name.to_s.pluralize.to_sym
@hash[:linked][plural_name] ||= []
@hash[:linked][plural_name].push attributes_for_serializer(serializer, options)
@hash[:linked][plural_name] ||= []
@hash[:linked][plural_name].push attributes_for_serializer(serializer, options)
end
else
@hash[@root][:links][name] = nil
end
end