From a80f81af055f02bf4625c90470aa90441cf6fc24 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Mon, 11 Dec 2017 13:28:05 -0500 Subject: Invoke mogrify once when transforming an image Execute a single mogrify command with multiple options rather than one command per option. Permit the use of all mogrify options, not just the ones that fall through to MiniMagick::Image#method_missing. --- activestorage/app/models/active_storage/variation.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'activestorage/app') diff --git a/activestorage/app/models/active_storage/variation.rb b/activestorage/app/models/active_storage/variation.rb index 13bad87cac..6a8825f1a8 100644 --- a/activestorage/app/models/active_storage/variation.rb +++ b/activestorage/app/models/active_storage/variation.rb @@ -44,13 +44,15 @@ class ActiveStorage::Variation end # Accepts an open MiniMagick image instance, like what's returned by MiniMagick::Image.read(io), - # and performs the +transformations+ against it. The transformed image instance is then returned. + # and performs the +transformations+ against it. def transform(image) - transformations.each do |(method, argument)| - if eligible_argument?(argument) - image.public_send(method, argument) - else - image.public_send(method) + image.mogrify do |command| + transformations.each do |method, argument| + if eligible_argument?(argument) + command.public_send(method, argument) + else + command.public_send(method) + end end end end -- cgit v1.2.3