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

Merge pull request #121 from twinturbo/polymorphic-update

Browse Source 
Easier to work with polymorphic interface
This commit is contained in:
José Valim 2012-08-25 09:43:38 -07:00
commit 001c1d0634
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/active_model/serializer.rb
View File

@ -267,7 +267,10 @@ module ActiveModel
object = associated_object
if object && polymorphic?
{ polymorphic_key => find_serializable(object).serializable_hash }
{
:type => polymorphic_key,
polymorphic_key => find_serializable(object).serializable_hash
}
elsif object
find_serializable(object).serializable_hash
end
@ -283,7 +286,10 @@ module ActiveModel
object = associated_object
if object && polymorphic?
{ polymorphic_key => object.read_attribute_for_serialization(:id) }
{
:type => polymorphic_key,
:id => object.read_attribute_for_serialization(:id)
}
elsif object
object.read_attribute_for_serialization(:id)
else

15
test/serializer_test.rb
View File

@ -1025,6 +1025,7 @@ class SerializerTest < ActiveModel::TestCase
:name => 'logo.png',
:url => 'http://example.com/logo.png',
:attachable => {
:type => :email,
:email => { :subject => 'foo', :body => 'bar' }
}
}, actual)
@ -1061,7 +1062,8 @@ class SerializerTest < ActiveModel::TestCase
:name => 'logo.png',
:url => 'http://example.com/logo.png',
:attachable => {
:email => 1
:type => :email,
:id => 1
}
}, actual)
end
@ -1099,7 +1101,8 @@ class SerializerTest < ActiveModel::TestCase
:name => 'logo.png',
:url => 'http://example.com/logo.png',
:attachable => {
:email => 1
:type => :email,
:id => 1
}},
:emails => [{
:id => 1,
@ -1179,15 +1182,15 @@ class SerializerTest < ActiveModel::TestCase
:oranges => [{
:plu => "3027",
:id => 1,
:readable => { :email => 1 }
:readable => { :type => :email, :id => 1 }
}],
:attachment => {
:name => 'logo.png',
:url => 'http://example.com/logo.png',
:attachable => { :email => 1 },
:readable => { :email => 1 },
:edible => { :orange => 1 }
:attachable => { :type => :email, :id => 1 },
:readable => { :type => :email, :id => 1 },
:edible => { :type => :orange, :id => 1 }
}
}, actual)
end