active_model_serializers 0.10.0.rc4 → 0.10.0.rc5

data/test/adapter/json_api/has_many_explicit_serializer_test.rb

@@ -1,96 +1,94 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class JsonApi
-        # Test 'has_many :assocs, serializer: AssocXSerializer'
-        class HasManyExplicitSerializerTest < ActiveSupport::TestCase
-          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
-            @blog = Blog.new(id: 23, name: 'AMS Blog')
-            @post.blog = @blog
+module ActiveModelSerializers
+  module Adapter
+    class JsonApi
+      # Test 'has_many :assocs, serializer: AssocXSerializer'
+      class HasManyExplicitSerializerTest < ActiveSupport::TestCase
+        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
+          @blog = Blog.new(id: 23, name: 'AMS Blog')
+          @post.blog = @blog
 
-            @serializer = PostPreviewSerializer.new(@post)
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(
-              @serializer,
-              include: [:comments, :author]
-            )
-          end
+          @serializer = PostPreviewSerializer.new(@post)
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(
+            @serializer,
+            include: [:comments, :author]
+          )
+        end
 
-          def test_includes_comment_ids
-            expected = {
-              data: [
-                { type: 'comments', id: '1' },
-                { type: 'comments', id: '2' }
-              ]
-            }
+        def test_includes_comment_ids
+          expected = {
+            data: [
+              { type: 'comments', id: '1' },
+              { type: 'comments', id: '2' }
+            ]
+          }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
+        end
 
-          def test_includes_linked_data
-            # If CommentPreviewSerializer is applied correctly the body text will not be present in the output
-            expected = [
-              {
-                id: '1',
-                type: 'comments',
-                relationships: {
-                  post: { data: { type: 'posts', id: @post.id.to_s } }
-                }
-              },
-              {
-                id: '2',
-                type: 'comments',
-                relationships: {
-                  post: { data: { type: 'posts', id: @post.id.to_s } }
-                }
-              },
-              {
-                id: @author.id.to_s,
-                type: 'authors',
-                relationships: {
-                  posts: { data: [{ type: 'posts', id: @post.id.to_s }] }
-                }
+        def test_includes_linked_data
+          # If CommentPreviewSerializer is applied correctly the body text will not be present in the output
+          expected = [
+            {
+              id: '1',
+              type: 'comments',
+              relationships: {
+                post: { data: { type: 'posts', id: @post.id.to_s } }
               }
-            ]
+            },
+            {
+              id: '2',
+              type: 'comments',
+              relationships: {
+                post: { data: { type: 'posts', id: @post.id.to_s } }
+              }
+            },
+            {
+              id: @author.id.to_s,
+              type: 'authors',
+              relationships: {
+                posts: { data: [{ type: 'posts', id: @post.id.to_s }] }
+              }
+            }
+          ]
 
-            assert_equal(expected, @adapter.serializable_hash[:included])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:included])
+        end
 
-          def test_includes_author_id
-            expected = {
-              data: { type: 'authors', id: @author.id.to_s }
-            }
+        def test_includes_author_id
+          expected = {
+            data: { type: 'authors', id: @author.id.to_s }
+          }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:author])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:author])
+        end
 
-          def test_explicit_serializer_with_null_resource
-            @post.author = nil
+        def test_explicit_serializer_with_null_resource
+          @post.author = nil
 
-            expected = { data: nil }
+          expected = { data: nil }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:author])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:author])
+        end
 
-          def test_explicit_serializer_with_null_collection
-            @post.comments = []
+        def test_explicit_serializer_with_null_collection
+          @post.comments = []
 
-            expected = { data: [] }
+          expected = { data: [] }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
         end
       end
     end

data/test/adapter/json_api/has_many_test.rb

@@ -1,143 +1,141 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class JsonApi
-        class HasManyTest < ActiveSupport::TestCase
-          def setup
-            ActionController::Base.cache_store.clear
-            @author = Author.new(id: 1, name: 'Steve K.')
-            @author.posts = []
-            @author.bio = nil
-            @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.author = nil
-            @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
-            @second_comment.author = nil
-            @post.comments = [@first_comment, @second_comment]
-            @post_without_comments.comments = []
-            @first_comment.post = @post
-            @second_comment.post = @post
-            @post.author = @author
-            @post_without_comments.author = nil
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @blog.writer = @author
-            @blog.articles = [@post]
-            @post.blog = @blog
-            @post_without_comments.blog = nil
-            @tag = Tag.new(id: 1, name: '#hash_tag')
-            @post.tags = [@tag]
-            @serializer = PostSerializer.new(@post)
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer)
+module ActiveModelSerializers
+  module Adapter
+    class JsonApi
+      class HasManyTest < ActiveSupport::TestCase
+        def setup
+          ActionController::Base.cache_store.clear
+          @author = Author.new(id: 1, name: 'Steve K.')
+          @author.posts = []
+          @author.bio = nil
+          @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.author = nil
+          @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
+          @second_comment.author = nil
+          @post.comments = [@first_comment, @second_comment]
+          @post_without_comments.comments = []
+          @first_comment.post = @post
+          @second_comment.post = @post
+          @post.author = @author
+          @post_without_comments.author = nil
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @blog.writer = @author
+          @blog.articles = [@post]
+          @post.blog = @blog
+          @post_without_comments.blog = nil
+          @tag = Tag.new(id: 1, name: '#hash_tag')
+          @post.tags = [@tag]
+          @serializer = PostSerializer.new(@post)
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(@serializer)
 
