sixarm_ruby_current_user 1.2.6 → 1.3.2

data/CHANGELOG.txt

@@ -0,0 +1,4 @@
+CHANGELOG
+
+2011-04-19 Add self and more tests
+2011-04-18 Update for Ruby 1.9.2 and Rails 3.0.5

data/README.rdoc

@@ -1,10 +1,8 @@
+= SixArm.com » Ruby » CurrentUser module with current_user methods
 
-= SixArm Ruby Gem: CurrentUser module with current_user methods
-
-Author:: Joel Parker Henderson, joelparkerhenderson@gmail.com
-Copyright:: Copyright (c) 2005-2010 Joel Parker Henderson
-License:: CreativeCommons License, Non-commercial Share Alike
-License:: LGPL, GNU Lesser General Public License
+Author:: Joel Parker Henderson, joel@joelparkerhenderson.com
+Copyright:: Copyright (c) 2005-2011 Joel Parker Henderson
+License:: See LICENSE.txt file
 
 Simple gem to get and set the current user,
 using the related gem for current_user_id.

data/VERSION

@@ -0,0 +1 @@
+1.3.2

data/lib/sixarm_ruby_current_user.rb

@@ -12,30 +12,28 @@ module CurrentUser
 
   # Get the current user:
   #  - if it is already set, then return it without doing a lookup
-  #  - otherwise, find the user via #current_user_find
+  #  - otherwise, call User.find with the current_user_id
   #
-  # If the current user is not set, and the current user id is nil,
-  # then this returns nil because current_user_find returns nil.
+  # Return the current user, or nil if not found
   
   def current_user
-    @current_user ||= current_user_find_by_id(current_user_id)
+    @current_user ||= User.find(self.current_user_id)
   end
   
 
-  # Set the current user and also set the current user id.
+  # Is there a current user in the Rails session?
   
-  def current_user=(user)
-    @current_user = user
-    return current_user_id = (user ? user.id : nil)
+  def current_user?
+    !!self.current_user 
   end
-  
 
-  # Return the current user by calling User.find with a user id.
-  # If the user id is nil, then return nil for the current user.
+
+  # Set the current user
+  # Return the current user
   
-  def current_user_find_by_id(id)
-    return id ? User.find(id) : nil
+  def current_user=(user)
+    self.current_user_id = (user ? user.id : nil)
+    @current_user = user
   end
-  
 
 end

data/test/sixarm_ruby_current_user_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'test/unit'
 require 'sixarm_ruby_current_user'
 require 'sixarm_ruby_current_user_id'
@@ -17,7 +18,7 @@ class Testing < Test::Unit::TestCase
   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')
@@ -27,8 +28,14 @@ class Testing < Test::Unit::TestCase
   end
 
   def test_blank_slate
-    assert_nil(current_user, "current_user")
-    assert_nil(current_user_id, "current_user_id")
+    assert_nil(self.current_user, "current_user")
+    assert_nil(self.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")
+    self.current_user=BETH
+    assert_equal(true, self.current_user?, "current_user is set, so current_user? should return true")
   end
 
   def test_current_user_equals

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��[�2������>8֡>H���.cPnVFZ���յSke�>�@ڶ�𥑙*���8�9�k�������ӭ�c˞.@
-_Eb/C�+r�b��e;�&N���Z�q�gV�_(	J�5��B�+n�7�
+m��`�z�i����U��شA�YDwȪ
�v�6׭Jr�k�fuɳ�[�x��t���Aw>	ٲ��
+O���"�
+�l�՝^�$|ugi|�o���F�&lm�"�\��y�]��Ì�;t8�BE��

metadata

@@ -2,7 +2,7 @@
 name: sixarm_ruby_current_user
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.6
+  version: 1.3.2
 platform: ruby
 authors: 
 - SixArm
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 1.3.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.3.2
   type: :runtime
   version_requirements: *id002
 description: 
@@ -65,10 +65,12 @@ extra_rdoc_files: []
 
 files: 
 - .gemtest
-- Rakefile
-- README.rdoc
+- CHANGELOG.txt
 - INSTALL.txt
 - LICENSE.txt
+- Rakefile
+- README.rdoc
+- VERSION
 - lib/sixarm_ruby_current_user.rb
 - test/sixarm_ruby_current_user_test.rb
 has_rdoc: true

metadata.gz.sig

@@ -1,2 +1 @@
-sRT�+�2(J[��=z����Y�
-���5Y��2 ��
.��$�U��-���n��>la�"�j-�8(��Г�|��e��m��|2wks�P;��由���ɀ
�)��Y�B�g��狆��c����
+#����%��!��LTF