merged in from code from the other master

[selectricity] / app / models / candidate.rb

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
old mode 100755 (executable)
new mode 100644 (file)
index 430b6ab..6048562
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,5 +1,13 @@
+# 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
+  has_one :picture
   validates_presence_of :name
 
   # validate uniqueness of a name *within a given election*
@@ -12,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