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 #710 from ride/fix-empty-linked

Browse Source 
JSON-API: Don't include linked section if associations are empty
This commit is contained in:
Alexandre de Oliveira 2014-11-02 01:53:37 -02:00
commit 80ece39dd9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,6 @@ module ActiveModel
serializer.each_association do |name, association, opts| serializer.each_association do |name, association, opts|
@hash[@root][:links] ||= {} @hash[@root][:links] ||= {}
unless opts[:embed] == :ids
@hash[:linked] ||= {}
end
if association.respond_to?(:each) if association.respond_to?(:each)
add_links(name, association, opts) add_links(name, association, opts)
@ -47,7 +44,8 @@ module ActiveModel
@hash[@root][:links][name][:ids] += serializers.map{|serializer| serializer.id.to_s } @hash[@root][:links][name][:ids] += serializers.map{|serializer| serializer.id.to_s }
end end
unless options[:embed] == :ids unless options[:embed] == :ids || serializers.count == 0
@hash[:linked] ||= {}
@hash[:linked][name] ||= [] @hash[:linked][name] ||= []
@hash[:linked][name] += serializers.map { |item| attributes_for_serializer(item, options) } @hash[:linked][name] += serializers.map { |item| attributes_for_serializer(item, options) }
end end
@ -66,7 +64,7 @@ module ActiveModel
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] ||= {}
@hash[:linked][plural_name] ||= [] @hash[:linked][plural_name] ||= []
@hash[:linked][plural_name].push attributes_for_serializer(serializer, options) @hash[:linked][plural_name].push attributes_for_serializer(serializer, options)
end end

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

@ -8,12 +8,15 @@ module ActiveModel
def setup def setup
@author = Author.new(id: 1, name: 'Steve K.') @author = Author.new(id: 1, name: 'Steve K.')
@post = Post.new(id: 1, title: 'New Post', body: 'Body') @post = Post.new(id: 1, title: 'New Post', body: 'Body')
@post_without_comments = Post.new(id: 2, title: 'Second Post', body: 'Second')
@first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT') @first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
@second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT') @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
@post.comments = [@first_comment, @second_comment] @post.comments = [@first_comment, @second_comment]
@post_without_comments.comments = []
@first_comment.post = @post @first_comment.post = @post
@second_comment.post = @post @second_comment.post = @post
@post.author = @author @post.author = @author
@post_without_comments.author = nil
@blog = Blog.new(id: 1, name: "My Blog!!") @blog = Blog.new(id: 1, name: "My Blog!!")
@blog.writer = @author @blog.writer = @author
@blog.articles = [@post] @blog.articles = [@post]
@ -33,6 +36,13 @@ module ActiveModel
], @adapter.serializable_hash[:linked][:comments]) ], @adapter.serializable_hash[:linked][:comments])
end end
def test_no_include_linked_if_comments_is_empty
serializer = PostSerializer.new(@post_without_comments)
adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
assert_nil adapter.serializable_hash[:linked]
end
def test_include_type_for_association_when_is_different_than_name def test_include_type_for_association_when_is_different_than_name
serializer = BlogSerializer.new(@blog) serializer = BlogSerializer.new(@blog)
adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer) adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)