Merge pull request #696 from ggordon/explicit_serializer

Explicitly set serializer for associations

test/adapter/json_api/has_many_explicit_serializer_test.rb

@@ -0,0 +1,65 @@
+require 'test_helper'
+
+module ActiveModel
+  class Serializer
+    class Adapter
+      class JsonApi
+        # Test 'has_many :assocs, serializer: AssocXSerializer'
+        class HasManyExplicitSerializerTest < Minitest::Test
+          def setup
+            @post = Post.new(title: 'New Post', body: 'Body')
+            @author = Author.new(name: 'Jane Blogger')
+            @author.posts = [@post]
+            @post.author = @author
+            @first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
+            @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
+            @post.comments = [@first_comment, @second_comment]
+            @first_comment.post = @post
+            @first_comment.author = nil
+            @second_comment.post = @post
+            @second_comment.author = nil
+
+            @serializer = PostPreviewSerializer.new(@post)
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(
+              @serializer,
+              include: 'comments,author'
+            )
+          end
+
+          def test_includes_comment_ids
+            assert_equal(['1', '2'],
+                         @adapter.serializable_hash[:posts][:links][:comments])
+          end
+
+          def test_includes_linked_comments
+            assert_equal([{ id: '1', body: "ZOMG A COMMENT", links: { post: @post.id.to_s, author: nil }},
+                          { id: '2', body: "ZOMG ANOTHER COMMENT", links: { post: @post.id.to_s, author: nil }}],
+                         @adapter.serializable_hash[:linked][:comments])
+          end
+
+          def test_includes_author_id
+            assert_equal(@author.id.to_s,
+                         @adapter.serializable_hash[:posts][:links][:author])
+          end
+
+          def test_includes_linked_authors
+            assert_equal([{ id: @author.id.to_s, links: { posts: [@post.id.to_s] } }],
+                         @adapter.serializable_hash[:linked][:authors])
+          end
+
+          def test_explicit_serializer_with_null_resource
+            @post.author = nil
+            assert_equal(nil,
+                         @adapter.serializable_hash[:posts][:links][:author])
+          end
+
+          def test_explicit_serializer_with_null_collection
+            @post.comments = []
+            assert_equal([],
+                         @adapter.serializable_hash[:posts][:links][:comments])
+          end
+        end
+      end
+    end
+  end
+end

test/fixtures/poro.rb

@@ -100,3 +100,26 @@ AlternateBlogSerializer = Class.new(ActiveModel::Serializer) do
   attribute :id
   attribute :name, key: :title
 end
+
+CommentPreviewSerializer = Class.new(ActiveModel::Serializer) do
+  attributes :id
+
+  belongs_to :post
+end
+
+AuthorPreviewSerializer = Class.new(ActiveModel::Serializer) do
+  attributes :id
+
+  has_many :posts
+end
+
+PostPreviewSerializer = Class.new(ActiveModel::Serializer) do
+  def self.root_name
+    'posts'
+  end
+
+  attributes :title, :body, :id
+
+  has_many :comments, serializer: CommentPreviewSerializer
+  belongs_to :author, serializer: AuthorPreviewSerializer
+end

test/serializers/associations_test.rb

@@ -42,9 +42,9 @@ module ActiveModel
 
       def test_has_many
         assert_equal(
-          { posts: { type: :has_many, options: { embed: :ids } },
-            roles: { type: :has_many, options: { embed: :ids } },
-            bio: { type: :belongs_to, options: {} } },
+          { posts: { type: :has_many, association_options: { embed: :ids } },
+            roles: { type: :has_many, association_options: { embed: :ids } },
+            bio: { type: :belongs_to, association_options: {} } },
           @author_serializer.class._associations
         )
         @author_serializer.each_association do |name, serializer, options|
@@ -64,7 +64,7 @@ module ActiveModel
       end
 
       def test_has_one
-        assert_equal({post: {type: :belongs_to, options: {}}, :author=>{:type=>:belongs_to, :options=>{}}}, @comment_serializer.class._associations)
+        assert_equal({post: {type: :belongs_to, association_options: {}}, :author=>{:type=>:belongs_to, :association_options=>{}}}, @comment_serializer.class._associations)
         @comment_serializer.each_association do |name, serializer, options|
           if name == :post
             assert_equal({}, options)