Merge head

[selectricity] / lib / rubyvote / election.rb

diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb
index efb8dd8aae1ce56abc9896853a32eaf5c0f562da..5a5824341a57c1f4c9f6aef7ec14ed41f40dc693 100644 (file)
--- a/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@ -45,7 +45,7 @@ class ElectionVote
           if self.verify_vote(vote)
             self.tally_vote(vote)
           else
-            raise InvalidVoteError.new ("Invalid vote object", vote)
+            raise InvalidVoteError.new("Invalid vote object", vote)
           end
         end
       else
@@ -152,7 +152,7 @@ class PluralityResult < ElectionResult
       b[1] <=> a[1]
     end.collect {|a| a[0]}
     
-    @points = self.election.votes
+    @points = @election.votes
     
     # winners are anyone who has the same number of votes as the
     # first person