active_model_serializers 0.9.2 → 0.9.3

data/test/integration/action_controller/serialization_test_case_test.rb

@@ -11,6 +11,11 @@ module ActionController
         def render_text
           render text: 'ok'
         end
+
+        def render_template
+          prepend_view_path "./test/fixtures"
+          render template: "template"
+        end
       end
 
       tests MyController
@@ -56,6 +61,11 @@ module ActionController
         end
         assert_match 'assert_serializer only accepts a String, Symbol, Regexp, ActiveModel::Serializer, or nil', e.message
       end
+
+      def test_does_not_overwrite_notification_subscriptions
+        get :render_template
+        assert_template "template"
+      end
     end
   end
 end

data/test/integration/active_record/active_record_test.rb

@@ -49,9 +49,9 @@ module ActiveModel
                 'ar_tag_ids' => [1, 2],
                 'ar_section_id' => 1
               },
-              ar_comments: [{ body: 'what a dumb post', 'ar_tag_ids' => [3, 2] },
+              'ar_comments' => [{ body: 'what a dumb post', 'ar_tag_ids' => [3, 2] },
                             { body: 'i liked it', 'ar_tag_ids' => [3, 1] }],
-              ar_tags: [{ name: 'happy' }, { name: 'whiny' }, { name: 'short' }],
+              'ar_tags' => [{ name: 'happy' }, { name: 'whiny' }, { name: 'short' }],
               'ar_sections' => [{ 'name' => 'ruby' }]
             }, post_serializer.as_json)
           end

data/test/serializers/tmp/app/serializers/account_serializer.rb

@@ -0,0 +1,3 @@
+class AccountSerializer < ActiveModel::Serializer
+  attributes :id
+end

data/test/test_app.rb

@@ -3,6 +3,9 @@ class TestApp < Rails::Application
     config.eager_load = false
     config.secret_key_base = 'abc123'
   end
+  config.after_initialize do
+    Rails.application.routes.default_url_options = { host: 'http://example.com' }
+  end
 
   # Set up a logger to avoid creating a log directory on every run.
   config.logger = Logger.new(nil)

data/test/unit/active_model/array_serializer/serialization_test.rb

@@ -85,7 +85,7 @@ module ActiveModel
               {title: "Title 1", body: "Body 1", "comment_ids" => @post1.comments.map(&:object_id) },
               {title: "Title 2", body: "Body 2", "comment_ids" => @post2.comments.map(&:object_id) }
             ],
