Skip to content

crop action #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdanzig wants to merge 1 commit into
base: master
Choose a base branch
from
Open

crop action #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/imageproxy/convert.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def initialize(options, settings={})
@settings = settings

if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format ||
options.quality || options.overlay))
options.quality || options.overlay || options.crop))
raise "Missing action or illegal parameter value"
end
end
Expand Down Expand Up @@ -41,6 +41,7 @@ def try_command_with_timeout cmd

def convert_options
convert_options = []
convert_options << "-crop #{crop_thumbnail_options(options.crop)}" if options.crop
convert_options << "-resize #{resize_thumbnail_options(options.resize)}" if options.resize
convert_options << "-thumbnail #{resize_thumbnail_options(options.thumbnail)}" if options.thumbnail
convert_options << "-flop" if options.flip == "horizontal"
Expand All @@ -52,6 +53,10 @@ def convert_options
convert_options.join " "
end

def crop_thumbnail_options(crop_settings)
crop_settings.gsub(" ", "+")
end

def resize_thumbnail_options(size)
case options.shape
when "cut"
Expand Down