authpwn_rails 0.4.7 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.5.0

data/authpwn_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authpwn_rails}
-  s.version = "0.4.7"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-09-02}
+  s.date = %q{2010-09-05}
   s.description = %q{Works with Facebook.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = [

data/lib/authpwn_rails/session.rb

@@ -42,7 +42,7 @@ module ControllerInstanceMethods
   def current_user=(user)
     @current_user = user
     if user
-      session[:current_user_id] = user.id
+      session[:current_user_id] = user.to_param
     else
       session.delete :current_user_id
     end
@@ -50,8 +50,8 @@ module ControllerInstanceMethods
 
   def authenticate_using_session
     return true if current_user
-    user_id = session[:current_user_id]
-    user = user_id && User.find_by_id(user_id)
+    user_param = session[:current_user_id]
+    user = user_param && User.find_by_param(user_param)
     self.current_user = user if user
   end
   private :authenticate_using_session  
@@ -118,13 +118,13 @@ ActionController::Base.send :include, ControllerMixin
 class ActionController::TestCase
   # Sets the authenticated user in the test session.
   def set_session_current_user(user)
-    request.session[:current_user_id] = user ? user.id : nil
+    request.session[:current_user_id] = user ? user.to_param : nil
   end
   
   # The authenticated user in the test session.
   def session_current_user
-    return nil unless user_id = request.session[:current_user_id]
-    User.find user_id
+    return nil unless user_param = request.session[:current_user_id]
+    User.find_by_param user_param
   end
 end
 

data/lib/authpwn_rails/user_model.rb

@@ -45,6 +45,11 @@ end  # module AuthpwnRails::UserModel::ModelClassMethods
 
 # Included in the metaclass of models that call pwnauth_user_model.
 module ModelMetaclassMethods
+  # Queries by the values generated by to_param. 
+  def find_by_param(param)
+    self.where(:email => param).first
+  end
+  
   # The authenticated user or nil.
   def find_by_email_and_password(email, password)
     @user = where(:email => email).first
@@ -96,6 +101,11 @@ module ModelInstanceMethods
     self.password_salt = self.class.random_salt
     self.password_hash = self.class.hash_password new_password, password_salt
   end
+  
+  # Use e-mails instead of exposing ActiveRecord IDs.
+  def to_param
+    email
+  end  
 end  # module AuthpwnRails::UserModel::ModelInstanceMethods
 
 ActiveRecord::Base.send :include, ModelMixin

data/test/user_test.rb

@@ -63,6 +63,10 @@ class UserTest < ActiveSupport::TestCase
     assert !@user.valid?
   end
   
+  test 'to_param' do
+    assert_equal @user.email, @user.to_param
+  end
+  
   test 'password_matches?' do
     assert_equal true, @user.password_matches?('awesome')
     assert_equal false, @user.password_matches?('not awesome'), 'Bogus password'
@@ -70,6 +74,13 @@ class UserTest < ActiveSupport::TestCase
                  "Another user's password" 
   end
   
+  test 'find_by_param' do
+    assert_equal users(:john), User.find_by_param(users(:john).to_param)
+    assert_equal users(:jane), User.find_by_param(users(:jane).to_param)
+    assert_equal nil, User.find_by_param('bogus email')
+    assert_equal nil, User.find_by_param(nil)
+  end
+  
   test 'find_by_email_and_password' do
     assert_equal users(:john),
         User.find_by_email_and_password('john@gmail.com', 'password')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 7
-  version: 0.4.7
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency