active_model_serializers 0.10.0.rc4 → 0.10.0.rc5

data/test/active_model_serializers/logging_test.rb

@@ -39,37 +39,37 @@ module ActiveModel
       end
 
       def test_uses_ams_as_tag
-        ActiveModel::SerializableResource.new(@post).serializable_hash
+        ActiveModelSerializers::SerializableResource.new(@post).serializable_hash
         assert_match(/\[active_model_serializers\]/, @logger.messages)
       end
 
       def test_logs_when_call_serializable_hash
-        ActiveModel::SerializableResource.new(@post).serializable_hash
+        ActiveModelSerializers::SerializableResource.new(@post).serializable_hash
         assert_match(/Rendered/, @logger.messages)
       end
 
       def test_logs_when_call_as_json
-        ActiveModel::SerializableResource.new(@post).as_json
+        ActiveModelSerializers::SerializableResource.new(@post).as_json
         assert_match(/Rendered/, @logger.messages)
       end
 
       def test_logs_when_call_to_json
-        ActiveModel::SerializableResource.new(@post).to_json
+        ActiveModelSerializers::SerializableResource.new(@post).to_json
         assert_match(/Rendered/, @logger.messages)
       end
 
       def test_logs_correct_serializer
-        ActiveModel::SerializableResource.new(@post).serializable_hash
+        ActiveModelSerializers::SerializableResource.new(@post).serializable_hash
         assert_match(/PostSerializer/, @logger.messages)
       end
 
       def test_logs_correct_adapter
-        ActiveModel::SerializableResource.new(@post).serializable_hash
-        assert_match(/ActiveModel::Serializer::Adapter::Attributes/, @logger.messages)
+        ActiveModelSerializers::SerializableResource.new(@post).serializable_hash
+        assert_match(/ActiveModelSerializers::Adapter::Attributes/, @logger.messages)
       end
 
       def test_logs_the_duration
-        ActiveModel::SerializableResource.new(@post).serializable_hash
+        ActiveModelSerializers::SerializableResource.new(@post).serializable_hash
         assert_match(/\(\d+\.\d+ms\)/, @logger.messages)
       end
     end

data/test/active_model_serializers/railtie_test_isolated.rb

@@ -18,6 +18,12 @@ class RailtieTest < ActiveSupport::TestCase
         "ActionController::Serialization should be included in ActionController::Base, but isn't"
     end
 
+    test 'prepares url_helpers for SerializationContext' do
+      assert ActiveModelSerializers::SerializationContext.url_helpers.respond_to? :url_for
+      assert_equal Rails.application.routes.default_url_options,
+        ActiveModelSerializers::SerializationContext.default_url_options
+    end
+
     test 'sets the ActiveModelSerializers.logger to Rails.logger' do
       refute_nil Rails.logger
       refute_nil ActiveModelSerializers.logger

data/test/active_model_serializers/serialization_context_test_isolated.rb

@@ -0,0 +1,58 @@
+# Execute this test in isolation
+require 'support/isolated_unit'
+require 'minitest/mock'
+
+class SerializationContextTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def create_request
+    request = Minitest::Mock.new
+    request.expect(:original_url, 'original_url')
+    request.expect(:query_parameters, 'query_parameters')
+  end
+
+  class WithRails < SerializationContextTest
+    setup do
+      require 'rails'
+      require 'active_model_serializers'
+      make_basic_app
+      @context = ActiveModelSerializers::SerializationContext.new(create_request)
+    end
+
+    test 'create context with request url and query parameters' do
+      assert_equal @context.request_url, 'original_url'
+      assert_equal @context.query_parameters, 'query_parameters'
+    end
+
+    test 'url_helpers is set up for Rails url_helpers' do
+      assert_equal Module, ActiveModelSerializers::SerializationContext.url_helpers.class
+      assert ActiveModelSerializers::SerializationContext.url_helpers.respond_to? :url_for
+    end
+
+    test 'default_url_options returns Rails.application.routes.default_url_options' do
+      assert_equal Rails.application.routes.default_url_options,
+        ActiveModelSerializers::SerializationContext.default_url_options
+    end
+  end
+
+  class WithoutRails < SerializationContextTest
+    setup do
+      require 'active_model_serializers/serialization_context'
+      @context = ActiveModelSerializers::SerializationContext.new(create_request)
+    end
+
+    test 'create context with request url and query parameters' do
+      assert_equal @context.request_url, 'original_url'
+      assert_equal @context.query_parameters, 'query_parameters'
+    end
+
+    test 'url_helpers is a module when Rails is not present' do
+      assert_equal Module, ActiveModelSerializers::SerializationContext.url_helpers.class
+      refute ActiveModelSerializers::SerializationContext.url_helpers.respond_to? :url_for
+    end
+
+    test 'default_url_options return a Hash' do
+      assert Hash, ActiveModelSerializers::SerializationContext.default_url_options.class
+    end
+  end
+end

