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

Merge pull request #748 from raphaelpereira/0-9-stable

Browse Source 
Propagate serialization_options across associations
This commit is contained in:
Alexandre de Oliveira
2015-03-30 16:31:41 -03:00
parent fe240d5755 fd5cd879f8
commit dc08f0ec80
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/active_model/serializer.rb
View File

@@ -163,7 +163,7 @@ end
end
end
def associations
def associations(options={})
associations = self.class._associations
included_associations = filter(associations.keys)
associations.each_with_object({}) do |(name, association), hash|
@@ -180,7 +180,7 @@ end
if association.embed_namespace?
hash = hash[association.embed_namespace] ||= {}
end
hash[association.embedded_key] = serialize association
hash[association.embedded_key] = serialize association, options
end
end
end
@@ -240,8 +240,8 @@ end
end
end
def serialize(association)
build_serializer(association).serializable_object
def serialize(association,options={})
build_serializer(association).serializable_object(options)
end
def serialize_ids(association)
@@ -286,7 +286,7 @@ end
self.serialization_options = options
return @wrap_in_array ? [] : nil if @object.nil?
hash = attributes
hash.merge! associations
hash.merge! associations(options)
hash = convert_keys(hash) if key_format.present?
hash = { :type => type_name(@object), type_name(@object) => hash } if @polymorphic
@wrap_in_array ? [hash] : hash