-            @virtual_value = VirtualValue.new(id: 1)
-          end
+          @virtual_value = VirtualValue.new(id: 1)
+        end
 
-          def test_includes_comment_ids
-            expected = { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] }
+        def test_includes_comment_ids
+          expected = { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
+        end
 
-          def test_includes_linked_comments
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:comments])
-            expected = [{
-              id: '1',
-              type: 'comments',
-              attributes: {
-                body: 'ZOMG A COMMENT'
-              },
-              relationships: {
-                post: { data: { type: 'posts', id: '1' } },
-                author: { data: nil }
-              }
-            }, {
-              id: '2',
-              type: 'comments',
-              attributes: {
-                body: 'ZOMG ANOTHER COMMENT'
-              },
-              relationships: {
-                post: { data: { type: 'posts', id: '1' } },
-                author: { data: nil }
-              }
-            }]
-            assert_equal expected, @adapter.serializable_hash[:included]
-          end
+        def test_includes_linked_comments
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(@serializer, include: [:comments])
+          expected = [{
+            id: '1',
+            type: 'comments',
+            attributes: {
+              body: 'ZOMG A COMMENT'
+            },
+            relationships: {
+              post: { data: { type: 'posts', id: '1' } },
+              author: { data: nil }
+            }
+          }, {
+            id: '2',
+            type: 'comments',
+            attributes: {
+              body: 'ZOMG ANOTHER COMMENT'
+            },
+            relationships: {
+              post: { data: { type: 'posts', id: '1' } },
+              author: { data: nil }
+            }
+          }]
+          assert_equal expected, @adapter.serializable_hash[:included]
+        end
 
-          def test_limit_fields_of_linked_comments
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:comments], fields: { comment: [:id, :post, :author] })
-            expected = [{
-              id: '1',
-              type: 'comments',
-              relationships: {
-                post: { data: { type: 'posts', id: '1' } },
-                author: { data: nil }
-              }
-            }, {
-              id: '2',
-              type: 'comments',
-              relationships: {
-                post: { data: { type: 'posts', id: '1' } },
-                author: { data: nil }
-              }
-            }]
-            assert_equal expected, @adapter.serializable_hash[:included]
-          end
+        def test_limit_fields_of_linked_comments
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(@serializer, include: [:comments], fields: { comment: [:id, :post, :author] })
+          expected = [{
+            id: '1',
+            type: 'comments',
+            relationships: {
+              post: { data: { type: 'posts', id: '1' } },
+              author: { data: nil }
+            }
+          }, {
+            id: '2',
+            type: 'comments',
+            relationships: {
+              post: { data: { type: 'posts', id: '1' } },
+              author: { data: nil }
+            }
+          }]
+          assert_equal expected, @adapter.serializable_hash[:included]
+        end
 
-          def test_no_include_linked_if_comments_is_empty
-            serializer = PostSerializer.new(@post_without_comments)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
+        def test_no_include_linked_if_comments_is_empty
+          serializer = PostSerializer.new(@post_without_comments)
+          adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
-            assert_nil adapter.serializable_hash[:linked]
-          end
+          assert_nil adapter.serializable_hash[:linked]
+        end
 
-          def test_include_type_for_association_when_different_than_name
-            serializer = BlogSerializer.new(@blog)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
-            actual = adapter.serializable_hash[:data][:relationships][:articles]
+        def test_include_type_for_association_when_different_than_name
+          serializer = BlogSerializer.new(@blog)
+          adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
+          actual = adapter.serializable_hash[:data][:relationships][:articles]
 
-            expected = {
-              data: [{
-                type: 'posts',
-                id: '1'
-              }]
-            }
-            assert_equal expected, actual
-          end
+          expected = {
+            data: [{
+              type: 'posts',
+              id: '1'
+            }]
+          }
+          assert_equal expected, actual
+        end
 
-          def test_has_many_with_no_serializer
-            serializer = PostWithTagsSerializer.new(@post)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
+        def test_has_many_with_no_serializer
+          serializer = PostWithTagsSerializer.new(@post)
+          adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
-            assert_equal({
-              data: {
-                id: '1',
-                type: 'posts',
-                relationships: {
-                  tags: { data: [@tag.as_json] }
-                }
+          assert_equal({
+            data: {
+              id: '1',
+              type: 'posts',
+              relationships: {
+                tags: { data: [@tag.as_json] }
               }
-            }, adapter.serializable_hash)
-          end
+            }
+          }, adapter.serializable_hash)
+        end
 
-          def test_has_many_with_virtual_value
-            serializer = VirtualValueSerializer.new(@virtual_value)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
+        def test_has_many_with_virtual_value
+          serializer = VirtualValueSerializer.new(@virtual_value)
+          adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
-            assert_equal({
-              data: {
-                id: '1',
-                type: 'virtual_values',
-                relationships: {
-                  maker: { data: { id: 1 } },
-                  reviews: { data: [{ id: 1 }, { id: 2 }] }
-                }
+          assert_equal({
+            data: {
+              id: '1',
+              type: 'virtual-values',
+              relationships: {
+                maker: { data: { id: 1 } },
+                reviews: { data: [{ id: 1 }, { id: 2 }] }
               }
-            }, adapter.serializable_hash)
-          end
+            }
+          }, adapter.serializable_hash)
         end
       end
     end

data/test/adapter/json_api/has_one_test.rb

@@ -1,79 +1,77 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class JsonApi
-        class HasOneTest < ActiveSupport::TestCase
-          def setup
-            @author = Author.new(id: 1, name: 'Steve K.')
-            @bio = Bio.new(id: 43, content: 'AMS Contributor')
-            @author.bio = @bio
-            @bio.author = @author
-            @post = Post.new(id: 42, title: 'New Post', body: 'Body')
-            @anonymous_post = Post.new(id: 43, title: 'Hello!!', body: 'Hello, world!!')
-            @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
-            @post.comments = [@comment]
-            @anonymous_post.comments = []
-            @comment.post = @post
-            @comment.author = nil
-            @post.author = @author
-            @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @blog.writer = @author
-            @blog.articles = [@post, @anonymous_post]
-            @author.posts = []
-            @author.roles = []
+module ActiveModelSerializers
+  module Adapter
+    class JsonApi
+      class HasOneTest < ActiveSupport::TestCase
+        def setup
+          @author = Author.new(id: 1, name: 'Steve K.')
+          @bio = Bio.new(id: 43, content: 'AMS Contributor')
+          @author.bio = @bio
+          @bio.author = @author
+          @post = Post.new(id: 42, title: 'New Post', body: 'Body')
+          @anonymous_post = Post.new(id: 43, title: 'Hello!!', body: 'Hello, world!!')
+          @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
+          @post.comments = [@comment]
+          @anonymous_post.comments = []
+          @comment.post = @post
+          @comment.author = nil
+          @post.author = @author
+          @anonymous_post.author = nil
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @blog.writer = @author
+          @blog.articles = [@post, @anonymous_post]
+          @author.posts = []
+          @author.roles = []
 
-            @virtual_value = VirtualValue.new(id: 1)
+          @virtual_value = VirtualValue.new(id: 1)
 
-            @serializer = AuthorSerializer.new(@author)
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:bio, :posts])
-          end
+          @serializer = AuthorSerializer.new(@author)
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(@serializer, include: [:bio, :posts])
+        end
 
-          def test_includes_bio_id
-            expected = { data: { type: 'bios', id: '43' } }
+        def test_includes_bio_id
+          expected = { data: { type: 'bios', id: '43' } }
 
-            assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:bio])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:bio])
+        end
 
-          def test_includes_linked_bio
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:bio])
+        def test_includes_linked_bio
+          @adapter = ActiveModelSerializers::Adapter::JsonApi.new(@serializer, include: [:bio])
 
-            expected = [
-              {
-                id: '43',
-                type: 'bios',
-                attributes: {
-                  content: 'AMS Contributor',
-                  rating: nil
-                },
-                relationships: {
-                  author: { data: { type: 'authors', id: '1' } }
-                }
+          expected = [
+            {
+              id: '43',
+              type: 'bios',
+              attributes: {
+                content: 'AMS Contributor',
+                rating: nil
+              },
+              relationships: {
+                author: { data: { type: 'authors', id: '1' } }
               }
-            ]
+            }
+          ]
 
-            assert_equal(expected, @adapter.serializable_hash[:included])
-          end
+          assert_equal(expected, @adapter.serializable_hash[:included])
+        end
 
-          def test_has_one_with_virtual_value
-            serializer = VirtualValueSerializer.new(@virtual_value)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
+        def test_has_one_with_virtual_value
+          serializer = VirtualValueSerializer.new(@virtual_value)
+          adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
-            expected = {
-              data: {
-                id: '1',
-                type: 'virtual_values',
-                relationships: {
-                  maker: { data: { id: 1 } },
-                  reviews: { data: [{ id: 1 }, { id: 2 }] }
-                }
+          expected = {
+            data: {
+              id: '1',
+              type: 'virtual-values',
+              relationships: {
+                maker: { data: { id: 1 } },
+                reviews: { data: [{ id: 1 }, { id: 2 }] }
               }
             }
+          }
 
-            assert_equal(expected, adapter.serializable_hash)
-          end
+          assert_equal(expected, adapter.serializable_hash)
         end
       end
     end