fixed errors with election/class

[selectricity] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
old mode 100755 (executable)
new mode 100644 (file)
index 64fd71c..0b4b3b3
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,17 +1,35 @@
+# 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: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+

 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_many :elections
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password
 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_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
 
   validates_uniqueness_of   :login, :email, :case_sensitive => false
   before_save :encrypt_password
 


@@ -67,4 +85,12 @@ class User < ActiveRecord::Base
     def password_required?
       crypted_password.blank? || !password.blank?
     end
     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
 end