Skip to content

splat the hash for ruby 3 #14

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

splat the hash for ruby 3 #14

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
6 changes: 3 additions & 3 deletions lib/paperclip-vips/paperclip/vips.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def make
destination = TempfileFactory.new.generate(filename)

begin
thumbnail = ::Vips::Image.thumbnail(source.path, width, { height: crop ? height : nil, crop: crop }) if @target_geometry
thumbnail = ::Vips::Image.thumbnail(source.path, width, **{ height: crop ? height : nil, crop: crop }) if @target_geometry
thumbnail = ::Vips::Image.new_from_file(source.path) if !defined?(thumbnail) || thumbnail.nil?
thumbnail = process_convert_options(thumbnail)
save_thumbnail(thumbnail, destination.path)

rescue => e
if @whiny
message = "There was an error processing the thumbnail for #{@basename}:\n" + e.message
Expand Down Expand Up @@ -68,7 +68,7 @@ def width
def height
@target_geometry&.height || @current_geometry.height
end

def process_convert_options(image)
if image
commands = parsed_convert_commands(@convert_options)
Expand Down