Validate usernames and passwords for accounts more closely. E-mails too

diff --git a/app/models/full_voter.rb b/app/models/full_voter.rb
index 980fb5cf3c0fdeef0c043be9aeabe33233f6a874..b82667c3f926f6d82f61e3844010744cc2466fdf 100644 (file)
--- a/app/models/full_voter.rb
+++ b/app/models/full_voter.rb
@@ -9,4 +9,12 @@ class FullVoter < Voter
       self.password = token_generator.token
     end
   end
       self.password = token_generator.token
     end
   end

+  
+  protected
+  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
+  end

 end
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index 78266ad61d06d3d8586d9c9da5b0e6f1f42f0da6..eca592dee17ef7082a09e21b6db191d38c8341f3 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,13 +6,12 @@ class User < ActiveRecord::Base
   attr_accessor :password
   attr_accessor :current_user
   
   attr_accessor :password
   attr_accessor :current_user
   

-  validates_presence_of     :login, :email
+  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
 


@@ -68,4 +67,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.strip!
+      errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
+    end

 end
 end