Fixed all triggerable DeprecationWarnings. BE ON LOOKOUT FOR REGRESSIONS.

[selectricity] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index ce4a4fb5d3fe1dd142e4db139262c68c5bc6a069..fef4ef86125bd98f3c2f91ed58a0795262004792 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -1,6 +1,7 @@
 class QuickVote < Election
   after_validation :create_candidates
   validates_uniqueness_of :name
+  validates_presence_of :name
   attr_accessor :raw_candidates
   attr_accessor :reviewed
   attr_accessor :plurality_result
@@ -10,12 +11,19 @@ class QuickVote < Election
   attr_accessor :borda_result
 
   def validate
-    if @raw_candidates.length < 2
-      errors.add("You must list at least two candidates.")
+    if not @raw_candidates or @raw_candidates.length < 2
+        errors.add(nil, "You must list at least two candidates.")
     end
-
+    
     if name =~ /[^A-Za-z0-9]/
-      errors.add("The name must only include numbers and letters.")
+      errors.add(:name, "must only include numbers and letters.")
+    end
+    if name =~ /^[0-9]+$/
+      errors.add(:name, "must not be a number")
+    end
+    
+    if name =~ /^(create|index|confirm|change|results)$/
+      errors.add(:name, " is a reserved word.")
     end
   end
   
@@ -32,7 +40,7 @@ class QuickVote < Election
   end
 
   def name
-    read_attribute( :name ).downcase()
+    read_attribute( :name ).downcase() if read_attribute( :name )
   end
 
   def reviewed?
@@ -40,6 +48,7 @@ class QuickVote < Election
   end
 
   def create_candidates
+    return unless errors.empty?
     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
       self.candidates << candidate
@@ -79,7 +88,7 @@ class QuickVote < Election
     if ident.match(/^\d+$/)
       quickvote = QuickVote.find(ident)
     else
-      quickvote = QuickVote.find_all(["name = ?", ident])[0]
+      quickvote = QuickVote.find(:all, :conditions => ["name = ?", ident])[0]
     end
 
     return quickvote