From e407dfb9bf6ee3b12d699511ef05e6f260c5edf1 Mon Sep 17 00:00:00 2001
From: Jose and Yehuda <wycats@gmail.com>
Date: Tue, 27 Sep 2011 17:34:47 -0400
Subject: Don't require serializable_hash to take options.

---
 activemodel/lib/active_model/serializer.rb | 2 +-
 activemodel/test/cases/serializer_test.rb  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/activemodel/lib/active_model/serializer.rb b/activemodel/lib/active_model/serializer.rb
index 2eca3ebc5e..a2035ae2cb 100644
--- a/activemodel/lib/active_model/serializer.rb
+++ b/activemodel/lib/active_model/serializer.rb
@@ -29,7 +29,7 @@ module ActiveModel
       serializable_hash
     end
 
-    def serializable_hash(*)
+    def serializable_hash
       attributes
     end
 
diff --git a/activemodel/test/cases/serializer_test.rb b/activemodel/test/cases/serializer_test.rb
index 91ed6987a1..1c1da588f7 100644
--- a/activemodel/test/cases/serializer_test.rb
+++ b/activemodel/test/cases/serializer_test.rb
@@ -21,7 +21,7 @@ class SerializerTest < ActiveModel::TestCase
   class User2Serializer < ActiveModel::Serializer
     attributes :first_name, :last_name
 
-    def serializable_hash(*)
+    def serializable_hash
       attributes.merge(:ok => true).merge(scope)
     end
   end
@@ -29,7 +29,7 @@ class SerializerTest < ActiveModel::TestCase
   class MyUserSerializer < ActiveModel::Serializer
     attributes :first_name, :last_name
 
-    def serializable_hash(*)
+    def serializable_hash
       hash = attributes
       hash = hash.merge(:super_user => true) if my_user.super_user?
       hash
-- 
cgit v1.2.3