[Analyzer] Do not load image analyzer gem if already loaded

igorkasyanchuk · Dec 8, 2024 · 44a6c6f · 44a6c6f
1 parent 96033ed
commit 44a6c6f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb b/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb
@@ -10,7 +10,7 @@ class Analyzer::ImageAnalyzer::ImageMagick < Analyzer::ImageAnalyzer
 
     def read_image
       begin
-        require "mini_magick"
+        require "mini_magick" unless Object.const_defined?(:MiniMagick)
       rescue LoadError
         logger.info "Skipping image analysis because the mini_magick gem isn't installed"
         return {}

diff --git a/lib/active_storage_validations/analyzer/image_analyzer/vips.rb b/lib/active_storage_validations/analyzer/image_analyzer/vips.rb
@@ -9,7 +9,7 @@ class Analyzer::ImageAnalyzer::Vips < Analyzer::ImageAnalyzer
 
     def read_image
       begin
-        require "ruby-vips"
+        require "ruby-vips" unless Object.const_defined?(:Vips)
       rescue LoadError
         logger.info "Skipping image analysis because the ruby-vips gem isn't installed"
         return {}

diff --git a/test/analyzers/image_analyzers/image_magick_test.rb b/test/analyzers/image_analyzers/image_magick_test.rb
@@ -4,6 +4,8 @@
 require 'analyzers/support/analyzer_helpers'
 require 'analyzers/image_analyzers/shared_examples/returns_the_right_metadata_for_any_attachable'
 
+return unless Object.const_defined?(:MiniMagick)
+
 describe ActiveStorageValidations::Analyzer::ImageAnalyzer::ImageMagick do
   include AnalyzerHelpers
 

diff --git a/test/analyzers/image_analyzers/vips_test.rb b/test/analyzers/image_analyzers/vips_test.rb
@@ -4,6 +4,8 @@
 require 'analyzers/support/analyzer_helpers'
 require 'analyzers/image_analyzers/shared_examples/returns_the_right_metadata_for_any_attachable'
 
+return unless Object.const_defined?(:Vips)
+
 describe ActiveStorageValidations::Analyzer::ImageAnalyzer::Vips do
   include AnalyzerHelpers