@@ -18,6 +18,7 @@ class User < Sequel::Model boolean :active, :default => true boolean :is_admin, :default => false boolean :can_send_messages, :default => true + boolean :tos, :default => false varchar :email_verification, :size => 255 boolean :email_verified @@ -35,7 +36,7 @@ class User < Sequel::Model validations.clear validates do uniqueness_of :login - format_of :login, :with => /\A[\w.]+\z/ + format_of :login, :with => /\A[\w. ]+\z/ length_of :login, :within => 3..255 confirmation_of :password @@ -76,12 +77,22 @@ class User < Sequel::Model end def self.prepare(hash) - user = new(hash) - user.email = hash['email'] - user.password = hash['password'] - user.password_confirmation = hash['password_confirmation'] + login, openid, email, password, password_confirmation = + hash.values_at(*%w[login openid email password password_confirmation]) + + user = new(:login => login, :email => email, :password => password, + :password_confirmation => password_confirmation) user.salt = Digest::SHA1.hexdigest("--#{Time.now.to_f}--#{user.login}--") user + +# clean_hash = hash. +# user = new(hash) +# #user = new +# user.email = hash['email'] +# user.password = hash['password'] +# user.password_confirmation = hash['password_confirmation'] +# user.salt = Digest::SHA1.hexdigest("--#{Time.now.to_f}--#{user.login}--") +# user end def self.authenticate(hash) model/user.rb db12e44d25c2b7f25d3c34896d7d498a3938c483 Kristan "Krispy" Uccello kuccello@gmail.com http://github.com/manveru/sociar/commit/574be38ecc7fc61aeed189ef167a5f30d487d599 574be38ecc7fc61aeed189ef167a5f30d487d599 2009-03-12T20:08:11-07:00 2009-03-12T19:41:20-07:00 -- Modified the user model to handle new hash filtering 4eb656c651d4359e87fb6c6d37cab8e1844a6ad6 Michael Fellinger m.fellinger@gmail.com