active_model_serializers 0.9.3 → 0.9.8

data/test/integration/active_record/active_record_test.rb

@@ -58,6 +58,22 @@ module ActiveModel
         end
       end
 
+      def test_serialization_embedding_ids_in_common_root_key
+        post_serializer = AREmbeddedSerializer.new(@post)
+
+        embed(AREmbeddedSerializer, embed: :ids, embed_in_root: true, embed_in_root_key: :linked) do
+          embed(ARCommentSerializer, embed: :ids, embed_in_root: true, embed_in_root_key: :linked) do
+            assert_equal({
+              'ar_tags' => [{ name: 'short' },
+                            { name: 'whiny' },
+                            { name: 'happy' }],
+              'ar_comments' => [{ body: 'what a dumb post', 'ar_tag_ids' => [3, 2] },
+                                { body: 'i liked it', 'ar_tag_ids' => [3, 1] }]
+            }, post_serializer.as_json[:linked])
+          end
+        end
+      end
+
       private
 
       def embed(serializer_class, options = {})
@@ -66,6 +82,7 @@ module ActiveModel
         serializer_class._associations.each_value do |association|
           association.embed = options[:embed]
           association.embed_in_root = options[:embed_in_root]
+          association.embed_in_root_key = options[:embed_in_root_key]
         end
 
         yield

data/test/tmp/app/assets/javascripts/accounts.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/tmp/app/assets/stylesheets/accounts.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/test/tmp/app/controllers/accounts_controller.rb

@@ -0,0 +1,2 @@
+class AccountsController < ApplicationController
+end

data/test/tmp/app/helpers/accounts_helper.rb

@@ -0,0 +1,2 @@
+module AccountsHelper
+end

data/test/tmp/config/routes.rb

@@ -0,0 +1 @@
+Rails.application.routes.draw { }

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

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+module ActiveModel
+  class ArraySerializer
+    class OptionsTest < Minitest::Test
+      def test_custom_options_are_accessible_from_serializer
+
+        array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
+                 Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]
+        serializer = ArraySerializer.new(array, only: [:name], context: {foo: :bar})
+
+        assert_equal({foo: :bar}, serializer.context)
+      end
+    end
+  end
+end

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

@@ -35,6 +35,23 @@ module ActiveModel
       end
     end
 
+    class CustomSerializerClassTest < Minitest::Test
+      def setup
+        Object.const_set(:CustomSerializer, Class.new)
+      end
+
+      def teardown
+        Object.send(:remove_const, :CustomSerializer)
+      end
+
+      def test_serializer_for_array_returns_appropriate_type
+        object = {}
+        def object.serializer_class; CustomSerializer; end
+
+        assert_equal CustomSerializer, Serializer.serializer_for(object)
+      end
+    end
+
     class ModelSerializationTest < Minitest::Test
       def test_array_serializer_serializes_models
         array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),

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

@@ -14,6 +14,36 @@ module ActiveModel
         assert_equal([:comments],
                      another_inherited_serializer_klass._associations.keys)
       end
+      def test_multiple_nested_associations
+        parent = SelfReferencingUserParent.new(name: "The Parent")
+        child = SelfReferencingUser.new(name: "The child", parent: parent)
+        self_referencing_user_serializer = SelfReferencingUserSerializer.new(child)
+        result = self_referencing_user_serializer.as_json
+        expected_result = {
+          "self_referencing_user"=>{
+            :name=>"The child",
+            "type_id"=>child.type.object_id,
+            "parent_id"=>child.parent.object_id
+
+          },
+          "types"=>[
+            {
+              :name=>"N1",
+            },
+            {
+              :name=>"N2",
+            }
+          ],
+          "parents"=>[
+            {
+              :name=>"N1",
+              "type_id"=>child.parent.type.object_id,
+              "parent_id"=>nil
+            }
+          ]
+        }
+        assert_equal(expected_result, result)
+      end
     end
   end
 end

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

@@ -176,7 +176,7 @@ module ActiveModel
 
       def test_associations_embedding_objects_using_a_given_array_serializer
         @association.serializer_from_options = Class.new(ArraySerializer) do
-          def serializable_object
+          def serializable_object(options={})
             { my_content: ['fake'] }
           end
         end

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

@@ -176,6 +176,20 @@ module ActiveModel
         }, @user_serializer.as_json)
       end
 
+      def test_associations_embedding_objects_with_nil_values
+        user_info = UserInfo.new
+        user_info.instance_eval do
+          def user
+            nil
+          end
+        end
+        user_info_serializer = UserInfoSerializer.new(user_info)
+
+        assert_equal({
+          'user_info' => { user: nil }
+        }, user_info_serializer.as_json)
+      end
+
       def test_associations_embedding_ids_using_embed_namespace
         @association.embed_namespace = :links
         @association.embed = :ids

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

@@ -21,6 +21,9 @@ module ActiveModel
             serialization_options[:force_the_description]
           end
         end
+
+        @category = Category.new({name: 'Category 1'})
+        @category_serializer = CategorySerializer.new(@category)
       end
 
       def test_filtered_attributes_serialization
@@ -29,6 +32,11 @@ module ActiveModel
           'profile' => { name: 'Name 1', description: forced_description }
         }, @profile_serializer.as_json(force_the_description: forced_description))
       end
+
+      def test_filtered_attributes_serialization_across_association
+        assert_equal("'T1'",
+            @category_serializer.as_json(highlight_keyword: 'T1')['category'][:posts][0][:title])
+      end
     end
   end
 end

data/test/unit/active_model/serilizable_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+
+module ActiveModel
+  class SerializableTest
+    class InstrumentationTest < Minitest::Test
+      def setup
+        @events = []
+
+        @subscriber = ActiveSupport::Notifications.subscribe('!serialize.active_model_serializers') do |name, start, finish, id, payload|
+          @events << { name: name, serializer: payload[:serializer] }
+        end
+      end
+
+      def teardown
+        ActiveSupport::Notifications.unsubscribe(@subscriber) if defined?(@subscriber)
+      end
+
+      def test_instruments_default_serializer
+        DefaultSerializer.new(1).as_json
+
+        assert_equal [{ name: '!serialize.active_model_serializers', serializer: 'ActiveModel::DefaultSerializer' }], @events
+      end
+
+      def test_instruments_serializer
+        profile = Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
+        serializer = ProfileSerializer.new(profile)
+
+        serializer.as_json
+
+        assert_equal [{ name: '!serialize.active_model_serializers', serializer: 'ProfileSerializer' }], @events
+      end
+
+      def test_instruments_array_serializer
+        profiles = [
+          Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1'),
+          Profile.new(name: 'Name 2', description: 'Description 2', comments: 'Comments 2')
+        ]
+        serializer = ArraySerializer.new(profiles)
+
+        serializer.as_json
+
+        assert_equal [
+          { name: '!serialize.active_model_serializers', serializer: 'ProfileSerializer' },
+          { name: '!serialize.active_model_serializers', serializer: 'ProfileSerializer' },
+          { name: '!serialize.active_model_serializers', serializer: 'ActiveModel::ArraySerializer' }
+        ], @events
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - José Valim
 - Yehuda Katz
 - Santiago Pastorino
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -26,6 +26,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,21 @@ files:
 - lib/active_model/serializer/version.rb
 - lib/active_model/serializer_support.rb
 - lib/active_model_serializers.rb
