From dbe0b48bca3d1478dde696d6e3893aa411b45bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 15 Nov 2009 02:13:54 -0200
Subject: [PATCH] Do not store mappings since they can change by scope in
 serializers.

---
 lib/devise/rails/warden_compat.rb | 4 ----
 lib/devise/strategies/base.rb     | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/devise/rails/warden_compat.rb b/lib/devise/rails/warden_compat.rb
index 647c7c7a..f40dd4ae 100644
--- a/lib/devise/rails/warden_compat.rb
+++ b/lib/devise/rails/warden_compat.rb
@@ -9,10 +9,6 @@ module Warden::Mixins::Common
     end
   end
 
-  def raw_session
-    request.session
-  end
-
   def reset_session!
     raw_session.inspect # why do I have to inspect it to get it to clear?
     raw_session.clear
diff --git a/lib/devise/strategies/base.rb b/lib/devise/strategies/base.rb
index 70d0a854..4cfb68a1 100644
--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -1,9 +1,7 @@
 module Devise
   module Strategies
-    # Base strategy for Devise. Responsible for verifying correct scope and
-    # mapping.
+    # Base strategy for Devise. Responsible for verifying correct scope and mapping.
     module Base
-
       # Validate strategy. By default will raise an error if no scope or an
       # invalid mapping is found.
       def valid?
@@ -13,7 +11,7 @@ module Devise
       # Checks if a valid scope was given for devise and find mapping based on
       # this scope.
       def mapping
-        @mapping ||= Devise.mappings[scope]
+        Devise.mappings[scope]
       end
 
       # Store this class type.