modifying user model to match what is wanted in 15.9, plus trashing foray into using new-style db: tasks to do awesomeness (sigh)

This commit is contained in:
Dan Buch 2011-08-10 21:35:41 -04:00
parent 58568a570b
commit a25c05ecf6

View File

@ -1,10 +1,32 @@
require 'sha1'
class User < ActiveRecord::Base class User < ActiveRecord::Base
attr_accessor :password
attr_protected :hashed_password
validates_uniqueness_of :username validates_uniqueness_of :username
validates_confirmation_of :password, :on => :create validates_confirmation_of :password, :if => lambda { |user|
validates_length_of :password, :within => 5..40 user.new_record? or not user.password.blank? }
validates_length_of :password, :within => 5..40, :if => lambda { |user|
user.new_record? or not user.password.blank? }
def self.hashed(str)
SHA1.new(str).to_s
end
def self.authenticate(user_info) def self.authenticate(user_info)
find_by_username_and_password(user_info[:username], user = find_by_username(user_info[:username])
user_info[:password]) if user && user.hashed_password == hashed(user_info[:password])
return user
end
end
private
before_save :update_password
def update_password
if not password.blank?
self.hashed_password = self.class.hashed(password)
end
end end
end end