From 5428fff78de5b02c9d37f111dd181b348f4c1a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 22 Nov 2009 10:44:07 -0200
Subject: [PATCH] Be less harsh on serializers.

---
 lib/devise/serializers/base.rb         | 15 +--------------
 lib/devise/serializers/rememberable.rb | 10 ++++++----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/devise/serializers/base.rb b/lib/devise/serializers/base.rb
index 721787fc..bdb9ec30 100644
--- a/lib/devise/serializers/base.rb
+++ b/lib/devise/serializers/base.rb
@@ -12,21 +12,8 @@ module Devise
         mapping.to.send(:"serialize_from_#{serialization_type}", keys)
       end
 
-      def store(user, scope)
-        @scope = scope
-        return unless valid?
-        super
-      end
-
       def fetch(scope)
         @scope = scope
-        return unless valid?
-        super
-      end
-
-      def delete(scope, user=nil)
-        @scope = scope
-        return unless valid?
         super
       end
 
@@ -38,4 +25,4 @@ module Devise
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/devise/serializers/rememberable.rb b/lib/devise/serializers/rememberable.rb
index 1352df7d..1ef71204 100644
--- a/lib/devise/serializers/rememberable.rb
+++ b/lib/devise/serializers/rememberable.rb
@@ -10,17 +10,19 @@ module Devise
           super
         end
       end
-      
+
       def default_options(record)
         super.merge!(:expires => record.remember_expires_at)
       end
 
       def delete(scope, record=nil)
-        record.forget_me! if record && record.respond_to?(:forget_me!)
-        super
+        if record && record.respond_to?(:forget_me!)
+          record.forget_me!
+          super
+        end
       end
     end
   end
 end
 
-Warden::Serializers.add(:rememberable, Devise::Serializers::Rememberable)
\ No newline at end of file
+Warden::Serializers.add(:rememberable, Devise::Serializers::Rememberable)