From c4fcf96eb4940cd168cb748a72bf2d478b3c437e Mon Sep 17 00:00:00 2001
From: Adam Stanton <adamstanton1979@gmail.com>
Date: Sun, 10 Feb 2013 09:49:11 -0800
Subject: [PATCH] Move DefaultSerializer from array_serializer.rb to
 serializer.rb

---
 lib/active_model/array_serializer.rb |  9 ---------
 lib/active_model/serializer.rb       | 16 ++++++++++++++++
 test/test_fakes.rb                   |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb
index a3b1ba38..e3dc6ca0 100644
--- a/lib/active_model/array_serializer.rb
+++ b/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
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index b070664c..25a4d63f 100644
--- a/lib/active_model/serializer.rb
+++ b/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
diff --git a/test/test_fakes.rb b/test/test_fakes.rb
index 789fde92..73d57088 100644
--- a/test/test_fakes.rb
+++ b/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