Use method instead of asssociation_ids if method exists. Fixes #267

This commit is contained in:
Sean Abrahams
2013-04-10 14:38:53 -07:00
parent a771f30816
commit 79acd87829
2 changed files with 29 additions and 2 deletions

View File

@@ -133,7 +133,7 @@ module ActiveModel
def serialize_ids
ids_key = "#{@name.to_s.singularize}_ids".to_sym
if !option(:embed_key) && source_serializer.object.respond_to?(ids_key)
if !option(:embed_key) && !source_serializer.respond_to?(@name.to_s) && source_serializer.object.respond_to?(ids_key)
source_serializer.object.read_attribute_for_serialization(ids_key)
else
associated_object.map do |item|
@@ -219,7 +219,7 @@ module ActiveModel
else
nil
end
elsif !option(:embed_key) && source_serializer.object.respond_to?(id_key)
elsif !option(:embed_key) && !source_serializer.respond_to?(@name.to_s) && source_serializer.object.respond_to?(id_key)
source_serializer.object.read_attribute_for_serialization(id_key)
elsif associated_object
associated_object.read_attribute_for_serialization(embed_key)