simple_user_auth 0.0.8 → 0.0.9

data/lib/simple_user_auth.rb

@@ -27,6 +27,7 @@ module SimpleUserAuth
       klass.extend(ClassMethods)
       klass.class_eval do
         include ClassInstanceMethods
+        class_attribute :authenticator
         attr_accessor :password
         attr_accessor :current_password
         validate :change_password_validator
@@ -44,14 +45,14 @@ module SimpleUserAuth
       # Select the database field you want to find the user by with when you use the authenticate method
       # e.g. authenticate_by(:email)
       def authenticate_by(authenticator)
-        write_inheritable_attribute(:authenticator, authenticator)
+        self.authenticator = authenticator
       end
       
-      # Finds the user in the database by the authenticator and verifys them against the submitted password
+      # Finds the user in the database by the authenticator and verifys them against the submitted password, takes an optional :find_by to override authenticate_by
       # e.g. User.authenticate(params[:session][:email], params[:session][:password])
-      def authenticate(search, submitted_password)
-        authenticator = read_inheritable_attribute(:authenticator)
-        user = find(:first, :conditions => ["#{authenticator} = ?", search])
+      # e.g. User.authenticate(params[:session][:phone_number], params[:session][:password], :find_by => :phone)
+      def authenticate(search, submitted_password, args = {})
+        user = find(:first, :conditions => ["#{args[:find_by] || authenticator} = ?", search])
         return nil  if user.nil?
         return user if user.has_password?(submitted_password)
       end
@@ -112,6 +113,8 @@ module SimpleUserAuth
       klass.extend(ClassMethods)
       klass.class_eval do 
         include ClassInstanceMethods
+        class_attribute :user_model_for_sign_in
+        class_attribute :deny_access_callback
         helper_method :current_user, :signed_in?, :not_signed_in?, :current_user?
       end
     end
@@ -123,15 +126,15 @@ module SimpleUserAuth
       # e.g. can_sign_in :user, :deny => :my_deny_callback
       def can_sign_in(model, args = {})
         klass = Kernel.const_get(model.to_s.camelize)
-        write_inheritable_attribute(:user_model_for_sign_in, klass)
-        write_inheritable_attribute(:deny_access_callback, args[:deny])
+        self.user_model_for_sign_in = klass
+        self.deny_access_callback = args[:deny]
       end
       
     end
     
     module ClassInstanceMethods
       
-      # Signs in a user, if the second parameter is false (default) the cookie will last only the session.
+      # Signs in a user, if :remember_me is true, cookies will not expire.
       def sign_in(user, args = {})
         if args[:remember_me]
           cookies.permanent.signed[remember_token_name] = [user.id, user.salt]
@@ -171,21 +174,16 @@ module SimpleUserAuth
       private
       
       def failed_authentication
-        callback = self.class.read_inheritable_attribute(:deny_access_callback)
-        if callback && respond_to?(callback)
-          send(callback)
+        if self.class.deny_access_callback && respond_to?(self.class.deny_access_callback)
+          send(self.class.deny_access_callback)
         else
           render :text => 'Access Denied', :status => 403
         end
         return false
       end
       
-      def user_model
-        self.class.read_inheritable_attribute(:user_model_for_sign_in)
-      end
-      
       def remember_token_name
-        "#{user_model.name.downcase}_remember_token".to_sym
+        "#{self.class.user_model_for_sign_in.name.downcase}_remember_token".to_sym
       end
       
       def current_user=(user)
@@ -193,7 +191,7 @@ module SimpleUserAuth
       end
 
       def user_from_remember_token
-        user_model.authenticate_with_salt(*remember_token)
+        self.class.user_model_for_sign_in.authenticate_with_salt(*remember_token)
       end
 
       def remember_token

data/lib/simple_user_auth/version.rb

@@ -1,3 +1,3 @@
 module SimpleUserAuth
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/model_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class ModelTest < ActiveSupport::TestCase
   
   def setup
-   @user = User.create(:email => "info@zenstack.com", :password => "password", :password_confirmation => "password")
+   @user = User.create(:email => "info@zenstack.com", :password => "password", :password_confirmation => "password", :other_search => "foo")
   end
   
   def teardown
@@ -31,6 +31,9 @@ class ModelTest < ActiveSupport::TestCase
   test "authenticate" do
     assert_equal(User.authenticate(@user.email, "password"), @user)
     assert !User.authenticate("info@zenstack.com", "badpassword")
+    assert !User.authenticate("badsearch", "password", :find_by => :other_search)
+    assert_equal(User.authenticate("foo", "password", :find_by => :other_search), @user)
+    assert !User.authenticate("foo", "badpassword", :find_by => :other_search)
   end
   
   test "authenticate_with_salt" do

data/test/test_helper.rb

@@ -5,6 +5,17 @@ require 'test/unit'
 require 'rails/test_help'
 require 'dummy/config/environment.rb'
 
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+ActiveRecord::Schema.define do
+
+  create_table "users", :force => true do |t|
+    t.string   "email"
+    t.string   "other_search"
+    t.string   "encrypted_password"
+    t.string   "salt"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end
 
 

metadata

@@ -2,7 +2,7 @@
 name: simple_user_auth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Erich Menge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-06-04 00:00:00 Z
 dependencies: []
 
 description: A simple no frills user authentication gem for my Rails projects.
@@ -43,8 +43,6 @@ files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/routes.rb
-- test/dummy/db/migrate/20110506183728_create_users.rb
-- test/dummy/db/schema.rb
 - test/model_test.rb
 - test/test_helper.rb
 homepage: ""
@@ -88,7 +86,5 @@ test_files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/routes.rb
-- test/dummy/db/migrate/20110506183728_create_users.rb
-- test/dummy/db/schema.rb
 - test/model_test.rb
 - test/test_helper.rb

data/test/dummy/db/migrate/20110506183728_create_users.rb

@@ -1,14 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
-      t.string :email
-      t.string :encrypted_password
-      t.string :salt
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :users
-  end
-end

data/test/dummy/db/schema.rb

@@ -1,23 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20110506183728) do
-
-  create_table "users", :force => true do |t|
-    t.string   "email"
-    t.string   "encrypted_password"
-    t.string   "salt"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end