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

Merge pull request #685 from ride/ids-as-strings-2

Browse Source 
Serialize ids as strings in JSON-API adapter
This commit is contained in:
Steve Klabnik 2014-10-20 11:22:09 -04:00
commit 47deb87e81
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ module ActiveModel
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
@hash[@root] = serializer.map{|s| self.class.new(s).serializable_hash[@root] } @hash[@root] = serializer.map{|s| self.class.new(s).serializable_hash[@root] }
else else
@hash[@root] = serializer.attributes @hash[@root] = attributes_for_serializer(serializer, {})
serializer.each_association do |name, association, opts| serializer.each_association do |name, association, opts|
@hash[@root][:links] ||= {} @hash[@root][:links] ||= {}
@ -35,23 +35,31 @@ module ActiveModel
def add_links(name, serializers, options) def add_links(name, serializers, options)
@hash[@root][:links][name] ||= [] @hash[@root][:links][name] ||= []
@hash[@root][:links][name] += serializers.map(&:id) @hash[@root][:links][name] += serializers.map{|serializer| serializer.id.to_s }
unless options[:embed] == :ids unless options[:embed] == :ids
@hash[:linked][name] ||= [] @hash[:linked][name] ||= []
@hash[:linked][name] += serializers.map { |item| item.attributes(options) } @hash[:linked][name] += serializers.map { |item| attributes_for_serializer(item, options) }
end end
end end
def add_link(name, serializer, options) def add_link(name, serializer, options)
@hash[@root][:links][name] = serializer.id @hash[@root][:links][name] = serializer.id.to_s
unless options[:embed] == :ids unless options[:embed] == :ids
plural_name = name.to_s.pluralize.to_sym plural_name = name.to_s.pluralize.to_sym
@hash[:linked][plural_name] ||= [] @hash[:linked][plural_name] ||= []
@hash[:linked][plural_name].push serializer.attributes(options) @hash[:linked][plural_name].push attributes_for_serializer(serializer, options)
end end
end
private
def attributes_for_serializer(serializer, options)
attributes = serializer.attributes(options)
attributes[:id] = attributes[:id].to_s if attributes[:id]
attributes
end end
end end
end end

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

@ -16,11 +16,11 @@ module ActiveModel
end end
def test_includes_post_id def test_includes_post_id
assert_equal(42, @adapter.serializable_hash[:comments][:links][:post]) assert_equal("42", @adapter.serializable_hash[:comments][:links][:post])
end end
def test_includes_linked_post def test_includes_linked_post
assert_equal([{id: 42, title: 'New Post', body: 'Body'}], @adapter.serializable_hash[:linked][:posts]) assert_equal([{id: "42", title: 'New Post', body: 'Body'}], @adapter.serializable_hash[:linked][:posts])
end end
end end
end end

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

@ -17,8 +17,8 @@ module ActiveModel
def test_include_multiple_posts def test_include_multiple_posts
assert_equal([ assert_equal([
{title: "Hello!!", body: "Hello, world!!", id: 1, links: {comments: []}}, {title: "Hello!!", body: "Hello, world!!", id: "1", links: {comments: []}},
{title: "New Post", body: "Body", id: 2, links: {comments: []}} {title: "New Post", body: "Body", id: "2", links: {comments: []}}
], @adapter.serializable_hash[:posts]) ], @adapter.serializable_hash[:posts])
end end
end end

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

@ -18,7 +18,7 @@ module ActiveModel
end end
def test_includes_comment_ids def test_includes_comment_ids
assert_equal([1, 2], @adapter.serializable_hash[:authors][:links][:posts]) assert_equal(["1", "2"], @adapter.serializable_hash[:authors][:links][:posts])
end end
def test_no_includes_linked_comments def test_no_includes_linked_comments

6
test/adapter/json_api/has_many_test.rb
View File

@ -18,13 +18,13 @@ module ActiveModel
end end
def test_includes_comment_ids def test_includes_comment_ids
assert_equal([1, 2], @adapter.serializable_hash[:posts][:links][:comments]) assert_equal(["1", "2"], @adapter.serializable_hash[:posts][:links][:comments])
end end
def test_includes_linked_comments def test_includes_linked_comments
assert_equal([ assert_equal([
{id: 1, body: 'ZOMG A COMMENT'}, {id: "1", body: 'ZOMG A COMMENT'},
{id: 2, body: 'ZOMG ANOTHER COMMENT'} {id: "2", body: 'ZOMG ANOTHER COMMENT'}
], @adapter.serializable_hash[:linked][:comments]) ], @adapter.serializable_hash[:linked][:comments])
end end
end end