active_model_serializers 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f526564b9458ceea3d9391ddbf81cf996ff713dbb217bcec1c22931b4cd028
-  data.tar.gz: ac5641428e5b17ffa605bc7337f8f77000354a2a47f1a5ed7244ab50cdca84b2
+  metadata.gz: 52331f8ebc5267f272b9823aca4573af1f8a3493ff31ab42255a62003ec21c7e
+  data.tar.gz: c050584bb445c216b604b33ea421c5705e0a7a35842d609edf2b2ce87f0facf5
 SHA512:
-  metadata.gz: af47a8298fbc563716f0c7b4a9e0d92b85243ead1b0ccac561703d17f09574a3e65f280adedbb24ee7d65c0634c4ca343c58aa665628ff75d7e220b89025e91d
-  data.tar.gz: 6974a26799a967fbb8b172092be014deb775909a52cf10cf4e7dc88b5c05c96f6b6acbb3d245f9ad9032c743c2048c1afd8335d3a899c3111f2d6b48015800f7
+  metadata.gz: 7f1799ea050b2e12bc6ea3ca43b121801a0b33858ad3ad2e3b503d940a0439ceb83ab596d53e9cb46bc85dc25e92af8350d0f54db6eea51cb867a8bb475766dc
+  data.tar.gz: 6c0d80acada0ae9f37638fe5ca5a95a23c43faaafba1f6474a6f337f2faadca92b587f5c83dbbe1b6ecbd38169e334940ed685dfcd88cf9c44bd7d9887667e04

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 0.09.x
 
-### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.8...0-9-stable)
+### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.9...0-9-stable)
+
+### [v0.9.9 (2023-05-18)](https://github.com/rails-api/active_model_serializers/compare/v0.9.8...v0.9.8)
+
+- [#2446](https://github.com/rails-api/active_model_serializers/pull/2446) Fix Ruby > 2.5 constant lookup. (@Physium)
 
 ### [v0.9.8 (2020-12-10)](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...v0.9.8)
 

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = '0.9.8'.freeze
+    VERSION = '0.9.9'.freeze
   end
 end

data/lib/active_model/serializer.rb

@@ -66,10 +66,14 @@ end
             ArraySerializer
           end
         else
-          klass_name = build_serializer_class(resource, options)
-          Serializer.serializers_cache.fetch_or_store(klass_name) do
-            _const_get(klass_name)
-          end
+          search_list = build_serializer_class_list(resource, options)
+          result = search_list.map do |klass_name|
+                     Serializer.serializers_cache.fetch_or_store(klass_name) do
+                       _const_get(klass_name)
+                     end
+                   end
+
+          result.find { |serializer| !serializer.nil? }
         end
       end
 
@@ -118,11 +122,22 @@ end
         attr
       end
 
+      def build_serializer_class_list(resource, options)
+        list = []
+        list << build_serializer_class(resource, options)
+        list << build_serializer_class(resource, {})
+        list << build_serializer_class(resource.class.name.demodulize, {})
+      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]
-          klass_name << "#{resource.class.name}Serializer"
+          if resource.is_a?(String)
+            klass_name << "#{resource}Serializer"
+          else
+            klass_name << "#{resource.class.name}Serializer"
+          end
         end
       end
 

data/lib/active_model_serializers/model/caching.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveModelSerializers
   class Model
     module Caching

data/test/fixtures/poro.rb

@@ -18,6 +18,19 @@ end
 ###
 ## Models
 ###
+
+module TestNamespace2
+  class Test < Model
+    attr_writer :sub_test
+
+    def sub_test
+      @sub_test ||= TestNamespace2::SubTest.new(name: 'N1', description: 'D1')
+    end
+  end
+
+  class SubTest < Model; end
+end
+
 class User < Model
   def profile
     @profile ||= Profile.new(name: 'N1', description: 'D1')
@@ -101,6 +114,24 @@ end
 ###
 ## Serializers
 ###
+
+module TestNamespace2
+  class TestSerializer < ActiveModel::Serializer
+    attributes :name, :email
+
+    has_one :sub_test
+  end
+
+  class SubTestSerializer < ActiveModel::Serializer
+    def description
+      description = object.read_attribute_for_serialization(:description)
+      scope ? "#{description} - #{scope}" : description
+    end
+
+    attributes :name, :description
+  end
+end
+
 class UserSerializer < ActiveModel::Serializer
   attributes :name, :email
 

data/test/integration/action_controller/serialization_test_case_test.rb

@@ -9,7 +9,7 @@ module ActionController
         end
 
         def render_text
-          render text: 'ok'
+          render plain: 'ok'
         end
 
         def render_template

data/test/test_helper.rb

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

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

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class AccountsController < ApplicationController
 end

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

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 module AccountsHelper
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AccountSerializer < ActiveModel::Serializer
   attributes :id
 end

data/test/tmp/config/routes.rb

@@ -1 +1,2 @@
-Rails.application.routes.draw { }
+# frozen_string_literal: true
+Rails.application.routes.draw {}

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

@@ -49,6 +49,29 @@ module ActiveModel
         def object.serializer_class; CustomSerializer; end
 
         assert_equal CustomSerializer, Serializer.serializer_for(object)
+        assert_equal CustomSerializer, Serializer.serializer_for('Custom')
+      end
+    end
+
+    class ModelSerializationNamespaceTest < Minitest::Test
+      def test_namespace
+        test1 = TestNamespace2::Test.new(name: 'Test 1', email: 'test1@test.com', gender: 'M')
+        test2 = TestNamespace2::Test.new(name: 'Test 2', email: 'test2@test.com', gender: 'M')
+        sub_test1 = TestNamespace2::SubTest.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
+        sub_test2 = TestNamespace2::SubTest.new(name: 'Name 2', description: 'Description 2', comments: 'Comments 2')
+        test1.sub_test = sub_test1
+        test2.sub_test = sub_test2
+
+        array = [test1, test2]
+        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' }}
+        ]
+
+        assert_equal expected, serializer.serializable_array
+        assert_equal expected, serializer.as_json
       end
     end
 

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class HasManyPolymorphicTest < ActiveModel::TestCase
+    class HasManyPolymorphicTest < Minitest::Test
       def setup
         @association = MailSerializer._associations[:attachments]
         @old_association = @association.dup

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class HasOnePolymorphicTest < ActiveModel::TestCase
+    class HasOnePolymorphicTest < Minitest::Test
       def setup
         @association = InterviewSerializer._associations[:attachment]
         @old_association = @association.dup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Bringing consistency and object orientation to model serialization. Works