active_model_serializers 0.10.0 → 0.10.2

data/test/active_model_serializers/serialization_context_test_isolated.rb

@@ -5,13 +5,19 @@ 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
+    def create_request
+      request = ActionDispatch::Request.new({})
+      def request.original_url
+        'http://example.com/articles?page=2'
+      end
+
+      def request.query_parameters
+        { 'page' => 2 }
+      end
+      request
+    end
+
     setup do
       require 'rails'
       require 'active_model_serializers'
@@ -20,8 +26,8 @@ class SerializationContextTest < ActiveSupport::TestCase
     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'
+      assert_equal @context.request_url, 'http://example.com/articles'
+      assert_equal @context.query_parameters, 'page' => 2
     end
 
     test 'url_helpers is set up for Rails url_helpers' do
@@ -36,14 +42,21 @@ class SerializationContextTest < ActiveSupport::TestCase
   end
 
   class WithoutRails < SerializationContextTest
+    def create_request
+      {
+        request_url: 'http://example.com/articles',
+        query_parameters: { 'page' => 2 }
+      }
+    end
+
     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'
+      assert_equal @context.request_url, 'http://example.com/articles'
+      assert_equal @context.query_parameters, 'page' => 2
     end
 
     test 'url_helpers is a module when Rails is not present' do

data/test/adapter/json/collection_test.rb

@@ -84,6 +84,20 @@ module ActiveModelSerializers
 
           assert_equal(expected, actual)
         end
+
+        def test_fields_with_no_associations_include_option
+          actual = ActiveModelSerializers::SerializableResource.new(
+            [@first_post, @second_post], adapter: :json, fields: [:id], include: []
+          ).as_json
+
+          expected = { posts: [{
+            id: 1
+          }, {
+            id: 2
+          }] }
+
+          assert_equal(expected, actual)
+        end
       end
     end
   end

data/test/adapter/json/transform_test.rb

@@ -28,8 +28,8 @@ module ActiveModelSerializers
         def test_transform_default
           mock_request
           assert_equal({
-            blog: { id: 1, special_attribute: 'neat', articles: nil }
-          }, @adapter.serializable_hash)
+                         blog: { id: 1, special_attribute: 'neat', articles: nil }
+                       }, @adapter.serializable_hash)
         end
 
         def test_transform_global_config
@@ -38,8 +38,8 @@ module ActiveModelSerializers
             @adapter.serializable_hash
           end
           assert_equal({
-            blog: { id: 1, specialAttribute: 'neat', articles: nil }
-          }, result)
+                         blog: { id: 1, specialAttribute: 'neat', articles: nil }
+                       }, result)
         end
 
         def test_transform_serialization_ctx_overrides_global_config
@@ -48,8 +48,8 @@ module ActiveModelSerializers
             @adapter.serializable_hash
           end
           assert_equal({
-            Blog: { Id: 1, SpecialAttribute: 'neat', Articles: nil }
-          }, result)
+                         Blog: { Id: 1, SpecialAttribute: 'neat', Articles: nil }
+                       }, result)
         end
 
         def test_transform_undefined
@@ -63,29 +63,29 @@ module ActiveModelSerializers
         def test_transform_dash
           mock_request(:dash)
           assert_equal({
-            blog: { id: 1, :"special-attribute" => 'neat', articles: nil }
-          }, @adapter.serializable_hash)
+                         blog: { id: 1, :"special-attribute" => 'neat', articles: nil }
+                       }, @adapter.serializable_hash)
         end
 
         def test_transform_unaltered
           mock_request(:unaltered)
           assert_equal({
-            blog: { id: 1, special_attribute: 'neat', articles: nil }
-          }, @adapter.serializable_hash)
+                         blog: { id: 1, special_attribute: 'neat', articles: nil }
+                       }, @adapter.serializable_hash)
         end
 
         def test_transform_camel
           mock_request(:camel)
           assert_equal({
-            Blog: { Id: 1, SpecialAttribute: 'neat', Articles: nil }
-          }, @adapter.serializable_hash)
+                         Blog: { Id: 1, SpecialAttribute: 'neat', Articles: nil }
+                       }, @adapter.serializable_hash)
         end
 
         def test_transform_camel_lower
           mock_request(:camel_lower)
           assert_equal({
-            blog: { id: 1, specialAttribute: 'neat', articles: nil }
-          }, @adapter.serializable_hash)
+                         blog: { id: 1, specialAttribute: 'neat', articles: nil }
+                       }, @adapter.serializable_hash)
         end
       end
     end

data/test/adapter/json_api/collection_test.rb

@@ -58,9 +58,10 @@ module ActiveModelSerializers
 
         def test_limiting_fields
           actual = ActiveModelSerializers::SerializableResource.new(
-            [@first_post, @second_post], adapter: :json_api,
-                                         fields: { posts: %w(title comments blog author) })
-                                                               .serializable_hash
+            [@first_post, @second_post],
+            adapter: :json_api,
+            fields: { posts: %w(title comments blog author) }
+          ).serializable_hash
           expected = [
             {
               id: '1',

data/test/adapter/json_api/errors_test.rb

@@ -12,8 +12,8 @@ module ActiveModelSerializers
 
         def test_active_model_with_error
           options = {
-              serializer: ActiveModel::Serializer::ErrorSerializer,
-              adapter: :json_api
+            serializer: ActiveModel::Serializer::ErrorSerializer,
+            adapter: :json_api
           }
 
           @resource.errors.add(:name, 'cannot be nil')
@@ -22,22 +22,21 @@ module ActiveModelSerializers
           assert_equal serializable_resource.serializer_instance.attributes, {}
           assert_equal serializable_resource.serializer_instance.object, @resource
 
-          expected_errors_object =
-            { :errors =>
-              [
-                {
-                  source: { pointer: '/data/attributes/name' },
-                  detail: 'cannot be nil'
-                }
-              ]
+          expected_errors_object = {
+            errors: [
+              {
+                source: { pointer: '/data/attributes/name' },
+                detail: 'cannot be nil'
+              }
+            ]
           }
           assert_equal serializable_resource.as_json, expected_errors_object
         end
 
         def test_active_model_with_multiple_errors
           options = {
-              serializer: ActiveModel::Serializer::ErrorSerializer,
-              adapter: :json_api
+            serializer: ActiveModel::Serializer::ErrorSerializer,
+            adapter: :json_api
           }
 
           @resource.errors.add(:name, 'cannot be nil')
@@ -48,13 +47,12 @@ module ActiveModelSerializers
           assert_equal serializable_resource.serializer_instance.attributes, {}
           assert_equal serializable_resource.serializer_instance.object, @resource
 
-          expected_errors_object =
-            { :errors =>
-              [
-                { :source => { :pointer => '/data/attributes/name' }, :detail => 'cannot be nil' },
-                { :source => { :pointer => '/data/attributes/name' }, :detail => 'must be longer' },
-                { :source => { :pointer => '/data/attributes/id' }, :detail => 'must be a uuid' }
-              ]
+          expected_errors_object = {
+            errors: [
+              { source: { pointer: '/data/attributes/name' }, detail: 'cannot be nil' },
+              { source: { pointer: '/data/attributes/name' }, detail: 'must be longer' },
+              { source: { pointer: '/data/attributes/id' }, detail: 'must be a uuid' }
+            ]
           }
           assert_equal serializable_resource.as_json, expected_errors_object
         end

data/test/adapter/json_api/has_many_test.rb

@@ -112,14 +112,14 @@ module ActiveModelSerializers
           adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
           assert_equal({
-            data: {
-              id: '1',
-              type: 'posts',
-              relationships: {
-                tags: { data: [@tag.as_json] }
-              }
-            }
-          }, adapter.serializable_hash)
+                         data: {
+                           id: '1',
+                           type: 'posts',
+                           relationships: {
+                             tags: { data: [@tag.as_json] }
+                           }
+                         }
+                       }, adapter.serializable_hash)
         end
 
         def test_has_many_with_virtual_value
@@ -127,16 +127,16 @@ module ActiveModelSerializers
           adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
           assert_equal({
-            data: {
-              id: '1',
-              type: 'virtual-values',
-              relationships: {
-                maker: { data: { type: 'makers', id: '1' } },
-                reviews: { data: [{ type: 'reviews', id: '1' },
-                                  { type: 'reviews', id: '2' }] }
-              }
-            }
-          }, adapter.serializable_hash)
+                         data: {
+                           id: '1',
+                           type: 'virtual-values',
+                           relationships: {
+                             maker: { data: { type: 'makers', id: '1' } },
+                             reviews: { data: [{ type: 'reviews', id: '1' },
+                                               { type: 'reviews', id: '2' }] }
+                           }
+                         }
+                       }, adapter.serializable_hash)
         end
       end
     end

