Merge pull request #363 from tiegz/trickery_fix

ActiveRecordTrickery fix

lib/authlogic/session/active_record_trickery.rb

@@ -51,7 +51,19 @@ module InstanceMethods
         def new_record?
           new_session?
         end
+
+        def persisted?
+          !(new_record? || destroyed?)
+        end
+
+        def destroyed?
+          record.nil?
+        end
 
+        def to_key
+          new_record? ? nil : record.to_key
+        end
+
         # For rails >= 3.0
         def to_model
           self

lib/authlogic/session/foundation.rb

@@ -58,15 +58,7 @@ def credentials=(values)
         def inspect
           "#<#{self.class.name}: #{credentials.blank? ? "no credentials provided" : credentials.inspect}>"
         end
-
-        def persisted?
-          !(new_record? || destroyed?)
-        end
-
-        def to_key
-          new_record? ? nil : [ self.send(self.class.primary_key) ]
-        end
-
+
         private
           def build_key(last_part)
             last_part

test/session_test/active_record_trickery_test.rb

@@ -28,7 +28,36 @@ def test_new_record
         session = UserSession.new
         assert session.new_record?
       end
+
+      def test_to_key
+        ben = users(:ben)
+        session = UserSession.new(ben)
+        assert_nil session.to_key
+
+        session.save
+        assert_not_nil session.to_key
+        assert_equal ben.to_key, session.to_key
+      end
+
+      def test_persisted
+        session = UserSession.new(users(:ben))
+        assert ! session.persisted?
+
+        session.save
+        assert session.persisted?
+
+        session.destroy
+        assert ! session.persisted?
+      end
 
+      def test_destroyed?
+        session = UserSession.create(users(:ben))
+        assert ! session.destroyed?
+
+        session.destroy
+        assert session.destroyed?
+      end
+
       def test_to_model
         session = UserSession.new
         assert_equal session, session.to_model