added numbering back to embeddables, should count correctly no matter how many candid...

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

diff --git a/app/models/raw_voter_list.rb b/app/models/raw_voter_list.rb
index 2f7cb28b1ae62f2ca6ec46c56d2fb8eecf07bbe5..aaf289e27ad6a5b5953c405a6e1479236fa02167 100644 (file)
--- a/app/models/raw_voter_list.rb
+++ b/app/models/raw_voter_list.rb
@@ -1,3 +1,21 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+

 class RawVoterList
 
   attr_accessor :email
 class RawVoterList
 
   attr_accessor :email


@@ -6,7 +24,7 @@ class RawVoterList
   include Enumerable
 
   def initialize(params={})
   include Enumerable
 
   def initialize(params={})

-    @email = params[:email] || 1
+    @email = params[:email].to_i || 1

     @input_addresses = params[:input_addresses] || String.new
   end
 
     @input_addresses = params[:input_addresses] || String.new
   end
 


@@ -16,7 +34,7 @@ class RawVoterList
   
   def each
     @input_addresses.split("\n").each do |address|
   
   def each
     @input_addresses.split("\n").each do |address|

-      yield Voter.new( { :email => address } ) 
+      yield FullVoter.new( { :email => address } ) 

     end
   end
 end
     end
   end
 end