fixed some typos caught in the first usage

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index d76c13f633cd7ddb7b48ca560deb60d54f266d4a..99d64f93cc55424b34f82dac24d0dce9a1e4fc73 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -5,27 +5,33 @@ class Election < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :name, :description
   
+  #validate that method is one of the listed election types
+  
   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result
   attr_reader :ssd_result
   attr_reader :borda_result
-
+  
   require 'date'
-
-  def startdate
-    read_attribute( :startdate ) || Time.now
-  end
   
-  def enddate
-    date = read_attribute( :enddate ) || Time.now + 14
-    date - 1.second
+  def initialize(params={})
+    super
+    self.enddate = read_attribute( :enddate ) || \
+                   Time.now + 30.days - 1.second
   end
 
-  def enddate=(date)
-    date += 1.day
-    date = Time.gm(*date)
-    super(date)
+  def other_methods
+    if election_method
+      @other_methods = ELECTION_TYPES.keys.reject {|i| i == election_method}
+    else
+      @other_methods = nil
+    end
+    @other_methods
+  end
+
+  def startdate
+    read_attribute( :startdate ) || Time.now
   end
 
   def votes
@@ -45,7 +51,6 @@ class Election < ActiveRecord::Base
 
   def start_blockers
     reasons = []
-    
     if self.candidates.length <= 1
       reasons << "You must have at least two candidates."
     end
@@ -83,8 +88,28 @@ class Election < ActiveRecord::Base
     longdesc.length > 0 ? longdesc : nil 
   end
   
-  #Calculate Election Results
+  #Calculate results if not in memcache
   def results
+    # Assignment is intentional
+    if Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+      @plurality_result = c['plurality']
+      @approval_result = c['approval']
+      @condorcet_result = c['condorcet']
+      @ssd_result = c['ssd']
+      @borda_result = c['borda']
+      return c
+    elsif Cache
+      # memcache is available, but missed.
+      results = self.results!
+      Cache.set("election_results:#{id}:#{self.votes.length}", results)
+      return results
+    else
+      return self.results!
+    end
+  end
+
+  #Always Calculate Election Results
+  def results!
     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new
@@ -100,15 +125,19 @@ class Election < ActiveRecord::Base
       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
     @ssd_result = CloneproofSSDVote.new(preference_tally).result
     @borda_result = BordaVote.new(preference_tally).result
-    #@runoff_result = InstantRunoffVote.new(preference_tally).result
     
-    nil # to stay consistent
-  end
+    { 'plurality' => @plurality_result,
+      'approval' => @approval_result,
+      'condorcet' => @condorcet_result,
+      'ssd' => @ssd_result,
+      'borda' => @borda_result }
+    end
   
   def names_by_id
     names = Hash.new
@@ -120,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
-  
 end