-            comments: [
+            'comments' => [
               {content: "C1"},
               {content: "C2"},
               {content: "C3"},

data/test/unit/active_model/serializer/associations/build_serializer_test.rb

@@ -7,6 +7,7 @@ module ActiveModel
         def setup
           @association = Association::HasOne.new('post', serializer: PostSerializer)
           @post = Post.new({ title: 'Title 1', body: 'Body 1', date: '1/1/2000' })
+          @user = User.new
         end
 
         def test_build_serializer_for_array_called_twice
@@ -15,6 +16,20 @@ module ActiveModel
             assert_instance_of(PostSerializer, serializer)
           end
         end
+
+        def test_build_serializer_from_in_a_namespace
+          assoc      = Association::HasOne.new('profile')
+          serializer = TestNamespace::UserSerializer.new(@user).build_serializer(assoc)
+
+          assert_instance_of(TestNamespace::ProfileSerializer, serializer)
+        end
+
+        def test_build_serializer_with_prefix
+          assoc      = Association::HasOne.new('profile', prefix: :short)
+          serializer = UserSerializer.new(@user).build_serializer(assoc)
+
+          assert_instance_of(ShortProfileSerializer, serializer)
+        end
       end
     end
   end

data/test/unit/active_model/serializer/attributes_test.rb

@@ -36,6 +36,22 @@ module ActiveModel
         assert_equal([:name, :description],
                      another_inherited_serializer_klass._attributes)
       end
+
+      def tests_query_attributes_strip_question_mark
+        model = Class.new(::Model) do
+          def strip?
+            true
+          end
+        end
+
+        serializer = Class.new(ActiveModel::Serializer) do
+          attributes :strip?
+        end
+
+        actual = serializer.new(model.new).as_json
+
+        assert_equal({ strip: true }, actual)
+      end
     end
   end
 end

data/test/unit/active_model/serializer/config_test.rb

@@ -78,6 +78,9 @@ module ActiveModel
           assert !association.embed_objects?
           assert association.embed_in_root
           assert_equal :lower_camel, association.key_format
+          assert_equal 'post', PostSerializer.root_name
+          CONFIG.plural_default_root = true
+          assert_equal 'posts', PostSerializer.root_name
         ensure
           PostSerializer._associations[:comments] = old_association
           CONFIG.clear

data/test/unit/active_model/serializer/has_many_polymorphic_test.rb

@@ -0,0 +1,189 @@
+require 'test_helper'
+
+module ActiveModel
+  class Serializer
+    class HasManyPolymorphicTest < ActiveModel::TestCase
+      def setup
+        @association = MailSerializer._associations[:attachments]
+        @old_association = @association.dup
+
+        @mail = Mail.new({ body: 'Body 1' })
+        @mail_serializer = MailSerializer.new(@mail)
+      end
+
+      def teardown
+        MailSerializer._associations[:attachments] = @old_association
+      end
+
+      def model_name(object)
+        object.class.to_s.demodulize.underscore.to_sym
+      end
+
+      def test_associations_definition
+        assert_equal 1, MailSerializer._associations.length
+        assert_kind_of Association::HasMany, @association
+        assert_equal true, @association.polymorphic
+        assert_equal 'attachments', @association.name
+      end
+
+      def test_associations_embedding_ids_serialization_using_serializable_hash
+        @association.embed = :ids
+
+        assert_equal({
+          body: 'Body 1',
+          'attachment_ids' => @mail.attachments.map do |c|
+            { id: c.object_id, type: model_name(c) }
+          end
+        }, @mail_serializer.serializable_hash)
+      end
+
+      def test_associations_embedding_ids_serialization_using_as_json
+        @association.embed = :ids
+
+        assert_equal({
+          'mail' => {
+            :body => 'Body 1',
+            'attachment_ids' => @mail.attachments.map do |c|
+              { id: c.object_id, type: model_name(c) }
+            end
+          }
+        }, @mail_serializer.as_json)
+      end
+
+      def test_associations_embedding_ids_serialization_using_serializable_hash_and_key_from_options
+        @association.embed = :ids
+        @association.key = 'key'
+
+        assert_equal({
+          body: 'Body 1',
+          'key' => @mail.attachments.map do |c|
+            { id: c.object_id, type: model_name(c) }
+          end
+        }, @mail_serializer.serializable_hash)
+      end
+
+      def test_associations_embedding_objects_serialization_using_serializable_hash
+        @association.embed = :objects
+
+        assert_equal({
+          body: 'Body 1',
+          :attachments => [
+            { type: :image, image: { url: 'U1' }},
+            { type: :video, video: { html: 'H1' }}
+          ]
+        }, @mail_serializer.serializable_hash)
+      end
+
+      def test_associations_embedding_objects_serialization_using_as_json
+        @association.embed = :objects
+
+        assert_equal({
+          'mail' => {
+            body: 'Body 1',
+            attachments: [
+              { type: :image, image: { url: 'U1' }},
+              { type: :video, video: { html: 'H1' }}
+            ]
+          }
+        }, @mail_serializer.as_json)
+      end
+
+      def test_associations_embedding_nil_objects_serialization_using_as_json
+        @association.embed = :objects
+        @mail.instance_eval do
+          def attachments
+            [nil]
+          end
+        end
+
+        assert_equal({
+          'mail' => {
+            :body => 'Body 1',
+            :attachments => [nil]
+          }
+        }, @mail_serializer.as_json)
+      end
+
+      def test_associations_embedding_objects_serialization_using_serializable_hash_and_root_from_options
+        @association.embed = :objects
+        @association.embedded_key = 'root'
+
+        assert_equal({
+          body: 'Body 1',
+          'root' => [
+            { type: :image, image: { url: 'U1' }},
+            { type: :video, video: { html: 'H1' }}
+          ]
+        }, @mail_serializer.serializable_hash)
+      end
+
+      def test_associations_embedding_ids_including_objects_serialization_using_serializable_hash
+        @association.embed = :ids
+        @association.embed_in_root = true
+
+        assert_equal({
+          body: 'Body 1',
+          'attachment_ids' => @mail.attachments.map do |c|
+            { id: c.object_id, type: model_name(c) }
+          end
+        }, @mail_serializer.serializable_hash)
+      end
+
+      def test_associations_embedding_ids_including_objects_serialization_using_as_json
+        @association.embed = :ids
+        @association.embed_in_root = true
+
+        assert_equal({
+          'mail' => {
+            body: 'Body 1',
+            'attachment_ids' => @mail.attachments.map do |c|
+              { id: c.object_id, type: model_name(c) }
+            end,
+          },
+          'attachments' => [
+            { type: :image, image: { url: 'U1' }},
+            { type: :video, video: { html: 'H1' }}
+          ]
+        }, @mail_serializer.as_json)
+      end
+
+      def test_associations_embedding_nothing_including_objects_serialization_using_as_json
+        @association.embed = nil
+        @association.embed_in_root = true
+
+        assert_equal({
+          'mail' => { body: 'Body 1' },
+          'attachments' => [
+            { type: :image, image: { url: 'U1' }},
+            { type: :video, video: { html: 'H1' }}
+          ]
+        }, @mail_serializer.as_json)
+      end
+
+      def test_associations_using_a_given_serializer
+        @association.embed = :ids
+        @association.embed_in_root = true
+        @association.serializer_from_options = Class.new(ActiveModel::Serializer) do
+          def fake
+            'fake'
+          end
+
+          attributes :fake
+        end
+
+        assert_equal({
+          'mail' => {
+            body: 'Body 1',
+            'attachment_ids' => @mail.attachments.map do |c|
+              { id: c.object_id, type: model_name(c) }
+            end
+          },
+          'attachments' => [
+            { type: :image, image: { fake: 'fake' }},
+            { type: :video, video: { fake: 'fake' }}
+          ]
+        }, @mail_serializer.as_json)
+      end
+    end
+  end
+end

data/test/unit/active_model/serializer/has_many_test.rb

@@ -111,17 +111,34 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          comments: [{ content: 'C1' }, { content: 'C2' }]
+          'comments' => [{ content: 'C1' }, { content: 'C2' }]
         }, @post_serializer.as_json)
       end
 