data/test/adapter/deprecation_test.rb

@@ -0,0 +1,100 @@
+require 'test_helper'
+module ActiveModel
+  class Serializer
+    module Adapter
+      class DeprecationTest < ActiveSupport::TestCase
+        class PostSerializer < ActiveModel::Serializer
+          attribute :body
+        end
+        setup do
+          post = Post.new(id: 1, body: 'Hello')
+          @serializer = PostSerializer.new(post)
+        end
+
+        def test_null_adapter_serialization_deprecation
+          expected = {}
+          assert_deprecated do
+            assert_equal(expected, Null.new(@serializer).as_json)
+          end
+        end
+
+        def test_json_adapter_serialization_deprecation
+          expected = { post: { body: 'Hello' } }
+          assert_deprecated do
+            assert_equal(expected, Json.new(@serializer).as_json)
+          end
+        end
+
+        def test_jsonapi_adapter_serialization_deprecation
+          expected = {
+            data: {
+              id: '1',
+              type: 'posts',
+              attributes: {
+                body: 'Hello'
+              }
+            }
+          }
+          assert_deprecated do
+            assert_equal(expected, JsonApi.new(@serializer).as_json)
+          end
+        end
+
+        def test_attributes_adapter_serialization_deprecation
+          expected = { body: 'Hello' }
+          assert_deprecated do
+            assert_equal(expected, Attributes.new(@serializer).as_json)
+          end
+        end
+
+        def test_adapter_create_deprecation
+          assert_deprecated do
+            Adapter.create(@serializer)
+          end
+        end
+
+        def test_adapter_adapter_map_deprecation
+          assert_deprecated do
+            Adapter.adapter_map
+          end
+        end
+
+        def test_adapter_adapters_deprecation
+          assert_deprecated do
+            Adapter.adapters
+          end
+        end
+
+        def test_adapter_adapter_class_deprecation
+          assert_deprecated do
+            Adapter.adapter_class(:json_api)
+          end
+        end
+
+        def test_adapter_register_deprecation
+          assert_deprecated do
+            begin
+              Adapter.register(:test, Class.new)
+            ensure
+              Adapter.adapter_map.delete('test')
+            end
+          end
+        end
+
+        def test_adapter_lookup_deprecation
+          assert_deprecated do
+            Adapter.lookup(:json_api)
+          end
+        end
+
+        private
+
+        def assert_deprecated
+          assert_output(nil, /deprecated/) do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/test/adapter/json/belongs_to_test.rb

@@ -1,45 +1,43 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class Json
-        class BelongsToTest < ActiveSupport::TestCase
-          def setup
-            @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
-            @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @post.blog = @blog
-            @anonymous_post.blog = nil
+module ActiveModelSerializers
+  module Adapter
+    class Json
+      class BelongsToTest < ActiveSupport::TestCase
+        def setup
+          @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
+          @anonymous_post.author = nil
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @post.blog = @blog
+          @anonymous_post.blog = nil
 
-            @serializer = CommentSerializer.new(@comment)
-            @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
-            ActionController::Base.cache_store.clear
-          end
+          @serializer = CommentSerializer.new(@comment)
+          @adapter = ActiveModelSerializers::Adapter::Json.new(@serializer)
+          ActionController::Base.cache_store.clear
+        end
 
