From 2bd447d69d198228f838d618eef412b3852ecc2c Mon Sep 17 00:00:00 2001
From: Kevin Mahoney <kevin@gocardless.com>
Date: Fri, 22 Mar 2013 13:12:33 +0000
Subject: [PATCH] Pass options through when using default serializer

---
 lib/active_model/array_serializer.rb | 2 +-
 lib/active_model/serializer.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb
index a3b760cf..4560a362 100644
--- a/lib/active_model/array_serializer.rb
+++ b/lib/active_model/array_serializer.rb
@@ -83,7 +83,7 @@ module ActiveModel
           serializer = item.active_model_serializer
         end
 
-        serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item)
+        serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item, @options)
 
         if serializable.respond_to?(:serializable_hash)
           serializable.serializable_hash
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index f35fd4a3..52a9af0f 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -504,7 +504,7 @@ module ActiveModel
     end
 
     def serializable_hash
-      @object.as_json
+      @object.as_json(@options)
     end
   end
 end