Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity

[selectricity-live] / app / models / full_voter.rb

diff --git a/app/models/full_voter.rb b/app/models/full_voter.rb
index 04071a0f398555adaf1bd10b4b0a6cf25ecc243b..68b3d077afa11ddbee911d42e529835856c92ed4 100644 (file)
--- a/app/models/full_voter.rb
+++ b/app/models/full_voter.rb
@@ -1,12 +1,31 @@
+# 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.
+

 class FullVoter < Voter
 class FullVoter < Voter

-  before_create :create_password

   validates_presence_of :email, :password
 
   validates_presence_of :email, :password
 

+  def initialize(params={})
+    super
+    create_password
+  end
+  

   def create_password
     token_generator = UniqueTokenGenerator.new( 16 )
     until password and not password.empty? \
   def create_password
     token_generator = UniqueTokenGenerator.new( 16 )
     until password and not password.empty? \

-          and Voter.find_all( [ "password = ?", password ]).empty?
+          and Voter.find(:all, :conditions => [ "password = ?", password ]).empty?

       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