Merged from John.

[selectricity] / app / models / candidate.rb

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index a0e492e8c1f98a6848efc5215db07de5b62f4c7a..430b6ab22762223a728eaf6cc27bb3d51f7b8d2e 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,8 +1,36 @@
 class Candidate < ActiveRecord::Base
   belongs_to :election
 class Candidate < ActiveRecord::Base
   belongs_to :election

+  validates_presence_of :name
+
+  # validate uniqueness of a name *within a given election*

 
   def <=>(other)
 
   def <=>(other)

-   self.name <=> other.name 
+    self.name <=> other.name 
+  end
+  
+  def to_s
+    name
+  end
+
+  def picture=(picture_field)
+    if picture_field
+      unless picture_field.content_type.match(/^image/)
+        return false
+      end
+      self.picture_filename = base_part_of(picture_field.original_filename)
+      self.picture_type =  picture_field.content_type.chomp
+      self.picture_data = picture_field.read
+    end
+  end
+
+  def base_part_of(filename)
+    name = File.basename(filename)
+    name.gsub(/[^\w._-]/, '')
+  end
+
+  def picture?
+    !self.picture_filename.nil?

   end
 
 end
   end
 
 end

+