userify 0.2.1 → 0.2.2

data/Rakefile

@@ -35,7 +35,7 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "userify"
-  gem_spec.version     = "0.2.1"
+  gem_spec.version     = "0.2.2"
   gem_spec.summary     = "Super simple authentication system for Rails, using username, email and password."
   gem_spec.email       = "kenn.ejima <at> gmail.com"
   gem_spec.homepage    = "http://github.com/kenn/userify"

data/app/controllers/userify/user_controller.rb

@@ -43,10 +43,10 @@ class Userify::UserController < ApplicationController
         flash[:error] = "Bad email or password."
         redirect_to :back
       else
-        if @user.email_confirmed?
+        if @user.is_email_confirmed?
           if params[:signin] and params[:signin][:remember_me] == "1"
             @user.remember_me!
-            cookies[:remember_token] = { :value   => @user.token, :expires => @user.token_expires_at }
+            cookies[:remember_token] = { :value => @user.token, :expires => @user.token_expires_at }
           end
           sign_in(@user)
           flash[:notice] = "Signed in successfully."
@@ -61,7 +61,7 @@ class Userify::UserController < ApplicationController
   end
   
   def signout
-    current_user.forget_me! if current_user
+    current_user.clear_token! if current_user
     cookies.delete :remember_token
     reset_session
     flash[:notice] = "You have been signed out."
@@ -84,7 +84,7 @@ class Userify::UserController < ApplicationController
       
     when :post
       if user = ::User.find_by_email(params[:forgot][:email])
-        user.forgot_password!
+        user.set_token!(24.hours.from_now)
         ::UserifyMailer.deliver_reset_password user
         flash[:notice] = "You will receive an email within the next few minutes. " <<
                          "It contains instructions for changing your password."
@@ -105,7 +105,7 @@ class Userify::UserController < ApplicationController
       
     when :post
       if @user.update_password(params[:user][:password])
-        @user.confirm_email! unless @user.email_confirmed?
+        @user.confirm_email! unless @user.is_email_confirmed?
         sign_in(@user)
         flash[:notice] = "You have successfully reset your password."
         redirect_to url_after_reset
@@ -152,7 +152,7 @@ protected
   end
   
   def forbid_confirmed_user
-    raise ActionController::Forbidden, "confirmed user" if @user and @user.email_confirmed?
+    raise ActionController::Forbidden, "confirmed user" if @user and @user.is_email_confirmed?
   end
   
   def generate_error_messages_for(obj)

data/config/userify_routes.rb

@@ -1,8 +1,10 @@
 ActionController::Routing::Routes.draw do |map|
-  map.signup 'user/signup', :controller => 'userify/user', :action => 'signup'
-  map.signin 'user/signin', :controller => 'userify/user', :action => 'signin'
-  map.signout 'user/signout', :controller => 'userify/user', :action => 'signout'
-  map.activate 'user/activate/:token', :controller => 'userify/user', :action => 'activate'
-  map.forgot 'user/forgot', :controller => 'userify/user', :action => 'forgot'
-  map.reset 'user/reset/:token', :controller => 'userify/user', :action => 'reset'
+  map.with_options(:controller => 'userify/user') do |route|
+    route.signup 'signup', :action => 'signup'
+    route.signin 'signin', :action => 'signin'
+    route.signout 'signout', :action => 'signout'
+    route.activate 'user/activate/:token', :action => 'activate'
+    route.forgot 'user/forgot', :action => 'forgot'
+    route.reset 'user/reset/:token', :action => 'reset'
+  end
 end

data/generators/userify/templates/migrations/create_users.rb

@@ -19,7 +19,7 @@ class UserifyCreateUsers < ActiveRecord::Migration
       t.string   :salt,               :limit => 27, :null => false
       t.string   :token,              :limit => 27
       t.datetime :token_expires_at
-      t.boolean  :email_confirmed, :default => false, :null => false
+      t.boolean  :is_email_confirmed, :default => false, :null => false
       t.timestamps
     end
     

data/lib/userify/authentication.rb

@@ -18,7 +18,7 @@ module Userify
       end
       
       def signed_in?
-        ! current_user.nil?
+        !current_user.nil?
       end
       
     protected
@@ -30,7 +30,7 @@ module Userify
       def user_from_session
         if session[:user_id]
           return nil  unless user = ::User.find_by_id(session[:user_id])
-          return user if user.email_confirmed?
+          return user if user.is_email_confirmed?
         end
       end
       

data/lib/userify/user.rb

@@ -13,8 +13,6 @@ module Userify
         attr_accessible :username, :email, :password, :fullname
         attr_accessor :password
         
-        before_validation :normalize_email
-        
         validates_presence_of     :username
         validates_length_of       :username, :maximum => columns_hash['username'].limit
         validates_uniqueness_of   :username
@@ -25,7 +23,12 @@ module Userify
         validates_presence_of     :password, :if => :password_required?
         validates_length_of       :fullname, :maximum => columns_hash['fullname'].limit, :allow_nil => true
         
-        before_save :initialize_salt, :encrypt_password, :initialize_token
+        before_validation {|record| record.email.downcase! unless self.email.nil? }
+        before_save   {|record| record.encrypted_password = encrypt(password) unless password.blank? }
+        before_create {|record|
+          record.salt = UID.new(27).to_s
+          record.set_token 24.hours.from_now
+        }
       end
     end
     
@@ -43,27 +46,18 @@ module Userify
       end
       
       def remember?
-        token_expires_at and Time.now.utc < token_expires_at
+        is_email_confirmed? and token_expires_at and Time.now < token_expires_at
       end
       
       def remember_me!(duration=183)
-        remember_me_until! duration.days.from_now.utc
-      end
-      
-      def forget_me!
-        clear_token
-        save(false)
+        set_token duration.days.from_now unless remember?
+        save
       end
       
       def confirm_email!
-        self.email_confirmed  = true
+        self.is_email_confirmed  = true
         clear_token
-        save(false)
-      end
-      
-      def forgot_password!
-        generate_token 24.hours.from_now.utc
-        save(false)
+        save
       end
       
       def update_password(new_password)
@@ -72,29 +66,21 @@ module Userify
         save
       end
       
-    protected
-      
-      def generate_random_base62(n=27)
-        UID.new(n).to_s
-      end
-      
-      def normalize_email
-        self.email.downcase! unless self.email.nil?
-        return true
+      def set_token!(expires_at=nil)
+        set_token expires_at
+        save
       end
       
-      def initialize_salt
-        self.salt = generate_random_base62 if new_record?
+      def clear_token!
+        clear_token
+        save
       end
       
-      def encrypt_password
-        return if password.blank?
-        self.encrypted_password = encrypt(password)
-      end
+    protected
       
-      def generate_token(time=nil)
-        self.token            = generate_random_base62
-        self.token_expires_at = time
+      def set_token(expires_at=nil)
+        self.token            = UID.new(27).to_s
+        self.token_expires_at = expires_at
       end
       
       def clear_token
@@ -102,19 +88,9 @@ module Userify
         self.token_expires_at = nil
       end
       
-      def initialize_token
-        generate_token 24.hours.from_now.utc if new_record?
-      end
-      
       def password_required?
         encrypted_password.blank? or !password.blank?
       end
-      
-      def remember_me_until!(time)
-        self.token            = generate_random_base62
-        self.token_expires_at = time
-        save(false)
-      end
     end
     
     module ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: userify
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kenn Ejima
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: []