-          def test_includes_post
-            assert_equal({ id: 42, title: 'New Post', body: 'Body' }, @adapter.serializable_hash[:comment][:post])
-          end
+        def test_includes_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)
+        def test_include_nil_author
+          serializer = PostSerializer.new(@anonymous_post)
+          adapter = ActiveModelSerializers::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)
-          end
+          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)
+        def test_include_nil_author_with_specified_serializer
+          serializer = PostPreviewSerializer.new(@anonymous_post)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], author: nil } }, adapter.serializable_hash)
-          end
+          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

@@ -1,90 +1,88 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class Json
-        class Collection < ActiveSupport::TestCase
-          def setup
-            @author = Author.new(id: 1, name: 'Steve K.')
-            @first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')
-            @second_post = Post.new(id: 2, title: 'New Post', body: 'Body')
-            @first_post.comments = []
-            @second_post.comments = []
-            @first_post.author = @author
-            @second_post.author = @author
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @first_post.blog = @blog
-            @second_post.blog = nil
+module ActiveModelSerializers
+  module Adapter
+    class Json
+      class Collection < ActiveSupport::TestCase
+        def setup
+          @author = Author.new(id: 1, name: 'Steve K.')
+          @first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')
+          @second_post = Post.new(id: 2, title: 'New Post', body: 'Body')
+          @first_post.comments = []
+          @second_post.comments = []
+          @first_post.author = @author
+          @second_post.author = @author
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @first_post.blog = @blog
+          @second_post.blog = nil
 
-            ActionController::Base.cache_store.clear
-          end
+          ActionController::Base.cache_store.clear
+        end
 
-          def test_with_serializer_option
-            @blog.special_attribute = 'Special'
-            @blog.articles = [@first_post, @second_post]
-            serializer = CollectionSerializer.new([@blog], serializer: CustomBlogSerializer)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_with_serializer_option
+          @blog.special_attribute = 'Special'
+          @blog.articles = [@first_post, @second_post]
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@blog], serializer: CustomBlogSerializer)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            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
-          end
+          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
+        end
 
-          def test_include_multiple_posts
-            serializer = CollectionSerializer.new([@first_post, @second_post])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_include_multiple_posts
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@first_post, @second_post])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            expected = { posts: [{
-              title: 'Hello!!',
-              body: 'Hello, world!!',
+          expected = { posts: [{
+            title: 'Hello!!',
+            body: 'Hello, world!!',
+            id: 1,
+            comments: [],
+            author: {
               id: 1,
-              comments: [],
-              author: {
-                id: 1,
-                name: 'Steve K.'
-              },
-              blog: {
-                id: 999,
-                name: 'Custom blog'
-              }
-            }, {
-              title: 'New Post',
-              body: 'Body',
-              id: 2,
-              comments: [],
-              author: {
-                id: 1,
-                name: 'Steve K.'
-              },
-              blog: {
-                id: 999,
-                name: 'Custom blog'
-              }
-            }] }
-            assert_equal expected, adapter.serializable_hash
-          end
+              name: 'Steve K.'
+            },
+            blog: {
+              id: 999,
+              name: 'Custom blog'
+            }
+          }, {
+            title: 'New Post',
+            body: 'Body',
+            id: 2,
+            comments: [],
+            author: {
+              id: 1,
+              name: 'Steve K.'
+            },
+            blog: {
+              id: 999,
+              name: 'Custom blog'
+            }
+          }] }
+          assert_equal expected, adapter.serializable_hash
+        end
 
-          def test_root_is_underscored
-            virtual_value = VirtualValue.new(id: 1)
-            serializer = CollectionSerializer.new([virtual_value])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_root_is_underscored
+          virtual_value = VirtualValue.new(id: 1)
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([virtual_value])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            assert_equal 1, adapter.serializable_hash[:virtual_values].length
-          end
+          assert_equal 1, adapter.serializable_hash[:virtual_values].length
+        end
 
-          def test_include_option
-            serializer = CollectionSerializer.new([@first_post, @second_post])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, include: '')
-            actual = adapter.serializable_hash
-            expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
-                                 { id: 2, title: 'New Post', body: 'Body' }] }
+        def test_include_option
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@first_post, @second_post])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer, include: '')
+          actual = adapter.serializable_hash
+          expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
+                               { id: 2, title: 'New Post', body: 'Body' }] }
 
-            assert_equal(expected, actual)
-          end
+          assert_equal(expected, actual)
         end
       end
     end