+- lib/active_model_serializers/model/caching.rb
+- test/benchmark/app.rb
+- test/benchmark/benchmarking_support.rb
+- test/benchmark/bm_active_record.rb
+- test/benchmark/setup.rb
+- test/benchmark/tmp/miniprofiler/mp_timers_6eqewtfgrhitvq5gqm25
+- test/benchmark/tmp/miniprofiler/mp_timers_8083sx03hu72pxz1a4d0
+- test/benchmark/tmp/miniprofiler/mp_timers_fyz2gsml4z0ph9kpoy1c
+- test/benchmark/tmp/miniprofiler/mp_timers_hjry5rc32imd42oxoi48
+- test/benchmark/tmp/miniprofiler/mp_timers_m8fpoz2cvt3g9agz0bs3
+- test/benchmark/tmp/miniprofiler/mp_timers_p92m2drnj1i568u3sta0
+- test/benchmark/tmp/miniprofiler/mp_timers_qg52tpca3uesdfguee9i
+- test/benchmark/tmp/miniprofiler/mp_timers_s15t1a6mvxe0z7vjv790
+- test/benchmark/tmp/miniprofiler/mp_timers_x8kal3d17nfds6vp4kcj
+- test/benchmark/tmp/miniprofiler/mp_views_127.0.0.1
 - test/fixtures/active_record.rb
 - test/fixtures/poro.rb
 - test/fixtures/template.html.erb
@@ -85,13 +114,19 @@ files:
 - test/integration/generators/resource_generator_test.rb
 - test/integration/generators/scaffold_controller_generator_test.rb
 - test/integration/generators/serializer_generator_test.rb
-- test/serializers/tmp/app/serializers/account_serializer.rb
 - test/test_app.rb
 - test/test_helper.rb
+- test/tmp/app/assets/javascripts/accounts.js
+- test/tmp/app/assets/stylesheets/accounts.css
+- test/tmp/app/controllers/accounts_controller.rb
+- test/tmp/app/helpers/accounts_helper.rb
+- test/tmp/app/serializers/account_serializer.rb
+- test/tmp/config/routes.rb
 - test/unit/active_model/array_serializer/except_test.rb
 - test/unit/active_model/array_serializer/key_format_test.rb
 - test/unit/active_model/array_serializer/meta_test.rb
 - test/unit/active_model/array_serializer/only_test.rb
+- test/unit/active_model/array_serializer/options_test.rb
 - test/unit/active_model/array_serializer/root_test.rb
 - test/unit/active_model/array_serializer/scope_test.rb
 - test/unit/active_model/array_serializer/serialization_test.rb
@@ -112,11 +147,12 @@ files:
 - test/unit/active_model/serializer/root_test.rb
 - test/unit/active_model/serializer/scope_test.rb
 - test/unit/active_model/serializer/url_helpers_test.rb
+- test/unit/active_model/serilizable_test.rb
 homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,47 +167,67 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Bringing consistency and object orientation to model serialization. Works
   great for client-side MVC frameworks!
 test_files:
-- test/fixtures/active_record.rb
-- test/fixtures/poro.rb
-- test/fixtures/template.html.erb
-- test/integration/action_controller/namespaced_serialization_test.rb
-- test/integration/action_controller/serialization_test.rb
-- test/integration/action_controller/serialization_test_case_test.rb
-- test/integration/active_record/active_record_test.rb
-- test/integration/generators/resource_generator_test.rb
-- test/integration/generators/scaffold_controller_generator_test.rb
-- test/integration/generators/serializer_generator_test.rb
-- test/serializers/tmp/app/serializers/account_serializer.rb
-- test/test_app.rb
-- test/test_helper.rb
-- test/unit/active_model/array_serializer/except_test.rb
-- test/unit/active_model/array_serializer/key_format_test.rb
-- test/unit/active_model/array_serializer/meta_test.rb
-- test/unit/active_model/array_serializer/only_test.rb
-- test/unit/active_model/array_serializer/root_test.rb
-- test/unit/active_model/array_serializer/scope_test.rb
-- test/unit/active_model/array_serializer/serialization_test.rb
-- test/unit/active_model/default_serializer_test.rb
+- test/benchmark/app.rb
+- test/benchmark/setup.rb
+- test/benchmark/bm_active_record.rb
+- test/benchmark/tmp/miniprofiler/mp_timers_m8fpoz2cvt3g9agz0bs3
+- test/benchmark/tmp/miniprofiler/mp_timers_s15t1a6mvxe0z7vjv790
+- test/benchmark/tmp/miniprofiler/mp_timers_hjry5rc32imd42oxoi48
+- test/benchmark/tmp/miniprofiler/mp_timers_qg52tpca3uesdfguee9i
+- test/benchmark/tmp/miniprofiler/mp_views_127.0.0.1
+- test/benchmark/tmp/miniprofiler/mp_timers_fyz2gsml4z0ph9kpoy1c
+- test/benchmark/tmp/miniprofiler/mp_timers_p92m2drnj1i568u3sta0
+- test/benchmark/tmp/miniprofiler/mp_timers_6eqewtfgrhitvq5gqm25
+- test/benchmark/tmp/miniprofiler/mp_timers_x8kal3d17nfds6vp4kcj
+- test/benchmark/tmp/miniprofiler/mp_timers_8083sx03hu72pxz1a4d0
+- test/benchmark/benchmarking_support.rb
+- test/unit/active_model/serializer/config_test.rb
+- test/unit/active_model/serializer/has_one_test.rb
 - test/unit/active_model/serializer/associations/build_serializer_test.rb
+- test/unit/active_model/serializer/key_format_test.rb
+- test/unit/active_model/serializer/url_helpers_test.rb
 - test/unit/active_model/serializer/associations_test.rb
+- test/unit/active_model/serializer/options_test.rb
 - test/unit/active_model/serializer/attributes_test.rb
-- test/unit/active_model/serializer/config_test.rb
-- test/unit/active_model/serializer/filter_test.rb
+- test/unit/active_model/serializer/root_test.rb
+- test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/has_many_polymorphic_test.rb
+- test/unit/active_model/serializer/has_one_polymorphic_test.rb
 - test/unit/active_model/serializer/has_many_test.rb
 - test/unit/active_model/serializer/has_one_and_has_many_test.rb
-- test/unit/active_model/serializer/has_one_polymorphic_test.rb
-- test/unit/active_model/serializer/has_one_test.rb
-- test/unit/active_model/serializer/key_format_test.rb
-- test/unit/active_model/serializer/meta_test.rb
-- test/unit/active_model/serializer/options_test.rb
-- test/unit/active_model/serializer/root_test.rb
+- test/unit/active_model/serializer/filter_test.rb
 - test/unit/active_model/serializer/scope_test.rb
-- test/unit/active_model/serializer/url_helpers_test.rb
+- test/unit/active_model/default_serializer_test.rb
+- test/unit/active_model/array_serializer/serialization_test.rb
+- test/unit/active_model/array_serializer/key_format_test.rb
+- test/unit/active_model/array_serializer/options_test.rb
+- test/unit/active_model/array_serializer/only_test.rb
+- test/unit/active_model/array_serializer/root_test.rb
+- test/unit/active_model/array_serializer/except_test.rb
+- test/unit/active_model/array_serializer/meta_test.rb
+- test/unit/active_model/array_serializer/scope_test.rb
+- test/unit/active_model/serilizable_test.rb
+- test/test_app.rb
+- test/integration/action_controller/serialization_test.rb
+- test/integration/action_controller/serialization_test_case_test.rb
+- test/integration/action_controller/namespaced_serialization_test.rb
+- test/integration/active_record/active_record_test.rb
+- test/integration/generators/scaffold_controller_generator_test.rb
+- test/integration/generators/resource_generator_test.rb
+- test/integration/generators/serializer_generator_test.rb
+- test/fixtures/poro.rb
+- test/fixtures/template.html.erb
+- test/fixtures/active_record.rb
+- test/test_helper.rb
+- test/tmp/app/serializers/account_serializer.rb
+- test/tmp/app/controllers/accounts_controller.rb
+- test/tmp/app/assets/javascripts/accounts.js
+- test/tmp/app/assets/stylesheets/accounts.css
+- test/tmp/app/helpers/accounts_helper.rb
+- test/tmp/config/routes.rb