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

Merge pull request #850 from mateomurphy/association-override-fix

Browse Source 
Use association value for determining serializer used
This commit is contained in:
Guillermo Iguaran 2015-03-22 18:53:45 -05:00
commit e901a2108f
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/active_model/serializer.rb
View File

@ -181,9 +181,9 @@ module ActiveModel
self.class._associations.dup.each do |name, association_options|
next unless object
association = object.send(name)
association_value = send(name)
serializer_class = ActiveModel::Serializer.serializer_for(association, association_options)
serializer_class = ActiveModel::Serializer.serializer_for(association_value, association_options)
serializer = serializer_class.new(
association_value,

10
test/action_controller/serialization_test.rb
View File

@ -159,7 +159,10 @@ module ActionController
id: 1,
body: 'ZOMG A COMMENT' }
],
blog: nil,
blog: {
id: 999,
name: 'Custom blog'
},
author: {
id: 1,
name: 'Joao Moura.'
@ -190,7 +193,10 @@ module ActionController
id: 1,
body: 'ZOMG A COMMENT' }
],
blog: nil,
blog: {
id: 999,
name: 'Custom blog'
},
author: {
id: 1,
name: 'Joao Moura.'

2
test/adapter/json/belongs_to_test.rb
View File

@ -32,7 +32,7 @@ module ActiveModel
serializer = PostSerializer.new(@anonymous_post)
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
assert_equal({title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], blog: nil, author: nil}, adapter.serializable_hash)
assert_equal({title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], blog: {id: 999, name: "Custom blog"}, author: nil}, adapter.serializable_hash)
end
end
end

5
test/adapter/json/collection_test.rb
View File

@ -45,7 +45,10 @@ module ActiveModel
id: 1,
name: "Steve K."
},
blog: nil
blog: {
id: 999,
name: "Custom blog"
}
}]
assert_equal expected, @adapter.serializable_hash
end

4
test/adapter/json_api/belongs_to_test.rb
View File

@ -67,7 +67,7 @@ module ActiveModel
serializer = PostSerializer.new(@anonymous_post)
adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
assert_equal({comments: [], blog: nil, author: nil}, adapter.serializable_hash[:posts][:links])
assert_equal({comments: [], blog: "999", author: nil}, adapter.serializable_hash[:posts][:links])
end
def test_include_type_for_association_when_different_than_name
@ -116,7 +116,7 @@ module ActiveModel
id: "43",
links: {
comments: [],
blog: nil,
blog: "999",
author: nil
}
}]

4
test/adapter/json_api/collection_test.rb
View File

@ -27,7 +27,7 @@ module ActiveModel
def test_include_multiple_posts
assert_equal([
{ title: "Hello!!", body: "Hello, world!!", id: "1", links: { comments: [], blog: "999", author: "1" } },
{ title: "New Post", body: "Body", id: "2", links: { comments: [], blog: nil, author: "1" } }
{ title: "New Post", body: "Body", id: "2", links: { comments: [], blog: "999", author: "1" } }
], @adapter.serializable_hash[:posts])
end
@ -35,7 +35,7 @@ module ActiveModel
@adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, fields: ['title'])
assert_equal([
{ title: "Hello!!", links: { comments: [], blog: "999", author: "1" } },
{ title: "New Post", links: { comments: [], blog: nil, author: "1" } }
{ title: "New Post", links: { comments: [], blog: "999", author: "1" } }
], @adapter.serializable_hash[:posts])
end

2
test/adapter/json_api/linked_test.rb
View File

@ -170,7 +170,7 @@ module ActiveModel
body: "Body",
links: {
comments: [],
blog: nil,
blog: "999",
author: "1"
}
}