sixarm_ruby_current_user 1.3.6 → 1.4.0

data/CHANGELOG.txt

@@ -1,5 +1,5 @@
 CHANGELOG
 
-2011-04-25 1.3.6 Add memoize and :reload => true
+2011-04-25 1.4.0 Add memoize and :reload => true
 2011-04-19 1.3.4 Add self and more tests
 2011-04-18 1.3.2 Update for Ruby 1.9.2 and Rails 3.0.5

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/lib/sixarm_ruby_current_user.rb

@@ -7,9 +7,6 @@ require 'sixarm_ruby_current_user_id'
 
 module CurrentUser
 
- include CurrentUserId
-
-
   # Get the current user.
   # 
   # This calls User.find with the current_user_id
@@ -17,11 +14,13 @@ module CurrentUser
   # The current user is memoized as @current_user.
   # To reload, pass :reload => true
   #
-  # Return the current user, or raise an exception if not found
+  # Return the current user,
+  # or nil if the current user id is not set,
+  # or raise an exception if the current iser id is invalid
   
   def current_user(ops={})
     if ops[:reload] then @current_user=nil end
-    @current_user ||= User.find(self.current_user_id)
+    @current_user ||= (current_user_id ? User.find(current_user_id) : nil)
   end
   
 

data/test/sixarm_ruby_current_user_test.rb

@@ -6,11 +6,9 @@ require 'sixarm_ruby_active_record_mock'
 require 'simplecov'
 SimpleCov.start
 
-
 class User < ActiveRecordMock
 end
 
-
 class Testing < Test::Unit::TestCase
 
   # Mock session
@@ -19,16 +17,42 @@ class Testing < Test::Unit::TestCase
   end
 
   include CurrentUser
+  include CurrentUserId
 
   ANNE = User.new(:id => 1, :name => 'Anne')
   BETH = User.new(:id => 2, :name => 'Beth')
   CATE = User.new(:id => 3, :name => 'Cate')
 
+
   def test_blank_slate
     assert_nil(current_user, "current_user")
     assert_nil(current_user_id, "current_user_id")
   end
 
+  def test_return_nil_if_not_found
+    self.current_user_id=0
+    assert_equal(0, current_user_id, "current_user_id")
+    assert_nil(current_user, "current_user")
+  end
+
+  def test_current_user_memoize
+    self.current_user=BETH
+    self.current_user_id=CATE.id
+    assert_equal(BETH, current_user, "current_user is memoized, so current_user should be beth")
+  end
+
+  def test_current_user_id_reload_false
+    self.current_user=BETH
+    self.current_user_id=CATE.id
+    assert_equal(BETH, current_user(:reload=>false), "current_user reload => false, so current_user should be beth")
+  end
+
+  def test_current_user_id_reload_true
+    self.current_user=BETH
+    self.current_user_id=CATE.id
+    assert_equal(CATE, current_user(:reload=>true), "current_user reload => true, so current_user should be cate")
+  end
+
   def test_current_user_question
     assert_equal(false, current_user?, "current_user is set, so current_user? should return false")
     self.current_user=BETH

metadata

@@ -2,7 +2,7 @@
 name: sixarm_ruby_current_user
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors: 
 - SixArm
@@ -30,7 +30,7 @@ cert_chain:
   eabwpCbAopo=
   -----END CERTIFICATE-----
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.6
+        version: 1.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.2
+        version: 1.4.4
   type: :runtime
   version_requirements: *id002
 description: