active_model_serializers 0.9.9 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52331f8ebc5267f272b9823aca4573af1f8a3493ff31ab42255a62003ec21c7e
-  data.tar.gz: c050584bb445c216b604b33ea421c5705e0a7a35842d609edf2b2ce87f0facf5
+  metadata.gz: f1c2dbb7d1b6d7673364e690d624e5a8dffa5fddf2f9ee9d6838ac399ab14a96
+  data.tar.gz: 5fcef7df6ec5deb692b68ffd8198e438b8bf2bafe812d12ace97087f9eb9c3f8
 SHA512:
-  metadata.gz: 7f1799ea050b2e12bc6ea3ca43b121801a0b33858ad3ad2e3b503d940a0439ceb83ab596d53e9cb46bc85dc25e92af8350d0f54db6eea51cb867a8bb475766dc
-  data.tar.gz: 6c0d80acada0ae9f37638fe5ca5a95a23c43faaafba1f6474a6f337f2faadca92b587f5c83dbbe1b6ecbd38169e334940ed685dfcd88cf9c44bd7d9887667e04
+  metadata.gz: 281b4a64ab65e4f2aff6b45a393e684e1d69a5fe203c450268cfc001deb20fce6e1269c9aafd1bf54e847bc5a282cfd28f630cb45096ec750bb531363cd93cbd
+  data.tar.gz: 13cd7cfa482532515a8629c35c4e5c0847b1dd791494025f4d6177e05f45f5845641b8bc04cfb543a503b8767afcb8505fd1c433afc0cd73c5bcd0d9a8066119

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 ## 0.09.x
 
-### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.9...0-9-stable)
+### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.11...0-9-stable)
+
+### [v0.9.11 (2024-04-09)](https://github.com/rails-api/active_model_serializers/compare/v0.9.10...v0.9.11)
+
+v0.9.10 was built with an extra file included and so was yanked.
+v0.9.11 is the same as v0.9.10 but doesn't have the extra file.
+
+### [v0.9.10 (2024-04-09)](https://github.com/rails-api/active_model_serializers/compare/v0.9.9...v0.9.10)
+
+- Fix
+  - [#2464](https://github.com/rails-api/active_model_serializers/pull/2464) Do not load ActionController::TestCase in production (@byroot)
+- Perf
+  - [#2465](https://github.com/rails-api/active_model_serializers/pull/2465) Make compatible with enable-frozen-string-literal (@byroot)
+  - [#2463](https://github.com/rails-api/active_model_serializers/pull/2463) Shape Friendly ActionController:Serialization (@byroot)
+- Chore
+  - [#2462](https://github.com/rails-api/active_model_serializers/pull/2462]) Rails 7.1, Ruby 3.3 compat (@byroot)
+- Test
+  - [#2447](https://github.com/rails-api/active_model_serializers/pull/2447) Configure CI on GitHub actoins (@Physium)
 
 ### [v0.9.9 (2023-05-18)](https://github.com/rails-api/active_model_serializers/compare/v0.9.8...v0.9.8)
 

data/lib/action_controller/serialization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 
 module ActionController
@@ -45,6 +47,12 @@ module ActionController
       end
     end
 
+    def initialize(*)
+      super
+      @namespace_for_serializer = nil
+    end
+    ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
+
     [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
       define_method renderer_method do |resource, options|
         serializer = build_json_serializer(resource, options)
@@ -60,7 +68,8 @@ module ActionController
     private
 
     def namespace_for_serializer
-      @namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
+      @namespace_for_serializer ||= namespace_for_class(self.class)
+      @namespace_for_serializer unless @namespace_for_serializer == Object
     end
 
     def namespace_for_class(klass)

data/lib/action_controller/serialization_test_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   module SerializationAssertions
     extend ActiveSupport::Concern
@@ -24,6 +26,7 @@ module ActionController
       @serializers = Hash.new(0)
       super
     end
+    ruby2_keywords :process if respond_to?(:ruby2_keywords, true)
 
     # Asserts that the request was rendered with the appropriate serializers.
     #

data/lib/active_model/array_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/default_serializer'
 require 'active_model/serializable'
 

data/lib/active_model/default_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/serializable'
 
 module ActiveModel

data/lib/active_model/serializable/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Serializable
     module Utils

data/lib/active_model/serializable.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'active_model/serializable/utils'
 
 module ActiveModel
   module Serializable
-    INSTRUMENTATION_KEY = '!serialize.active_model_serializers'.freeze
+    INSTRUMENTATION_KEY = '!serialize.active_model_serializers'
 
     def self.included(base)
       base.extend Utils

data/lib/active_model/serializer/association/has_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Association

data/lib/active_model/serializer/association/has_one.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Association

data/lib/active_model/serializer/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/default_serializer'
 require 'active_model/serializer/association/has_one'
 require 'active_model/serializer/association/has_many'

data/lib/active_model/serializer/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class Config

data/lib/active_model/serializer/generators/resource_override.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/rails/resource/resource_generator'
 

data/lib/active_model/serializer/generators/serializer/scaffold_controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 

data/lib/active_model/serializer/generators/serializer/serializer_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class SerializerGenerator < NamedBase

data/lib/active_model/serializer/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Railtie < Rails::Railtie
     initializer 'generators' do |app|

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
-    VERSION = '0.9.9'.freeze
+    VERSION = '0.9.11'
   end
 end

data/lib/active_model/serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model/array_serializer'
 require 'active_model/serializable'
 require 'active_model/serializer/association'
@@ -130,14 +132,13 @@ end
       end
 
       def build_serializer_class(resource, options)
-        "".tap do |klass_name|
-          klass_name << "#{options[:namespace]}::" if options[:namespace]
-          klass_name << options[:prefix].to_s.classify if options[:prefix]
-          if resource.is_a?(String)
-            klass_name << "#{resource}Serializer"
-          else
-            klass_name << "#{resource.class.name}Serializer"
-          end
+        klass_name = +""
+        klass_name << "#{options[:namespace]}::" if options[:namespace]
+        klass_name << options[:prefix].to_s.classify if options[:prefix]
+        if resource.is_a?(String)
+          klass_name << "#{resource}Serializer"
+        else
+          klass_name << "#{resource.class.name}Serializer"
         end
       end
 

data/lib/active_model/serializer_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module SerializerSupport
     alias read_attribute_for_serialization send

data/lib/active_model_serializers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'active_model/serializer'
 require 'active_model/serializer_support'
@@ -7,12 +9,22 @@ require 'active_model/serializer/railtie' if defined?(Rails)
 begin
   require 'action_controller'
   require 'action_controller/serialization'
-  require 'action_controller/serialization_test_case'
 
   ActiveSupport.on_load(:action_controller) do
     if ::ActionController::Serialization.enabled
       ActionController::Base.send(:include, ::ActionController::Serialization)
-      ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+
+      # action_controller_test_case load hook was added in Rails 5.1
+      # https://github.com/rails/rails/commit/0510208dd1ff23baa619884c0abcae4d141fae53
+      if ActiveSupport::VERSION::STRING < '5.1'
+        require 'action_controller/serialization_test_case'
+        ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+      else
+        ActiveSupport.on_load(:action_controller_test_case) do
+          require 'action_controller/serialization_test_case'
+          ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
+        end
+      end
     end
   end
 rescue LoadError

data/test/integration/action_controller/serialization_test.rb

@@ -13,7 +13,7 @@ module ActionController
 
       def test_render_using_implicit_serializer
         get :render_using_implicit_serializer
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1"}}', @response.body
       end
     end
@@ -35,7 +35,7 @@ module ActionController
 
       def test_render_using_implicit_serializer_and_scope
         get :render_using_implicit_serializer_and_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_user"}}', @response.body
       end
     end
@@ -65,7 +65,7 @@ module ActionController
 
       def test_render_using_scope_set_in_default_serializer_options
         get :render_using_scope_set_in_default_serializer_options
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -91,7 +91,7 @@ module ActionController
 
       def test_render_using_implicit_serializer_and_explicit_scope
         get :render_using_implicit_serializer_and_explicit_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -117,7 +117,7 @@ module ActionController
 
       def test_render_overriding_serialization_scope
         get :render_overriding_serialization_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_admin"}}', @response.body
       end
     end
@@ -141,7 +141,7 @@ module ActionController
 
       def test_render_calling_serialization_scope
         get :render_calling_serialization_scope
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"profile":{"name":"Name 1","description":"Description 1 - current_user"}}', @response.body
       end
     end
@@ -157,7 +157,7 @@ module ActionController
 
       def test_render_using_json_dump
         get :render_using_json_dump
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"hello":"world"}', @response.body
       end
     end
@@ -173,7 +173,7 @@ module ActionController
 
       def test_render_using_rails_behavior
         get :render_using_rails_behavior
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '[{"attributes":{"name":"Name 1","description":"Description 1","comments":"Comments 1"}}]', @response.body
       end
     end
@@ -189,7 +189,7 @@ module ActionController
 
       def test_render_array
         get :render_array
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"my":[{"name":"Name 1","description":"Description 1"}]}', @response.body
       end
     end
@@ -205,7 +205,7 @@ module ActionController
 
       def test_render_array
         get :render_array
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"webLog":[{"name":"Name 1","displayName":"Display Name 1"},{"name":"Name 2","displayName":"Display Name 2"}]}', @response.body
       end
     end
@@ -223,7 +223,7 @@ module ActionController
 
       def test_render_without_root
         get :render_without_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '{"name":"Name 1","displayName":"Display Name 1"}', @response.body
       end
     end
@@ -242,7 +242,7 @@ module ActionController
 
       def test_render_array_without_root
         get :render_array_without_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
         assert_equal '[{"name":"Name 1","displayName":"Display Name 1"},{"name":"Name 2","displayName":"Display Name 2"}]', @response.body
       end
     end
@@ -278,7 +278,7 @@ module ActionController
         @association.embed_in_root = true
 
         get :render_array_embeding_in_root
-        assert_equal 'application/json', @response.content_type
+        assert_includes @response.content_type, 'application/json'
 
         assert_equal("{\"my\":[{\"name\":\"Name 1\",\"email\":\"mail@server.com\",\"profile_id\":#{@controller.user.profile.object_id}}],\"profiles\":[{\"name\":\"N1\",\"description\":\"D1\"}]}", @response.body)
       end

data/test/test_helper.rb

@@ -2,8 +2,13 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'active_model_serializers'
 require 'fixtures/poro'
-require 'rails-controller-testing'
-Rails::Controller::Testing.install
+begin
+  require 'rails-controller-testing'
+  Rails::Controller::Testing.install
+rescue LoadError
+  false # Rails 5 < backward compatibility
+end
+
 
 # Ensure backward compatibility with Minitest 4
 Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)

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

@@ -66,8 +66,8 @@ module ActiveModel
         serializer = ArraySerializer.new(array)
 
         expected = [
-          { name: 'Test 1', email: 'test1@test.com', sub_test: { name: 'Name 1', description: 'Description 1' }},
-          { name: 'Test 1', email: 'test2@test.com', sub_test: { name: 'Name 2', description: 'Description 2' }}
+          { name: 'Test 1', email: 'test1@test.com', sub_test: { name: 'Name 1', description: 'Description 1' } },
+          { name: 'Test 2', email: 'test2@test.com', sub_test: { name: 'Name 2', description: 'Description 2' } }
         ]
 
         assert_equal expected, serializer.serializable_array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.11
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -89,7 +89,6 @@ 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
@@ -167,67 +166,67 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bringing consistency and object orientation to model serialization. Works
   great for client-side MVC frameworks!
 test_files:
 - test/benchmark/app.rb
-- test/benchmark/setup.rb
+- test/benchmark/benchmarking_support.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/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_6eqewtfgrhitvq5gqm25
+- 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_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/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/filter_test.rb
-- test/unit/active_model/serializer/scope_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/benchmark/tmp/miniprofiler/mp_views_127.0.0.1
+- 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/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/scaffold_controller_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_app.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/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
+- test/unit/active_model/default_serializer_test.rb
+- test/unit/active_model/serializer/associations/build_serializer_test.rb
+- test/unit/active_model/serializer/associations_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/has_many_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/scope_test.rb
+- test/unit/active_model/serializer/url_helpers_test.rb
+- test/unit/active_model/serilizable_test.rb

data/lib/active_model_serializers/model/caching.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-module ActiveModelSerializers
-  class Model
-    module Caching
-      extend ActiveSupport::Concern
-
-      included do
-        attr_writer :updated_at
-        attributes :id
-      end
-
-      # Defaults to the downcased model name and updated_at
-      def cache_key
-        ActiveSupport::Cache.expand_cache_key([
-          self.class.model_name.name.downcase,
-          "#{id}-#{updated_at.strftime('%Y%m%d%H%M%S%9N')}"
-        ].compact)
-      end
-
-      # Defaults to the time the serializer file was modified.
-      def updated_at
-        defined?(@updated_at) ? @updated_at : File.mtime(__FILE__)
-      end
-    end
-  end
-end