Merge Justin

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

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 6259784bfbaf1bc847ad8e67b6fad04a2722cf45..13e616824c58c0a1f3b3610bf7e0322fd49604c6 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -10,12 +10,19 @@ class QuickVote < Election
   attr_accessor :borda_result
 
   def validate
   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
     end

-
+    

     if name =~ /[^A-Za-z0-9]/
     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
   
     end
   end
   


@@ -40,6 +47,7 @@ class QuickVote < Election
   end
 
   def create_candidates
   end
 
   def create_candidates

+    return unless errors.empty?

     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
       self.candidates << candidate
     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
       self.candidates << candidate


@@ -63,7 +71,6 @@ class QuickVote < Election
       preference_tally << voter.vote.rankings.sort.collect \
         { |ranking| ranking.candidate.id }
     end
       preference_tally << voter.vote.rankings.sort.collect \
         { |ranking| ranking.candidate.id }
     end

-

     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result
     @condorcet_result = PureCondorcetVote.new(preference_tally).result
     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result
     @condorcet_result = PureCondorcetVote.new(preference_tally).result


@@ -72,6 +79,17 @@ class QuickVote < Election
     #@runoff_result = InstantRunoffVote.new(preference_tally).result
     #@runoff_results = PluralityVote.new(preference_tally).result
 
     #@runoff_result = InstantRunoffVote.new(preference_tally).result
     #@runoff_results = PluralityVote.new(preference_tally).result
 

+  end
+
+  ### Convert a shortname or id into a QuickVote
+  def self.ident_to_quickvote(ident)
+    return nil unless ident
+    if ident.match(/^\d+$/)
+      quickvote = QuickVote.find(ident)
+    else
+      quickvote = QuickVote.find_all(["name = ?", ident])[0]
+    end

 
 

+    return quickvote

   end
 end
   end
 end