Update 0.9-stable release to work with ruby 2.6 & 2.7 (#2446)

* Allow serializer_for to accept String instead of just class objects
* Update test to reference Minitest::Test as base instead
* Update Gemfile to handle RUBY_VERSION > 2.5
* Update render text to render plain as text is depreciated
* Update test_helper to require rails-controller-testing for rails 5 and above
* Patch serializer_for method to support ruby 2.5 > changes on const_get
* Add new test for complex namespace scenario which does not work when upgraded to ruby 2.5 >
* Update build_serializer_class_list to handle associations with namespace

Author: Physium

Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV["RAILS_VERSION"] || "4.2"
+default_rails_version = RUBY_VERSION > '2.5' ? '5.2' : '4.2'
+version = ENV['RAILS_VERSION'] || default_rails_version
 
 if version == 'master'
   gem 'rack', github: 'rack/rack'
@@ -27,6 +28,7 @@ else
   gem 'activemodel', gem_version
   gem 'actionpack', gem_version
   gem 'activerecord', gem_version, group: :test
+  gem 'rails-controller-testing' if version > '4.2'
 end
 
 if RUBY_VERSION < '2'

lib/active_model/serializer.rb

@@ -66,10 +66,14 @@ def serializer_for(resource, options = {})
             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 @@ def strip_attribute(attr)
         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
 

test/fixtures/poro.rb

@@ -18,6 +18,19 @@ def read_attribute_for_serialization(name)
 ###
 ## 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 @@ class Video < Model
 ###
 ## 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
 

test/integration/action_controller/serialization_test_case_test.rb

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

test/test_helper.rb

@@ -2,6 +2,8 @@
 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)

test/unit/active_model/array_serializer/serialization_test.rb

@@ -49,6 +49,29 @@ def test_serializer_for_array_returns_appropriate_type
         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: '[email protected]', gender: 'M')
+        test2 = TestNamespace2::Test.new(name: 'Test 2', email: '[email protected]', 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: '[email protected]', sub_test: { name: 'Name 1', description: 'Description 1' }},
+          { name: 'Test 1', email: '[email protected]', sub_test: { name: 'Name 2', description: 'Description 2' }}
+        ]
+
+        assert_equal expected, serializer.serializable_array
+        assert_equal expected, serializer.as_json
       end
     end
 

test/unit/active_model/serializer/has_many_polymorphic_test.rb

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

test/unit/active_model/serializer/has_one_polymorphic_test.rb

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