fix typos and minor issues

[selectricity] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 698dac3f02af15ad516918de69600c4e0bfe0f48..de78813153025698796b8ce274f711072cf984e5 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -1,21 +1,24 @@
 class QuickVote < Election
+  before_validation :build_candidate_names
   after_validation :create_candidates
   validates_uniqueness_of :name
-  validates_presence_of :name
-  attr_accessor :raw_candidates
-  attr_accessor :reviewed
-  attr_accessor :plurality_result
-  attr_accessor :approval_result
-  attr_accessor :condorcet_result
-  attr_accessor :ssd_result
-  attr_accessor :borda_result
 
+  attr_accessor :candidate_names
+  attr_accessor :reviewed
+  
+  def initialize(params={})
+    super
+    self.startdate = Time.now
+    self.active = 1
+    self.anonymous = 1 unless self.anonymous
+  end
+  
   def validate
-    if not @raw_candidates or @raw_candidates.length < 2
+    if @candidate_names.length < 2
       errors.add(nil, "You must list at least two candidates.")
     end
-    
-    @raw_candidates.each do |c|
+
+    @candidate_names.each do |c|
       unless c.instance_of? String
         errors.add(nil, "Candidates must be strings")
         next
@@ -25,9 +28,11 @@ class QuickVote < Election
         errors.add(nil, "Candidate name must not be empty")
         next
       end
-    end if @raw_candidates
-
-    errors.add(nil, "Candidates must all be unique") if @raw_candidates and @raw_candidates.uniq!
+    end if @candidate_names
+ 
+    if @candidate_names and @candidate_names.uniq!
+      errors.add(nil, "Candidates must all be unique")
+    end
 
     if name =~ /[^A-Za-z0-9]/
       errors.add(:name, "must only include numbers and letters.")
@@ -39,18 +44,10 @@ class QuickVote < Election
     if name =~ /^(create|index|confirm|change|results)$/
       errors.add(:name, " is a reserved word.")
     end
-  end
-  
-  def initialize(params={})
-    super
-    self.startdate = Time.now
-    self.enddate =  Time.now + 30.days
-    self.active = 1
-    self.anonymous = 1
-  end
 
-  def candidatelist=(candlist)
-    @raw_candidates = candlist
+    if enddate < startdate
+      errors.add(nil, "QuickVotes can't end before they start")
+    end
   end
 
   def name
@@ -61,39 +58,24 @@ class QuickVote < Election
     reviewed.to_i == 1
   end
 
-  def create_candidates
-    return unless errors.empty?
-    @raw_candidates.each do |name|
-      candidate = Candidate.new({:name => name})
-      self.candidates << candidate
+  def build_candidate_names
+    @candidate_names ||= []
+    if @candidate_names.empty? and not candidates.empty?
+        @candidate_names = candidates.collect {|c| c.name}
     end
   end
 
-  #Calculate Election Results
-  def results
-    # initalize the tallies to empty arrays
-    preference_tally = Array.new
-    plurality_tally = Array.new
-    approval_tally = Array.new
-
-    self.voters.each do |voter|
-      # skip if the voter has not voted or has an unconfirmed vote
-      next unless voter.voted?
+  def create_candidates
+    return unless errors.empty?
+    
+    # delete the candidates
+    candidates.each {|c| c.destroy}
 
-      plurality_tally << voter.vote.rankings.sort[0].candidate.id
-      approval_tally << voter.vote.rankings.sort[0..1].collect \
-        { |ranking| ranking.candidate.id }
-      preference_tally << voter.vote.rankings.sort.collect \
-        { |ranking| ranking.candidate.id }
+    # create the new list based on the names
+    @candidate_names.each do |name|
+      candidate = Candidate.new({:name => name})
+      self.candidates << candidate
     end
-    @plurality_result = PluralityVote.new(plurality_tally).result
-    @approval_result = ApprovalVote.new(approval_tally).result
-    @condorcet_result = PureCondorcetVote.new(preference_tally).result
-    @ssd_result = CloneproofSSDVote.new(preference_tally).result
-    @borda_result = BordaVote.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