Move DefaultSerializer from array_serializer.rb to serializer.rb

lib/active_model/array_serializer.rb

@@ -1,15 +1,6 @@
 require "active_support/core_ext/class/attribute"
 
 module ActiveModel
-  class DefaultSerializer
-    attr_reader :object
-    def initialize(object)
-      @object = object
-    end
-    def serializable_hash
-      @object.as_json
-    end
-  end
   # Active Model Array Serializer
   #
   # It serializes an Array, checking if each element that implements

lib/active_model/serializer.rb

@@ -387,4 +387,20 @@ module ActiveModel
       ActiveSupport::Notifications.instrument(event_name, payload, &block)
     end
   end
+  
+  # DefaultSerializer
+  #
+  # Provides a constant interface for all items, particularly
+  # for ArraySerializer.
+  class DefaultSerializer
+    attr_reader :object, :options
+
+    def initialize(object, options={})
+      @object, @options = object, options
+    end
+
+    def serializable_hash
+      @object.as_json
+    end
+  end
 end

test/test_fakes.rb

@@ -68,7 +68,7 @@ class MyUserSerializer < ActiveModel::Serializer
   end
 end
 
-class CommentSerializer < ActiveModel::Serializer
+class CommentSerializer
   def initialize(comment, options={})
     @object = comment
   end