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

cat-town
Dan Buch 13 years ago
parent 58568a570b
commit a25c05ecf6

@ -1,10 +1,32 @@
require 'sha1'
class User < ActiveRecord::Base
attr_accessor :password
attr_protected :hashed_password
validates_uniqueness_of :username
validates_confirmation_of :password, :on => :create
validates_length_of :password, :within => 5..40
validates_confirmation_of :password, :if => lambda { |user|
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)
find_by_username_and_password(user_info[:username],
user_info[:password])
user = find_by_username(user_info[:username])
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

Loading…
Cancel
Save