+      def test_associations_embedding_ids_including_objects_serialization_when_invoked_from_parent_serializer
+        @association.embed = :ids
+        @association.embed_in_root = true
+
+        category = Category.new(name: 'Name 1')
+        category.instance_variable_set(:@posts, [@post])
+        category_serializer = CategorySerializer.new(category)
+
+        assert_equal({
+          'category' => {
+            name: 'Name 1',
+            posts: [{ title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } }]
+          },
+          "comments" => [{ content: 'C1' }, { content: 'C2' }]
+        }, category_serializer.as_json)
+      end
+
       def test_associations_embedding_nothing_including_objects_serialization_using_as_json
         @association.embed = nil
         @association.embed_in_root = true
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1' },
-          comments: [{ content: 'C1' }, { content: 'C2' }]
+          'comments' => [{ content: 'C1' }, { content: 'C2' }]
         }, @post_serializer.as_json)
       end
 
@@ -138,7 +155,7 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          comments: [{ content: 'C1!' }, { content: 'C2!' }]
+          'comments' => [{ content: 'C1!' }, { content: 'C2!' }]
         }, @post_serializer.as_json)
       end
 
@@ -153,7 +170,7 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          comments: { my_content: ['fake'] }
+          'comments' => { my_content: ['fake'] }
         }, @post_serializer.as_json)
       end
 
@@ -174,16 +191,16 @@ module ActiveModel
         @association.embed_in_root_key = :linked
         @association.embed = :ids
         assert_equal({
+          'post' => {
+            title: 'Title 1', body: 'Body 1',
+            'comment_ids' => @post.comments.map(&:object_id)
+          },
           linked: {
-            comments: [
+            'comments' => [
               { content: 'C1' },
               { content: 'C2' }
             ]
           },
-          'post' => {
-            title: 'Title 1', body: 'Body 1',
-            'comment_ids' => @post.comments.map(&:object_id)
-          }
         }, @post_serializer.as_json)
       end
 
@@ -194,18 +211,18 @@ module ActiveModel
         @association.embed_namespace = :links
         @association.key = :comments
         assert_equal({
-          linked: {
-            comments: [
-              { content: 'C1' },
-              { content: 'C2' }
-            ]
-          },
           'post' => {
             title: 'Title 1', body: 'Body 1',
             links: {
               comments: @post.comments.map(&:object_id)
             }
-          }
+          },
+          linked: {
+            'comments' => [
+              { content: 'C1' },
+              { content: 'C2' }
+            ]
+          },
         }, @post_serializer.as_json)
       end
 
@@ -225,6 +242,24 @@ module ActiveModel
           }
         }, @post_serializer.as_json)
       end
+
+      def test_associations_name_key_embedding_ids_serialization_using_serializable_hash
+        @association = NameKeyPostSerializer._associations[:comments]
+        @association.embed = :ids
+
+        assert_equal({
+          title: 'Title 1', body: 'Body 1', 'comments' => @post.comments.map { |c| c.object_id }
+        }, NameKeyPostSerializer.new(@post).serializable_hash)
+      end
+
+      def test_associations_name_key_embedding_ids_serialization_using_as_json
+        @association = NameKeyPostSerializer._associations[:comments]
+        @association.embed = :ids
+
+        assert_equal({
+          'name_key_post' => { title: 'Title 1', body: 'Body 1', 'comments' => @post.comments.map { |c| c.object_id } }
+        }, NameKeyPostSerializer.new(@post).as_json)
+      end
     end
   end
 end

data/test/unit/active_model/serializer/has_one_and_has_many_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+module ActiveModel
+  class Serializer
+    class HasOneAndHasManyTest < Minitest::Test
+      def setup
+        @post = SpecialPost.new({ title: 'T1', body: 'B1'})
+        @post_serializer = SpecialPostSerializer.new(@post)
+      end
+
+      def teardown
+      end
+
+      def test_side_load_has_one_and_has_many_in_same_array
+        assert_equal({
+          "post" => {
+            title: 'T1',
+            body: 'B1',
+            'comment_ids' => @post.comments.map { |c| c.object_id },
+            'special_comment_id' => @post_serializer.special_comment.object_id,
+          },
+          "comments" => [{ content: 'C1' }, { content: 'C2' }, { content: 'special' }]
+        }, @post_serializer.as_json(root: 'post'))
+      end
+    end
+  end
+end