active_model_serializers 0.10.0.rc2 → 0.10.0.rc3

data/test/active_record_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ActiveRecordTest < Minitest::Test
+  include ActiveModel::Serializer::Lint::Tests
+
+  def setup
+    @resource = ARModels::Post.new
+  end
+end

data/test/adapter/fragment_cache_test.rb

@@ -4,11 +4,14 @@ module ActiveModel
     class Adapter
       class FragmentCacheTest < Minitest::Test
         def setup
+          @spam            = Spam::UnrelatedLink.new(id: 'spam-id-1')
           @author          = Author.new(name: 'Joao M. D. Moura')
-          @role            = Role.new(name: 'Great Author', description:nil)
+          @role            = Role.new(name: 'Great Author', description: nil)
           @role.author     = [@author]
           @role_serializer = RoleSerializer.new(@role)
+          @spam_serializer = Spam::UnrelatedLinkSerializer.new(@spam)
           @role_hash       = FragmentCache.new(RoleSerializer.adapter.new(@role_serializer), @role_serializer, {})
+          @spam_hash       = FragmentCache.new(Spam::UnrelatedLinkSerializer.adapter.new(@spam_serializer), @spam_serializer, {})
         end
 
         def test_fragment_fetch_with_virtual_attributes
@@ -20,6 +23,13 @@ module ActiveModel
           }
           assert_equal(@role_hash.fetch, expected_result)
         end
+
+        def test_fragment_fetch_with_namespaced_object
+          expected_result = {
+            id: @spam.id
+          }
+          assert_equal(@spam_hash.fetch, expected_result)
+        end
       end
     end
   end

data/test/adapter/json/belongs_to_test.rb

@@ -11,11 +11,10 @@ module ActiveModel
             @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
             @post.comments = [@comment]
             @anonymous_post.comments = []
-            @post.author = @author
             @comment.post = @post
             @comment.author = nil
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @post.blog = @blog
             @anonymous_post.blog = nil
 
@@ -25,21 +24,21 @@ module ActiveModel
           end
 
           def test_includes_post
-            assert_equal({id: 42, title: 'New Post', body: 'Body'}, @adapter.serializable_hash[:comment][:post])
+            assert_equal({ id: 42, title: 'New Post', body: 'Body' }, @adapter.serializable_hash[:comment][:post])
           end
 
           def test_include_nil_author
             serializer = PostSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            assert_equal({post: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], blog: {id: 999, name: "Custom blog"}, author: nil}}, adapter.serializable_hash)
+            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], blog: { id: 999, name: 'Custom blog' }, author: nil } }, adapter.serializable_hash)
           end
 
           def test_include_nil_author_with_specified_serializer
             serializer = PostPreviewSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            assert_equal({posts: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], author: nil}}, adapter.serializable_hash)
+            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], author: nil } }, adapter.serializable_hash)
           end
         end
       end

data/test/adapter/json/collection_test.rb

@@ -13,58 +13,67 @@ module ActiveModel
             @second_post.comments = []
             @first_post.author = @author
             @second_post.author = @author
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @first_post.blog = @blog
             @second_post.blog = nil
 
-            @serializer = ArraySerializer.new([@first_post, @second_post])
-            @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
             ActionController::Base.cache_store.clear
           end
 
           def test_with_serializer_option
-            @blog.special_attribute = "Special"
+            @blog.special_attribute = 'Special'
             @blog.articles = [@first_post, @second_post]
-            @serializer = ArraySerializer.new([@blog], serializer: CustomBlogSerializer)
-            @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
+            serializer = ArraySerializer.new([@blog], serializer: CustomBlogSerializer)
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            expected = {custom_blogs:[{
+            expected = { blogs: [{
               id: 1,
-              special_attribute: "Special",
-              articles: [{id: 1,title: "Hello!!", body: "Hello, world!!"}, {id: 2, title: "New Post", body: "Body"}]
-            }]}
-            assert_equal expected, @adapter.serializable_hash
+              special_attribute: 'Special',
+              articles: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' }, { id: 2, title: 'New Post', body: 'Body' }]
+            }] }
+            assert_equal expected, adapter.serializable_hash
           end
 
           def test_include_multiple_posts
