vigetlabs-simplest_auth 0.1.2 → 0.1.3

data/lib/simplest_auth/controller.rb

@@ -38,15 +38,13 @@ module SimplestAuth
     end
 
     def current_user
-      if @current_user.nil?
-        begin
-          @current_user = user_class.find(current_user_id)
-        rescue user_class::RecordNotFound
-          clear_session
-          @current_user = nil
+      @current_user ||= begin
+        if user_class.respond_to?(:find)
+          user_class.find(current_user_id)
+        else
+          user_class.first(:id => current_user_id)
         end
-      end
-      @current_user
+      end || clear_session
     end
 
     def current_user=(user)

data/lib/simplest_auth/version.rb

@@ -3,7 +3,7 @@ module SimplestAuth
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/unit/simplest_auth/controller_test.rb

@@ -97,8 +97,8 @@ class ControllerTest < Test::Unit::TestCase
       assert_equal "user", current_user
     end
     
-    should "return nil for the current user if it doesn't exist" do
-      User.stubs(:find).with('1').raises(User::RecordNotFound)
+    should "clear session and return nil for the current user if it doesn't exist" do
+      User.stubs(:find).with('1').returns(nil)
       stubs(:current_user_id).with().returns('1')
       stubs(:clear_session)
 
@@ -110,12 +110,12 @@ class ControllerTest < Test::Unit::TestCase
       clear_session
     end
     
-    should "clear the :user_id from session if the user cannot be found" do
-      User.stubs(:find).with('1').raises(User::RecordNotFound)
+    should "find with first when class doesn't respond to find" do
+      User.expects(:respond_to?).with(:find).returns(false)
+      User.stubs(:first).with(:id => '1').returns("user")
       stubs(:current_user_id).with().returns('1')
-      expects(:clear_session).with()
 
-      current_user
+      assert_equal "user", current_user
     end
     
     should "allow assigning to the current user" do
@@ -139,6 +139,13 @@ class ControllerTest < Test::Unit::TestCase
     should "have a default login error message" do
       assert_equal "Login or Registration Required", login_message
     end
+
+    should "return the current_user, repeatedly" do
+      User.expects(:find).with(1).returns("user")
+      expects(:current_user_id).returns(1)
+
+      assert_equal "user", current_user
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vigetlabs-simplest_auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tony Pitale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-08 00:00:00 -07:00
+date: 2009-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency