Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity

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

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index 7af978afb3f95e422d035b780f4e4519f7fb8021..6048562988abff1aa552295eb10211389324051c 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,6 +1,16 @@
+# 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. Please see the COPYING file for
+# details.
+
 class Candidate < ActiveRecord::Base
   belongs_to :election
-  validates_uniqueness_of :name
+  has_one :picture
+  validates_presence_of :name
+
+  # validate uniqueness of a name *within a given election*
 
   def <=>(other)
     self.name <=> other.name 
@@ -10,25 +20,5 @@ class Candidate < ActiveRecord::Base
     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