X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c5fda1e5174238779afd496014379d6446d1e3c1..fd484b33a3920e0031007c5c2f1dec61913cbab5:/app/models/voter.rb

diff --git a/app/models/voter.rb b/app/models/voter.rb
index e9b3e9e..c4700cb 100644
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -2,11 +2,12 @@ class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote
 
-  def initialize(args)
-    super(args)
-    
+  before_create :create_password
+
+  def create_password
     token_generator = UniqueTokenGenerator.new( 16 )
-    until password and Voter.find_all( [ "password = ?", password ]).empty?
+    until password and not password.empty? \
+          and Voter.find_all( [ "password = ?", password ]).empty?
       self.password = token_generator.token
     end
   end