data/test/adapter/json_api/json_api_test.rb

@@ -22,13 +22,11 @@ module ActiveModelSerializers
         adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 
         assert_equal({
-          reviews: { data: [
-                      { type: 'comments', id: '1' },
-                      { type: 'comments', id: '2' }
-                  ] },
-          writer: { data: { type: 'authors', id: '1' } },
-          site: { data: { type: 'blogs', id: '1' } }
-          }, adapter.serializable_hash[:data][:relationships])
+                       reviews: { data: [{ type: 'comments', id: '1' },
+                                         { type: 'comments', id: '2' }] },
+                       writer: { data: { type: 'authors', id: '1' } },
+                       site: { data: { type: 'blogs', id: '1' } }
+                     }, adapter.serializable_hash[:data][:relationships])
       end
     end
   end

data/test/adapter/json_api/linked_test.rb

@@ -17,7 +17,7 @@ module ActiveModelSerializers
           @first_post = Post.new(id: 10, title: 'Hello!!', body: 'Hello, world!!')
           @second_post = Post.new(id: 20, title: 'New Post', body: 'Body')
           @third_post = Post.new(id: 30, title: 'Yet Another Post', body: 'Body')
-          @blog = Blog.new({ name: 'AMS Blog' })
+          @blog = Blog.new(name: 'AMS Blog')
           @first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
           @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
           @first_post.blog = @blog
@@ -341,9 +341,10 @@ module ActiveModelSerializers
 
         def test_no_duplicates_collection
           hash = ActiveModelSerializers::SerializableResource.new(
-            [@post1, @post2], adapter: :json_api,
-                              include: '*.*')
-                                                             .serializable_hash
+            [@post1, @post2],
+            adapter: :json_api,
+            include: '*.*'
+          ).serializable_hash
           expected = [
             {
               type: 'authors', id: '1',
@@ -364,7 +365,8 @@ module ActiveModelSerializers
           hash = ActiveModelSerializers::SerializableResource.new(
             @nestedpost1,
             adapter: :json_api,
-            include: '*').serializable_hash
+            include: '*'
+          ).serializable_hash
           expected = [
             type: 'nested-posts', id: '2',
             relationships: {
@@ -383,7 +385,8 @@ module ActiveModelSerializers
           hash = ActiveModelSerializers::SerializableResource.new(
             [@nestedpost1, @nestedpost2],
             adapter: :json_api,
-            include: '*').serializable_hash
+            include: '*'
+          ).serializable_hash
           assert_nil(hash[:included])
         end
       end

data/test/adapter/json_api/links_test.rb

@@ -17,6 +17,7 @@ module ActiveModelSerializers
           link :yet_another do
             "http://example.com/resource/#{object.id}"
           end
+          link(:nil) { nil }
         end
 
         def setup
@@ -40,7 +41,8 @@ module ActiveModelSerializers
                   stuff: 'value'
                 }
               }
