Remove SerializerSupport

lib/action_controller/serialization.rb

@@ -60,8 +60,7 @@ module ActionController
 
       serializer =
         options.delete(:serializer) ||
-        resource.respond_to?(:active_model_serializer) &&
+        ActiveModel::Serializer.serializer_for(resource)
-        resource.active_model_serializer
 
       options[:scope] = serialization_scope unless options.has_key?(:scope)
 

lib/active_model/serializer.rb

@@ -5,6 +5,10 @@ module ActiveModel
         base._attributes = {}
       end
 
+      def serializer_for(resource)
+        "#{resource.class.name}Serializer".safe_constantize
+      end
+
       attr_accessor :_root, :_attributes
 
       def root(root)

lib/active_model/serializer_support.rb

@@ -1,11 +0,0 @@
-require 'active_support/core_ext/string/inflections'
-
-module ActiveModel
-  module SerializerSupport
-    def active_model_serializer
-      "#{self.class.name}Serializer".safe_constantize
-    end
-
-    alias read_attribute_for_serialization send
-  end
-end

lib/active_model_serializers.rb

@@ -1,6 +1,5 @@
 require 'active_model'
 require 'active_model/serializer'
-require 'active_model/serializer_support'
 
 begin
   require 'action_controller'
@@ -12,9 +11,3 @@ begin
 rescue LoadError
   # rails not installed, continuing
 end
-
-[:active_record, :mongoid].each do |orm|
-  ActiveSupport.on_load(orm) do
-    include ActiveModel::SerializerSupport
-  end
-end

test/fixtures/poro.rb

@@ -1,6 +1,4 @@
 class Model
-  include ActiveModel::SerializerSupport
-
   def initialize(hash={})
     @attributes = hash
   end

test/unit/active_model/serializer_support/active_record_test.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-require 'fixtures/active_record'
-require 'active_model/serializer_support'
-
-module ActiveModel
-  module SerializerSupport
-    class Test < ActiveModel::TestCase
-      def test_active_model_returns_its_serializer
-        assert_equal ARModelSerializer, ARModel.new.active_model_serializer
-      end
-    end
-  end
-end

test/unit/active_model/serializer_support/poro_test.rb

@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'active_model/serializer_support'
-
-module ActiveModel
-  module SerializerSupport
-    class Test < ActiveModel::TestCase
-      def test_active_model_on_poro_returns_its_serializer
-        assert_equal ModelSerializer, ::Model.new.active_model_serializer
-      end
-    end
-  end
-end