active_storage_validations 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f77bdb678731cdb6bb3aca1bddf3a3b1d1d4f34355a778c504931d067f6d0e2
-  data.tar.gz: cb723cb17a4cbfcfec2e7a9b8432ac0d2641afbef327a92e38baa376d15ba2fd
+  metadata.gz: c9b366848f85ac520038a9efe0bee0514338f4d28b8f292ef87ad06d1ee0da28
+  data.tar.gz: 651195be6d5d23bf20c4600656e799005e3e1fc118ac21cc5fe023b24f43ae73
 SHA512:
-  metadata.gz: d44aed46b1f790d3df1913009fc1c84ea5831be3c8809063c94a0c50de3d8b9f40613eab920c49fb8f81dd0808d9c489aebb1705e022defe1e745d1205a48203
-  data.tar.gz: 3d770860efb253f13ea1f18086c5b8a51253caf69875ba1d9d7921c17b9c5ce43f8001f4d8eeb1e095f8f37d1f0924dbddcdb35ca24b721d6fd5cf2a002d9a90
+  metadata.gz: f6231454bce1c4b09bf4dba3a83238f09b3fa0593c0c04146342ac6dd035048f890edcb594d24747f9d5e55d5ef86a35eba7fa93b109f101906b0f5b4f373c06
+  data.tar.gz: 6a5a9a0abd3f7abbddd92d8f1e5601859bbcc06e17f049046e5c9e2744760aa4fd7fa77462c22fb8d076cc4aef801e9b814a6b8663edb08e9c32a497ec041908

data/README.md

@@ -375,6 +375,9 @@ You are welcome to contribute.
 - https://github.com/luiseugenio
 - https://github.com/equivalent
 - https://github.com/NARKOZ
+- https://github.com/stephensolis
+- https://github.com/kwent
+= https://github.com/Animesh-Ghosh
 
 ## License
 

data/lib/active_storage_validations/dimension_validator.rb

@@ -89,29 +89,32 @@ module ActiveStorageValidations
 
       # Validation based on checks :width and :height.
       else
+        width_or_height_invalid = false
         [:width, :height].each do |length|
           next unless options[length]
           if options[length].is_a?(Hash)
             if options[length][:in] && (file_metadata[length] < options[length][:min] || file_metadata[length] > options[length][:max])
               add_error(record, attribute, options[:message].presence || :"dimension_#{length}_inclusion", min: options[length][:min], max: options[length][:max])
-              return false
+              width_or_height_invalid = true
             else
               if options[length][:min] && file_metadata[length] < options[length][:min]
                 add_error(record, attribute, options[:message].presence || :"dimension_#{length}_greater_than_or_equal_to", length: options[length][:min])
-                return false
+                width_or_height_invalid = true
               end
               if options[length][:max] && file_metadata[length] > options[length][:max]
                 add_error(record, attribute, options[:message].presence || :"dimension_#{length}_less_than_or_equal_to", length: options[length][:max])
-                return false
+                width_or_height_invalid = true
               end
             end
           else
             if file_metadata[length] != options[length]
               add_error(record, attribute, options[:message].presence || :"dimension_#{length}_equal_to", length: options[length])
-              return false
+              width_or_height_invalid = true
             end
           end
         end
+
+        return false if width_or_height_invalid
       end
 
       true # valid file

data/lib/active_storage_validations/metadata.rb

@@ -10,6 +10,14 @@ module ActiveStorageValidations
     def image_processor
       Rails.application.config.active_storage.variant_processor
     end
+    
+    def exception_class
+      if image_processor == :vips && defined?(Vips)
+        Vips::Error
+      elsif defined?(MiniMagick)
+        MiniMagick::Error
+      end
+    end
 
     def require_image_processor
       if image_processor == :vips
@@ -55,15 +63,15 @@ module ActiveStorageValidations
         tempfile.flush
         tempfile.rewind
 
-        image = if image_processor == :vips && Vips::get_suffixes.include?(File.extname(tempfile.path))
+        image = if image_processor == :vips && defined?(Vips) && Vips::get_suffixes.include?(File.extname(tempfile.path).downcase)
                   Vips::Image.new_from_file(tempfile.path)
-                else
+                elsif defined?(MiniMagick)
                   MiniMagick::Image.new(tempfile.path)
                 end
       else
-        image = if image_processor == :vips && Vips::get_suffixes.include?(File.extname(read_file_path))
+        image = if image_processor == :vips && defined?(Vips) && Vips::get_suffixes.include?(File.extname(read_file_path).downcase)
                   Vips::Image.new_from_file(read_file_path)
-                else
+                elsif defined?(MiniMagick)
                   MiniMagick::Image.new(read_file_path)
                 end
       end
@@ -77,30 +85,27 @@ module ActiveStorageValidations
     rescue LoadError, NameError
       logger.info "Skipping image analysis because the mini_magick or ruby-vips gem isn't installed"
       {}
-    rescue MiniMagick::Error => error
-      logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}"
-      {}
-    rescue Vips::Error => error
-      logger.error "Skipping image analysis due to a Vips error: #{error.message}"
+    rescue exception_class => error
+      logger.error "Skipping image analysis due to an #{exception_class.name.split('::').map(&:downcase).join(' ').capitalize} error: #{error.message}"
       {}
     ensure
       image = nil
     end
 
     def valid_image?(image)
-      image_processor == :vips ? image.avg : image.valid?
-    rescue Vips::Error
+      image_processor == :vips && image.is_a?(Vips::Image) ? image.avg : image.valid?
+    rescue exception_class
       false
     end
 
     def rotated_image?(image)
-      if image_processor == :vips
+      if image_processor == :vips && image.is_a?(Vips::Image)
         image.get('exif-ifd0-Orientation').include?('Right-top') ||
           image.get('exif-ifd0-Orientation').include?('Left-bottom')
       else
         %w[ RightTop LeftBottom ].include?(image["%[orientation]"])
       end
-    rescue Vips::Error # field "exif-ifd0-Orientation" not found
+    rescue exception_class # field "exif-ifd0-Orientation" not found
       false
     end
 

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob