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 #858 from mateomurphy/adapter-fixes

Browse Source 
Included resource fixes
This commit is contained in:
Guillermo Iguaran 2015-03-25 03:33:10 -05:00
commit 4891c22a78
2 changed files with 97 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,7 @@ module ActiveModel
def initialize(serializer, options = {}) def initialize(serializer, options = {})
super super
serializer.root = true serializer.root = true
@hash = {} @hash = { data: [] }
@top = @options.fetch(:top) { @hash }
if fields = options.delete(:fields) if fields = options.delete(:fields)
@fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key) @fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
@ -17,8 +16,14 @@ module ActiveModel
def serializable_hash(options = {}) def serializable_hash(options = {})
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
@hash[:data] = serializer.map do |s| serializer.each do |s|
self.class.new(s, @options.merge(top: @top, fieldset: @fieldset)).serializable_hash[:data] result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash
@hash[:data] << result[:data]
if result[:included]
@hash[:included] ||= []
@hash[:included] |= result[:included]
end
end end
else else
@hash = cached_object do @hash = cached_object do
@ -53,14 +58,14 @@ module ActiveModel
resource_path = [parent, resource_name].compact.join('.') resource_path = [parent, resource_name].compact.join('.')
if include_assoc?(resource_path) if include_assoc?(resource_path)
@top[:included] ||= [] @hash[:included] ||= []
serializers.each do |serializer| serializers.each do |serializer|
attrs = attributes_for_serializer(serializer, @options) attrs = attributes_for_serializer(serializer, @options)
add_resource_links(attrs, serializer, add_included: false) add_resource_links(attrs, serializer, add_included: false)
@top[:included].push(attrs) unless @top[:included].include?(attrs) @hash[:included].push(attrs) unless @hash[:included].include?(attrs)
end end
end end

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

@ -39,7 +39,7 @@ module ActiveModel
@bio2.author = @author2 @bio2.author = @author2
end end
def test_include_multiple_posts_and_linked def test_include_multiple_posts_and_linked_array
serializer = ArraySerializer.new([@first_post, @second_post]) serializer = ArraySerializer.new([@first_post, @second_post])
adapter = ActiveModel::Serializer::Adapter::JsonApi.new( adapter = ActiveModel::Serializer::Adapter::JsonApi.new(
serializer, serializer,
@ -51,64 +51,12 @@ module ActiveModel
) )
expected = { expected = {
linked: { data: [
comments: [
{
id: "1",
body: "ZOMG A COMMENT",
links: {
post: { linkage: { type: "posts", id: "1" } },
author: { linkage: nil }
}
}, {
id: "2",
body: "ZOMG ANOTHER COMMENT",
links: {
post: { linkage: { type: "posts", id: "1" } },
author: { linkage: nil }
}
}
],
authors: [
{
id: "1",
name: "Steve K.",
links: {
posts: { linkage: [ { type: "posts", id: "1" }, { type: "posts", id: "3" } ] },
roles: { linkage: [] },
bio: { linkage: { type: "bios", id: "1" } }
}
}, {
id: "2",
name: "Tenderlove",
links: {
posts: { linkage: [ { type: "posts", id:"2" } ] },
roles: { linkage: [] },
bio: { linkage: { type: "bios", id: "2" } }
}
}
],
bios: [
{
id: "1",
content: "AMS Contributor",
links: {
author: { linkage: { type: "authors", id: "1" } }
}
}, {
id: "2",
content: "Rails Contributor",
links: {
author: { linkage: { type: "authors", id: "2" } }
}
}
]
},
posts: [
{ {
id: "10", id: "10",
title: "Hello!!", title: "Hello!!",
body: "Hello, world!!", body: "Hello, world!!",
type: "posts",
links: { links: {
comments: { linkage: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] }, comments: { linkage: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] },
blog: { linkage: { type: "blogs", id: "999" } }, blog: { linkage: { type: "blogs", id: "999" } },
@ -116,15 +64,67 @@ module ActiveModel
} }
}, },
{ {
id: "2", id: "20",
title: "New Post", title: "New Post",
body: "Body", body: "Body",
type: "posts",
links: { links: {
comments: { linkage: [] }, comments: { linkage: [] },
blog: { linkage: { type: "blogs", id: "999" } }, blog: { linkage: { type: "blogs", id: "999" } },
author: { linkage: { type: "authors", id: "2" } } author: { linkage: { type: "authors", id: "2" } }
} }
} }
],
included: [
{
id: "1",
body: "ZOMG A COMMENT",
type: "comments",
links: {
post: { linkage: { type: "posts", id: "10" } },
author: { linkage: nil }
}
}, {
id: "2",
body: "ZOMG ANOTHER COMMENT",
type: "comments",
links: {
post: { linkage: { type: "posts", id: "10" } },
author: { linkage: nil }
}
}, {
id: "1",
name: "Steve K.",
type: "authors",
links: {
posts: { linkage: [ { type: "posts", id: "10" }, { type: "posts", id: "30" } ] },
roles: { linkage: [] },
bio: { linkage: { type: "bios", id: "1" } }
}
}, {
id: "1",
content: "AMS Contributor",
type: "bios",
links: {
author: { linkage: { type: "authors", id: "1" } }
}
}, {
id: "2",
name: "Tenderlove",
type: "authors",
links: {
posts: { linkage: [ { type: "posts", id:"20" } ] },
roles: { linkage: [] },
bio: { linkage: { type: "bios", id: "2" } }
}
}, {
id: "2",
content: "Rails Contributor",
type: "bios",
links: {
author: { linkage: { type: "authors", id: "2" } }
}
}
] ]
} }
assert_equal expected, adapter.serializable_hash assert_equal expected, adapter.serializable_hash
@ -195,6 +195,36 @@ module ActiveModel
} }
assert_equal expected, links assert_equal expected, links
end end
def test_multiple_references_to_same_resource
serializer = ArraySerializer.new([@first_comment, @second_comment])
adapter = ActiveModel::Serializer::Adapter::JsonApi.new(
serializer,
include: ['post']
)
expected = [
{
id: "10",
title: "Hello!!",
body: "Hello, world!!",
type: "posts",
links: {
comments: {
linkage: [{type: "comments", id: "1"}, {type: "comments", id: "2"}]
},
blog: {
linkage: {type: "blogs", id: "999"}
},
author: {
linkage: {type: "authors", id: "1"}
}
}
}
]
assert_equal expected, adapter.serializable_hash[:included]
end
end end
end end
end end