Commit 3b8ed8df by Jon Yurek

Added the 'paperclip_extended' stuff for supplying extra commands to ImageMagick

parent 715ff88a
...@@ -15,7 +15,7 @@ module Paperclip ...@@ -15,7 +15,7 @@ module Paperclip
} }
end end
attr_reader :name, :instance, :styles, :default_style attr_reader :name, :instance, :styles, :default_style, :convert_options
# Creates an Attachment object. +name+ is the name of the attachment, +instance+ is the # Creates an Attachment object. +name+ is the name of the attachment, +instance+ is the
# ActiveRecord object instance it's attached to, and +options+ is the same as the hash # ActiveRecord object instance it's attached to, and +options+ is the same as the hash
...@@ -34,6 +34,7 @@ module Paperclip ...@@ -34,6 +34,7 @@ module Paperclip
@default_style = options[:default_style] @default_style = options[:default_style]
@storage = options[:storage] @storage = options[:storage]
@whiny_thumbnails = options[:whiny_thumbnails] @whiny_thumbnails = options[:whiny_thumbnails]
@convert_options = options[:convert_options]
@options = options @options = options
@queued_for_delete = [] @queued_for_delete = []
@queued_for_write = {} @queued_for_write = {}
...@@ -247,6 +248,7 @@ module Paperclip ...@@ -247,6 +248,7 @@ module Paperclip
@queued_for_write[name] = Thumbnail.make(@queued_for_write[:original], @queued_for_write[name] = Thumbnail.make(@queued_for_write[:original],
dimensions, dimensions,
format, format,
convert_options[name],
@whiny_thumnails) @whiny_thumnails)
rescue PaperclipError => e rescue PaperclipError => e
@errors << e.message if @whiny_thumbnails @errors << e.message if @whiny_thumbnails
......
...@@ -2,18 +2,19 @@ module Paperclip ...@@ -2,18 +2,19 @@ module Paperclip
# Handles thumbnailing images that are uploaded. # Handles thumbnailing images that are uploaded.
class Thumbnail class Thumbnail
attr_accessor :file, :current_geometry, :target_geometry, :format, :whiny_thumbnails attr_accessor :file, :current_geometry, :target_geometry, :format, :whiny_thumbnails, :convert_options
# Creates a Thumbnail object set to work on the +file+ given. It # Creates a Thumbnail object set to work on the +file+ given. It
# will attempt to transform the image into one defined by +target_geometry+ # will attempt to transform the image into one defined by +target_geometry+
# which is a "WxH"-style string. +format+ will be inferred from the +file+ # which is a "WxH"-style string. +format+ will be inferred from the +file+
# unless specified. Thumbnail creation will raise no errors unless # unless specified. Thumbnail creation will raise no errors unless
# +whiny_thumbnails+ is true (which it is, by default. # +whiny_thumbnails+ is true (which it is, by default.
def initialize file, target_geometry, format = nil, whiny_thumbnails = true def initialize file, target_geometry, format = nil, convert_options = nil, whiny_thumbnails = true
@file = file @file = file
@crop = target_geometry[-1,1] == '#' @crop = target_geometry[-1,1] == '#'
@target_geometry = Geometry.parse target_geometry @target_geometry = Geometry.parse target_geometry
@current_geometry = Geometry.from_file file @current_geometry = Geometry.from_file file
@convert_options = convert_options
@whiny_thumbnails = whiny_thumbnails @whiny_thumbnails = whiny_thumbnails
@current_format = File.extname(@file.path) @current_format = File.extname(@file.path)
...@@ -24,8 +25,8 @@ module Paperclip ...@@ -24,8 +25,8 @@ module Paperclip
# Creates a thumbnail, as specified in +initialize+, +make+s it, and returns the # Creates a thumbnail, as specified in +initialize+, +make+s it, and returns the
# resulting Tempfile. # resulting Tempfile.
def self.make file, dimensions, format = nil, whiny_thumbnails = true def self.make file, dimensions, format = nil, convert_options = nil, whiny_thumbnails = true
new(file, dimensions, format, whiny_thumbnails).make new(file, dimensions, format, convert_options, whiny_thumbnails).make
end end
# Returns true if the +target_geometry+ is meant to crop. # Returns true if the +target_geometry+ is meant to crop.
...@@ -61,6 +62,7 @@ module Paperclip ...@@ -61,6 +62,7 @@ module Paperclip
scale, crop = @current_geometry.transformation_to(@target_geometry, crop?) scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
trans = "-scale \"#{scale}\"" trans = "-scale \"#{scale}\""
trans << " -crop \"#{crop}\" +repage" if crop trans << " -crop \"#{crop}\" +repage" if crop
trans << " #{convert_options}" if convert_options
trans trans
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment