Big commit includes:

[selectricity] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index fba31a8e9678f9e5953c3226486b70d9a949ebfa..bd390519331e5e2d62c82d69223e9f5397daf664 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -1,48 +1,95 @@
 class QuickVote < Election
 class QuickVote < Election

+  before_validation :build_candidate_names

   after_validation :create_candidates
   validates_uniqueness_of :name
   after_validation :create_candidates
   validates_uniqueness_of :name

-  attr_accessor :raw_candidates
-  attr_accessor :reviewed
-
-  def validate
-    if @raw_candidates.length < 2
-      errors.add("You must list at least two candidates.")
-    end
+  validates_presence_of :name

 
 

-    if name =~ /[^A-Za-z0-9]/
-      errors.add("The name must only include numbers and letters.")
-    end
-  end
+  attr_accessor :candidate_names
+  attr_accessor :reviewed

   
   def initialize(params={})
     super
   
   def initialize(params={})
     super

-    self.enddate =  DateTime.now + 30
+    self.startdate = Time.now

     self.active = 1
     self.active = 1

-    self.anonymous = 1
-    self.quickvote = 1
+    self.anonymous = 1 unless self.anonymous
+    self.enddate = read_attribute( :enddate ) || \
+                   Time.now + 30.days - 1.second

   end
   end

+  
+  def validate
+    if @candidate_names.length < 2
+      errors.add(nil, "You must list at least two candidates.")
+    end

 
 

-  def candidatelist=(candstring='')
-    @raw_candidates = candstring.split(';').collect {|cand| cand.strip }
-  end
+    @candidate_names.each do |c|
+      unless c.instance_of? String
+        errors.add(nil, "Candidates must be strings")
+        next
+      end
+      c.strip!
+      if c.length == 0
+        errors.add(nil, "Candidate name must not be empty")
+        next
+      end
+    end if @candidate_names
+ 
+    if @candidate_names and @candidate_names.uniq!
+      errors.add(nil, "Candidates must all be unique")
+    end

 
 

-  def candidatelist
-    @raw_candidates.join("; ")
+    if name =~ /[^A-Za-z0-9]/
+      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
+
+    if enddate < startdate
+      errors.add(nil, "QuickVotes can't end before they start")
+    end

   end
 
   def name
   end
 
   def name

-    read_attribute( :name ).downcase()
+    read_attribute( :name ).downcase() if read_attribute( :name )

   end
 
   def reviewed?
     reviewed.to_i == 1
   end
 
   end
 
   def reviewed?
     reviewed.to_i == 1
   end
 

+  def build_candidate_names
+    @candidate_names ||= []
+    if @candidate_names.empty? and not candidates.empty?
+        @candidate_names = candidates.collect {|c| c.name}
+    end
+  end
+

   def create_candidates
   def create_candidates

-    @raw_candidates.each do |name|
+    return unless errors.empty?
+    
+    # delete the candidates
+    candidates.each {|c| c.destroy}
+
+    # create the new list based on the names
+    @candidate_names.each do |name|

       candidate = Candidate.new({:name => name})
       candidate = Candidate.new({:name => name})

-      candidate.save

       self.candidates << candidate
     end
   end
       self.candidates << candidate
     end
   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, :conditions => ["name = ?", ident])[0]
+    end
+
+    return quickvote
+  end

 end
 end