merged more fixes from devel

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

diff --git a/app/models/picture.rb b/app/models/picture.rb
index e7df084a114506eaac8876660952daad429db816..9f17ec4c13b6a35491e1028fd9f9c5909d368d93 100644 (file)
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@ -1,20 +1,30 @@
+# 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: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+

 class Picture < ActiveRecord::Base
   belongs_to :candidate
  
 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
 
 
 end