diff --git a/app/models/image.rb b/app/models/image.rb index 5a78449..01df1e6 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -6,8 +6,8 @@ class Image < ActiveRecord::Base sanitize_filename - has_attachment :content_type => :image, - :storage => :file_system, + has_attachment :content_type => :image, + :storage => :file_system, :path_prefix => 'public/image_uploads', :resize_to => '800x600>', :thumbnails => { :big => '150x150', @@ -15,7 +15,8 @@ class Image < ActiveRecord::Base :portrait => '64x64', :minor => '50x50>', :icon => '20x20!' }, - :max_size => 5.megabytes # remember to update validate message below + :max_size => 5.megabytes, # remember to update validate message below + processor: 'Rmagick' validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n diff --git a/app/models/reported_image.rb b/app/models/reported_image.rb index fcbee3e..e0f978b 100644 --- a/app/models/reported_image.rb +++ b/app/models/reported_image.rb @@ -5,6 +5,7 @@ class ReportedImage < ActiveRecord::Base has_attachment :content_type => :image, :storage => :file_system, - :max_size => 5.megabytes + :max_size => 5.megabytes, + processor: 'Rmagick' end diff --git a/app/models/thumbnail.rb b/app/models/thumbnail.rb index 6123619..215c2e0 100644 --- a/app/models/thumbnail.rb +++ b/app/models/thumbnail.rb @@ -1,6 +1,6 @@ class Thumbnail < ActiveRecord::Base has_attachment :storage => :file_system, - :content_type => :image, :max_size => 5.megabytes + :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick' validates_as_attachment sanitize_filename diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index dcb0008..b888f0d 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -63,7 +63,8 @@ class UploadedFile < Article has_attachment :storage => :file_system, :thumbnails => { :icon => [24,24], :bigicon => [50,50], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' }, :thumbnail_class => Thumbnail, - :max_size => self.max_size + :max_size => self.max_size, + processor: 'Rmagick' validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of %{size}").sub('%{size}', self.max_size.to_humanreadable).fix_i18n diff --git a/config/initializers/attachment_fu.rb b/config/initializers/attachment_fu.rb new file mode 100644 index 0000000..91cf9b2 --- /dev/null +++ b/config/initializers/attachment_fu.rb @@ -0,0 +1,2 @@ +Technoweenie::AttachmentFu.mattr_writer :default_processors +Technoweenie::AttachmentFu.default_processors = %w(Rmagick ImageScience MiniMagick Gd2 CoreImage) -- libgit2 0.21.2