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

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

diff --git a/app/models/picture.rb b/app/models/picture.rb
index e7df084a114506eaac8876660952daad429db816..a14406cfeef29742fa89e7f71b4f6b07c8e0aef4 100644 (file)
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@ -1,20 +1,19 @@
+# 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 Picture < ActiveRecord::Base
   belongs_to :candidate
  
-  def set_from_field(field)
-    unless field.content_type.match(/^image/)
-      return false
-    end
-    self.filename = base_part_of(field.original_filename)
-    self.filetype =  field.content_type.chomp
-    self.data = field.read
-    self
-  end
+  has_attachment  :storage => :file_system, 
+                  :max_size => 1.megabytes,
+                  :thumbnails => { :thumb => '70x53' },
+                  :processor => :Rmagick
 
-  def base_part_of(filename)
-    name = File.basename(filename)
-    name.gsub(/[^\w._-]/, '')
-  end
+  validates_as_attachment
 
 end