-            }).serializable_hash
+            }
+          ).serializable_hash
           expected = {
             self: {
               href: 'http://example.com/posts',

data/test/adapter/json_api/pagination_links_test.rb

@@ -13,11 +13,11 @@ module ActiveModelSerializers
         def setup
           ActionController::Base.cache_store.clear
           @array = [
-            Profile.new({ id: 1, name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
-            Profile.new({ id: 2, name: 'Name 2', description: 'Description 2', comments: 'Comments 2' }),
-            Profile.new({ id: 3, name: 'Name 3', description: 'Description 3', comments: 'Comments 3' }),
-            Profile.new({ id: 4, name: 'Name 4', description: 'Description 4', comments: 'Comments 4' }),
-            Profile.new({ id: 5, name: 'Name 5', description: 'Description 5', comments: 'Comments 5' })
+            Profile.new(id: 1, name: 'Name 1', description: 'Description 1', comments: 'Comments 1'),
+            Profile.new(id: 2, name: 'Name 2', description: 'Description 2', comments: 'Comments 2'),
+            Profile.new(id: 3, name: 'Name 3', description: 'Description 3', comments: 'Comments 3'),
+            Profile.new(id: 4, name: 'Name 4', description: 'Description 4', comments: 'Comments 4'),
+            Profile.new(id: 5, name: 'Name 5', description: 'Description 5', comments: 'Comments 5')
           ]
         end
 
@@ -43,7 +43,8 @@ module ActiveModelSerializers
         end
 
         def data
-          { data: [
+          {
+            data: [
               { id: '1', type: 'profiles', attributes: { name: 'Name 1', description: 'Description 1' } },
               { id: '2', type: 'profiles', attributes: { name: 'Name 2', description: 'Description 2' } },
               { id: '3', type: 'profiles', attributes: { name: 'Name 3', description: 'Description 3' } },
@@ -121,7 +122,7 @@ module ActiveModelSerializers
         end
 
         def test_pagination_links_with_additional_params
-          adapter = load_adapter(using_will_paginate, mock_request({ test: 'test' }))
+          adapter = load_adapter(using_will_paginate, mock_request(test: 'test'))
 
           assert_equal expected_response_with_pagination_links_and_additional_params,
             adapter.serializable_hash
@@ -160,6 +161,17 @@ module ActiveModelSerializers
 
           assert_equal expected_response_without_pagination_links, adapter.serializable_hash
         end
+
+        def test_raises_descriptive_error_when_serialization_context_unset
+          render_options = { adapter: :json_api }
+          adapter = serializable(using_kaminari, render_options)
+          exception = assert_raises do
+            adapter.as_json
+          end
+          exception_class = ActiveModelSerializers::Adapter::JsonApi::PaginationLinks::MissingSerializationContextError
+          assert_equal exception_class, exception.class
+          assert_match(/CollectionSerializer#paginated\?/, exception.message)
+        end
       end
     end
   end

data/test/adapter/json_api/relationships_test.rb

@@ -5,7 +5,8 @@ module ActiveModel
     module Adapter
       class JsonApi
         class RelationshipTest < ActiveSupport::TestCase
-          RelationshipAuthor = Class.new(::Model)
+          class RelationshipAuthor < ::Model; end
+
           class RelationshipAuthorSerializer < ActiveModel::Serializer
             has_one :bio do
               link :self, '//example.com/link_author/relationships/bio'
@@ -71,7 +72,6 @@ module ActiveModel
 
           def setup
             @post = Post.new(id: 1337, comments: [], author: nil)
-            @blog = Blog.new(id: 1337, name: 'extra')
             @bio = Bio.new(id: 1337)
             @like = Like.new(id: 1337)
             @role = Role.new(id: 'from-record')
@@ -82,7 +82,6 @@ module ActiveModel
             @author = RelationshipAuthor.new(
               id: 1337,
               posts: [@post],
-              blog: @blog,
               reviewer: @reviewer,
               bio: @bio,
               likes: [@like],
@@ -158,10 +157,16 @@ module ActiveModel
           end
 
           def test_relationship_not_including_data
+            @author.define_singleton_method(:read_attribute_for_serialization) do |attr|
+              fail 'should not be called' if attr == :blog
+              super(attr)
+            end
             expected = {
               links: { self: '//example.com/link_author/relationships/blog' }
             }
-            assert_relationship(:blog, expected)
+            assert_nothing_raised do
+              assert_relationship(:blog, expected)
+            end
           end
 
           def test_relationship_including_data_explicit

data/test/adapter/json_api/resource_identifier_test.rb

@@ -14,7 +14,13 @@ module ActiveModelSerializers
           end
         end
 
-        class FragmentedSerializer < ActiveModel::Serializer; end
+        class FragmentedSerializer < ActiveModel::Serializer
+          cache only: :id
+
+          def id
+            'special_id'
+          end
+        end
 
         setup do
           @model = Author.new(id: 1, name: 'Steve K.')
@@ -42,7 +48,6 @@ module ActiveModelSerializers
         end
 
         def test_id_defined_on_fragmented
-          FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@model))
           test_id(FragmentedSerializer, 'special_id')
         end
 

data/test/adapter/json_api/resource_meta_test.rb

@@ -68,9 +68,9 @@ module ActiveModel
               adapter: :json_api
             ).serializable_hash
             expected = {
-              :data => [
-                { :id => '1337', :type => 'posts', :meta => { :"comments-count" => 0 } },
-                { :id => '1339', :type => 'posts', :meta => { :"comments-count" => 1 } }
+              data: [
+                { id: '1337', type: 'posts', meta: { :"comments-count" => 0 } },
+                { id: '1339', type: 'posts', meta: { :"comments-count" => 1 } }
               ]
             }
             assert_equal(expected, hash)