sixarm_ruby_current_user 1.3.2 → 1.3.6

data/CHANGELOG.txt

@@ -1,4 +1,5 @@
 CHANGELOG
 
-2011-04-19 Add self and more tests
-2011-04-18 Update for Ruby 1.9.2 and Rails 3.0.5
+2011-04-25 1.3.6 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/lib/sixarm_ruby_current_user.rb

@@ -10,13 +10,17 @@ module CurrentUser
  include CurrentUserId
 
 
-  # Get the current user:
-  #  - if it is already set, then return it without doing a lookup
-  #  - otherwise, call User.find with the current_user_id
+  # Get the current user.
+  # 
+  # This calls User.find with the current_user_id
   #
-  # Return the current user, or nil if not found
+  # The current user is memoized as @current_user.
+  # To reload, pass :reload => true
+  #
+  # Return the current user, or raise an exception if not found
   
-  def current_user
+  def current_user(ops={})
+    if ops[:reload] then @current_user=nil end
     @current_user ||= User.find(self.current_user_id)
   end
   

data/test/sixarm_ruby_current_user_test.rb

@@ -13,44 +13,41 @@ end
 
 class Testing < Test::Unit::TestCase
 
-  include CurrentUser
-
-  ANNE_ID=1
-  BETH_ID=2
-  CATE_ID=3
-  
-  ANNE = User.new(:id => ANNE_ID, :name => 'Anne')
-  BETH = User.new(:id => BETH_ID, :name => 'Beth')
-  CATE = User.new(:id => CATE_ID, :name => 'Cate')
-
+  # Mock session
   def session
-    @session||=Hash.new
+    @session||={}
   end
 
+  include CurrentUser
+
+  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(self.current_user, "current_user")
-    assert_nil(self.current_user_id, "current_user_id")
+    assert_nil(current_user, "current_user")
+    assert_nil(current_user_id, "current_user_id")
   end
 
   def test_current_user_question
-    assert_equal(false, self.current_user?, "current_user is set, so current_user? should return false")
+    assert_equal(false, current_user?, "current_user is set, so current_user? should return false")
     self.current_user=BETH
-    assert_equal(true, self.current_user?, "current_user is set, so current_user? should return true")
+    assert_equal(true, current_user?, "current_user is set, so current_user? should return true")
   end
 
   def test_current_user_equals
-    current_user=BETH
+    self.current_user=BETH
     actual=current_user
     assert_equal(BETH, actual, "beth, actual:#{actual}")
-    assert_not_equal(ANNE, actual, "anne, actual:#{actual}")
-    assert_not_equal(CATE, actual, "cate, actual:#{actual}")
   end
 
-  def test_current_user_clear
-    current_user=ANNE
-    assert_equal(ANNE, current_user, "current_user")
-    current_user=nil
-    assert_nil(current_user, "current_user")
+  def test_current_user_equals_then_reset
+    self.current_user=BETH
+    actual=current_user
+    assert_equal(BETH, actual, "beth, actual:#{actual}")
+    self.current_user=nil
+    actual=current_user
+    assert_equal(nil, actual, "current_user")
   end
 
 end

data.tar.gz.sig

@@ -1,3 +1,2 @@
-m��`�z�i����U��شA�YDwȪ
�v�6׭Jr�k�fuɳ�[�x��t���Aw>	ٲ��
-O���"�
-�l�՝^�$|ugi|�o���F�&lm�"�\��y�]��Ì�;t8�BE��
+?��߅�'�M��O(
+iR���(8ڻ�d.�@2�Z<u�I����~�ړ��6�cϜ�H�[r�����/m�{��0

metadata

@@ -2,7 +2,7 @@
 name: sixarm_ruby_current_user
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.6
 platform: ruby
 authors: 
 - SixArm
@@ -30,7 +30,7 @@ cert_chain:
   eabwpCbAopo=
   -----END CERTIFICATE-----
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-04-25 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.2
+        version: 1.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id002
 description: 

metadata.gz.sig

@@ -1 +1,2 @@
-#����%��!��LTF�
+|pH�.
+M��Ҵ��̄��e�*��8Z�:d�pzOd����$'%�YU���/%�44Gs�_�D� Q��s���2��2�nD�����a�#kT �9n���|Ҵ4�;5���Cvoñ��J"�/^�I��