From ac26aef11f1be08917f3190b3d2b7ba4434444f7 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sun, 23 Jul 2017 17:06:45 -0400 Subject: Require mini_magick when it's used --- app/models/active_storage/variant.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/active_storage') diff --git a/app/models/active_storage/variant.rb b/app/models/active_storage/variant.rb index 435033f980..c12c29c453 100644 --- a/app/models/active_storage/variant.rb +++ b/app/models/active_storage/variant.rb @@ -1,5 +1,4 @@ require "active_storage/blob" -require "mini_magick" # Image blobs can have variants that are the result of a set of transformations applied to the original. class ActiveStorage::Variant @@ -30,6 +29,7 @@ class ActiveStorage::Variant end def transform(io) + require "mini_magick" File.open MiniMagick::Image.read(io).tap { |image| variation.transform(image) }.path end end -- cgit v1.2.3 From 91d6c6e889d432da8ffc7e1102547cdea1d609be Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 23 Jul 2017 16:28:45 -0500 Subject: Return to same level of abstraction --- app/models/active_storage/variant.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/active_storage') diff --git a/app/models/active_storage/variant.rb b/app/models/active_storage/variant.rb index c12c29c453..8785625cc8 100644 --- a/app/models/active_storage/variant.rb +++ b/app/models/active_storage/variant.rb @@ -10,7 +10,7 @@ class ActiveStorage::Variant end def processed - process unless service.exist?(key) + process unless processed? self end @@ -24,6 +24,10 @@ class ActiveStorage::Variant private + def processed? + service.exist?(key) + end + def process service.upload key, transform(service.download(blob.key)) end -- cgit v1.2.3