kenn-userify 0.1.6 → 0.1.7

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.1.6"
+  gem_spec.version     = "0.1.7"
   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/config/userify_routes.rb

@@ -3,6 +3,6 @@ ActionController::Routing::Routes.draw do |map|
   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/password/forgot', :controller => 'userify/user', :action => 'forgot'
-  map.reset 'user/password/reset/:token', :controller => 'userify/user', :action => 'reset'
+  map.forgot 'user/forgot', :controller => 'userify/user', :action => 'forgot'
+  map.reset 'user/reset/:token', :controller => 'userify/user', :action => 'reset'
 end

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

@@ -16,7 +16,7 @@ class UserifyCreateUsers < ActiveRecord::Migration
       t.string   :email,              :limit => 60, :null => false
       t.string   :fullname,           :limit => 60
       t.string   :encrypted_password, :limit => 40, :null => false
-      t.string   :salt,               :limit => 40, :null => false
+      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

data/lib/userify/user.rb

@@ -39,7 +39,7 @@ module Userify
       end
       
       def encrypt(string)
-        generate_hash("--#{salt}--#{string}--")
+        Digest::SHA1.hexdigest("--#{salt}--#{string}--")
       end
       
       def remember?
@@ -57,12 +57,12 @@ module Userify
       
       def confirm_email!
         self.email_confirmed  = true
-        self.token            = nil
+        clear_token
         save(false)
       end
       
       def forgot_password!
-        generate_token
+        generate_token 24.hours.from_now.utc
         save(false)
       end
       
@@ -74,10 +74,6 @@ module Userify
       
     protected
       
-      def generate_hash(string)
-        Digest::SHA1.hexdigest(string)
-      end
-      
       def generate_random_base62(n=27)
         UID.new(n).to_s
       end
@@ -88,7 +84,7 @@ module Userify
       end
       
       def initialize_salt
-        self.salt = generate_hash("--#{Time.now.utc.to_s}--#{password}--") if new_record?
+        self.salt = generate_random_base62 if new_record?
       end
       
       def encrypt_password
@@ -96,9 +92,9 @@ module Userify
         self.encrypted_password = encrypt(password)
       end
       
-      def generate_token
-        self.token = generate_random_base62
-        self.token_expires_at = nil
+      def generate_token(time=nil)
+        self.token            = generate_random_base62
+        self.token_expires_at = time
       end
       
       def clear_token
@@ -107,7 +103,7 @@ module Userify
       end
       
       def initialize_token
-        generate_token if new_record?
+        generate_token 24.hours.from_now.utc if new_record?
       end
       
       def password_required?
@@ -115,8 +111,8 @@ module Userify
       end
       
       def remember_me_until!(time)
+        self.token            = generate_random_base62
         self.token_expires_at = time
-        self.token = generate_random_base62
         save(false)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kenn-userify
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Kenn Ejima
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: []