+            serializer = ArraySerializer.new([@first_post, @second_post])
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+
             expected = { posts: [{
-              title: "Hello!!",
-              body: "Hello, world!!",
+              title: 'Hello!!',
+              body: 'Hello, world!!',
               id: 1,
               comments: [],
               author: {
                 id: 1,
-                name: "Steve K."
+                name: 'Steve K.'
               },
               blog: {
                 id: 999,
-                name: "Custom blog"
+                name: 'Custom blog'
               }
             }, {
-              title: "New Post",
-              body: "Body",
+              title: 'New Post',
+              body: 'Body',
               id: 2,
               comments: [],
               author: {
                 id: 1,
-                name: "Steve K."
+                name: 'Steve K.'
               },
               blog: {
                 id: 999,
-                name: "Custom blog"
+                name: 'Custom blog'
               }
-            }]}
-            assert_equal expected, @adapter.serializable_hash
+            }] }
+            assert_equal expected, adapter.serializable_hash
+          end
+
+          def test_root_is_underscored
+            virtual_value = VirtualValue.new(id: 1)
+            serializer = ArraySerializer.new([virtual_value])
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+
+            assert_equal 1, adapter.serializable_hash[:virtual_values].length
           end
         end
       end

data/test/adapter/json/has_many_test.rb

@@ -8,29 +8,40 @@ module ActiveModel
           def setup
             ActionController::Base.cache_store.clear
             @author = Author.new(id: 1, name: 'Steve K.')
-            @post = Post.new(title: 'New Post', body: 'Body')
+            @post = Post.new(id: 42, title: 'New Post', body: 'Body')
             @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]
             @post.author = @author
             @first_comment.post = @post
             @second_comment.post = @post
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @post.blog = @blog
-
-            @serializer = PostSerializer.new(@post)
-            @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
+            @tag = Tag.new(id: 1, name: '#hash_tag')
+            @post.tags = [@tag]
           end
 
           def test_has_many
+            serializer = PostSerializer.new(@post)
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
             assert_equal([
-                           {id: 1, body: 'ZOMG A COMMENT'},
-                           {id: 2, body: 'ZOMG ANOTHER COMMENT'}
-                         ], @adapter.serializable_hash[:post][:comments])
+                           { id: 1, body: 'ZOMG A COMMENT' },
+                           { id: 2, body: 'ZOMG ANOTHER COMMENT' }
+                         ], adapter.serializable_hash[:post][:comments])
+          end
+
+          def test_has_many_with_no_serializer
+            serializer = PostWithTagsSerializer.new(@post)
+            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+            assert_equal({
+              id: 42,
+              tags: [
+                { 'attributes' => { 'id' => 1, 'name' => '#hash_tag' } }
+              ]
+            }.to_json, adapter.serializable_hash[:post].to_json)
           end
         end
       end
     end
   end
 end
-

data/test/adapter/json_api/belongs_to_test.rb

@@ -21,7 +21,7 @@ module ActiveModel
             @comment.author = nil
             @post.author = @author
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post, @anonymous_post]
             @author.posts = []
@@ -32,41 +32,41 @@ module ActiveModel
           end
 
           def test_includes_post_id
-            expected = { data: { type: "posts", id: "42" } }
+            expected = { data: { type: 'posts', id: '42' } }
 
             assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:post])
           end
 
           def test_includes_linked_post
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'post')
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:post])
             expected = [{
-              id: "42",
-              type: "posts",
+              id: '42',
+              type: 'posts',
               attributes: {
                 title: 'New Post',
                 body: 'Body',
               },
               relationships: {
-                comments: { data: [ { type: "comments", id: "1" } ] },
-                blog: { data: { type: "blogs", id: "999" } },
-                author: { data: { type: "authors", id: "1" } }
+                comments: { data: [{ type: 'comments', id: '1' }] },
+                blog: { data: { type: 'blogs', id: '999' } },
+                author: { data: { type: 'authors', id: '1' } }
               }
             }]
             assert_equal expected, @adapter.serializable_hash[:included]
           end
 
           def test_limiting_linked_post_fields
-            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'post', fields: {post: [:title]})
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: [:post], fields: { post: [:title] })
             expected = [{
-              id: "42",
-              type: "posts",
+              id: '42',
+              type: 'posts',
               attributes: {
                 title: 'New Post'
               },
               relationships: {
-                comments: { data: [ { type: "comments", id: "1" } ] },
-                blog: { data: { type: "blogs", id: "999" } },
-                author: { data: { type: "authors", id: "1" } }
+                comments: { data: [{ type: 'comments', id: '1' }] },
+                blog: { data: { type: 'blogs', id: '999' } },
+                author: { data: { type: 'authors', id: '1' } }
               }
             }]
             assert_equal expected, @adapter.serializable_hash[:included]
@@ -76,7 +76,7 @@ module ActiveModel
             serializer = PostSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
 
-            assert_equal({comments: { data: [] }, blog: { data: { type: "blogs", id: "999" } }, author: { data: nil }}, adapter.serializable_hash[:data][:relationships])
+            assert_equal({ comments: { data: [] }, blog: { data: { type: 'blogs', id: '999' } }, author: { data: nil } }, adapter.serializable_hash[:data][:relationships])
           end
 
           def test_include_type_for_association_when_different_than_name
@@ -86,19 +86,19 @@ module ActiveModel
             expected = {
               writer: {
                 data: {
-                  type: "authors",
-                  id: "1"
+                  type: 'authors',
+                  id: '1'
                 }
               },
               articles: {
                 data: [
                   {
-                    type: "posts",
-                    id: "42"
+                    type: 'posts',
+                    id: '42'
                   },
                   {
-                    type: "posts",
-                    id: "43"
+                    type: 'posts',
+                    id: '43'
                   }
                 ]
               }
@@ -108,42 +108,42 @@ module ActiveModel
 
           def test_include_linked_resources_with_type_name
             serializer = BlogSerializer.new(@blog)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer, include: ['writer', 'articles'])
+            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer, include: [:writer, :articles])
             linked = adapter.serializable_hash[:included]
             expected = [
               {
-                id: "1",
-                type: "authors",
+                id: '1',
+                type: 'authors',
                 attributes: {
-                  name: "Steve K."
+                  name: 'Steve K.'
                 },
                 relationships: {
                   posts: { data: [] },
                   roles: { data: [] },
                   bio: { data: nil }
                 }
-              },{
-                id: "42",
-                type: "posts",
+              }, {
+                id: '42',
+                type: 'posts',
                 attributes: {
-                  title: "New Post",
-                  body: "Body"
+                  title: 'New Post',
+                  body: 'Body'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: "1" } ] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  comments: { data: [{ type: 'comments', id: '1' }] },
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }, {
-                id: "43",
-                type: "posts",
+                id: '43',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
+                  blog: { data: { type: 'blogs', id: '999' } },
                   author: { data: nil }
                 }
               }

data/test/adapter/json_api/collection_test.rb

@@ -27,29 +27,29 @@ module ActiveModel
           def test_include_multiple_posts
             expected = [
               {
-                id: "1",
-                type: "posts",
+                id: '1',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               },
               {
-                id: "2",
-                type: "posts",
+                id: '2',
+                type: 'posts',
                 attributes: {
-                  title: "New Post",
-                  body: "Body"
+                  title: 'New Post',
+                  body: 'Body'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
@@ -62,33 +62,32 @@ module ActiveModel
 
             expected = [
               {
-                id: "1",
-                type: "posts",
+                id: '1',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!"
+                  title: 'Hello!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               },
               {
-                id: "2",
-                type: "posts",
+                id: '2',
+                type: 'posts',
                 attributes: {
-                  title: "New Post"
+                  title: 'New Post'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
             assert_equal(expected, @adapter.serializable_hash[:data])
           end
-
         end
       end
     end