X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/dc635b6d39be19a09a428282b6d639d029908df6..b6c33d42dd37f1fb10db479c5d6b7fb4c660beb9:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
old mode 100755
new mode 100644
index 64fd71c..1358840
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,23 +1,34 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+
 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_many :elections
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password
-
-  validates_presence_of     :login, :email
+  attr_accessor :current_user
+  
+  validates_presence_of     :email
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?
   validates_length_of       :password, :within => 4..40, :if => :password_required?
   validates_confirmation_of :password,                   :if => :password_required?
   validates_length_of       :login,    :within => 3..40
-  validates_length_of       :email,    :within => 3..100
   validates_uniqueness_of   :login, :email, :case_sensitive => false
   before_save :encrypt_password
 
   def name
      [ firstname, lastname].join(" ")
   end
+  
+  def email=(new_email)
+    self[:email] = new_email
+  end
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password)
@@ -67,4 +78,13 @@ class User < ActiveRecord::Base
     def password_required?
       crypted_password.blank? || !password.blank?
     end
+    def validate
+      # E-mail regex, moderate complexity
+      # Stolen from http://www.regular-expressions.info/email.html
+      errors.add(:email, "is not valid") unless email  =~
+                  /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
+      errors.add(:login, "should not begin or end with spaces") if login and login.strip!
+      errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
+    end
+    
 end