active_storage_validations 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe705d1a3b76d875ddc0a61d7d3caa439ddad3ba4a8b5be3c203f8d8cdd00ca
-  data.tar.gz: 826dbac96af4e1ed424ad16670aea3e428296ab07ae9bfdad29e4c0b453d114d
+  metadata.gz: 12a58907c84f972cb00aab13b6a60d26afda0383cbe88e13ec12b1c9d178ba36
+  data.tar.gz: 4df97d0b9e88054403ff7a39c89b00c4b3f9a0c3de7a38997f4f3a6193d803af
 SHA512:
-  metadata.gz: 4ccb7a673c9c5a7d6508e49c6b4b92b50b08faa9395a6e6c7da3bef460a6b72b64900d2ce7e529c5f18224c5b96e23bf82e8142f5d6dc047c327216b117bff21
-  data.tar.gz: f29bcdf4a6142b99d1cabf53086b682925256afc433e106a52feca3e96f097203c5e27ed7419ea51fc9b4ee6a2c454b06b0cdbb56a1d3f890fa6f452b529be4f
+  metadata.gz: 80210f9dd1636fac2f2dd9ab15c0090990312fdcd1c34f2c0aa6157c9c4e27b1aed9a03c064e91b148014388eaec3ed4171dd57d4c059e4f2e9ee919610d098a
+  data.tar.gz: f23b85dbb613af03faa0637fd5e9dd626e8e975b87590a0b87aedeba296bcd24c0f79c16dc20059ddb8f41b892887098d0f7dc58d1b951eaae0094b5dd15ea2a

data/README.md

@@ -204,6 +204,7 @@ en:
       aspect_ratio_not_landscape: "must be a landscape image"
       aspect_ratio_is_not: "must have an aspect ratio of %{aspect_ratio}"
       image_not_processable: "is not a valid image"
+      aspect_ratio_invalid: "has invalid aspect ratio"
 ```
 
 In several cases, Active Storage Validations provides variables to help you customize messages:
@@ -437,7 +438,7 @@ Then you can use the matchers with the syntax specified in the RSpec section, ju
 
 To run tests in root folder of gem:
 
-* `BUNDLE_GEMFILE=gemfiles/rails_6_1_4.gemfile bundle exec rake test` to run for Rails 7.0
+* `BUNDLE_GEMFILE=gemfiles/rails_6_1_4.gemfile bundle exec rake test` to run for Rails 6.1
 * `BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rake test` to run for Rails 7.0
 * `BUNDLE_GEMFILE=gemfiles/rails_7_1.gemfile bundle exec rake test` to run for Rails 7.1
 * `BUNDLE_GEMFILE=gemfiles/rails_7_2.gemfile bundle exec rake test` to run for Rails 7.2
@@ -471,71 +472,8 @@ You are welcome to contribute.
 />](https://opensource-heroes.com/r/igorkasyanchuk/active_storage_validations)
 
 ## Contributors (BIG THANK YOU)
-- https://github.com/schweigert
-- https://github.com/tleneveu
-- https://github.com/reckerswartz
-- https://github.com/Uysim
-- https://github.com/D-system
-- https://github.com/ivanelrey
-- https://github.com/phlegx
-- https://github.com/rr-dev
-- https://github.com/dsmalko
-- https://github.com/danderozier
-- https://github.com/cseelus
-- https://github.com/vkinelev
-- https://github.com/reed
-- https://github.com/connorshea
-- https://github.com/Atul9
-- https://github.com/victorbueno
-- https://github.com/UICJohn
-- https://github.com/giovannibonetti
-- https://github.com/dlepage
-- https://github.com/StefSchenkelaars
-- https://github.com/willnet
-- https://github.com/mohanklein
-- https://github.com/High5Apps
-- https://github.com/mschnitzer
-- https://github.com/sinankeskin
-- https://github.com/alejandrodevs
-- https://github.com/molfar
-- https://github.com/connorshea
-- https://github.com/yshmarov
-- https://github.com/fongfan999
-- https://github.com/cooperka
-- https://github.com/dolarsrg
-- https://github.com/jayshepherd
-- https://github.com/ohbarye
-- https://github.com/randsina
-- https://github.com/vietqhoang
-- https://github.com/kemenaran
-- https://github.com/jrmhaig
-- https://github.com/evedovelli
-- https://github.com/JuanVqz
-- 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
-- https://github.com/gr8bit
-- https://github.com/codegeek319
-- https://github.com/clwy-cn
-- https://github.com/kukicola
-- https://github.com/sobrinho
-- https://github.com/iainbeeston
-- https://github.com/marckohlbrugge
-- https://github.com/Mth0158
-- https://github.com/technicalpickles
-- https://github.com/ricsdeol
-- https://github.com/Fonsan
-- https://github.com/tagliala
-- https://github.com/ocarreterom
-- https://github.com/aditya-cherukuri
-- https://github.com/searls
-- https://github.com/yenshirak
-- https://github.com/wataori
-- https://github.com/Scorpahr
 
+https://github.com/igorkasyanchuk/active_storage_validations/graphs/contributors
 
 ## License
 

data/config/locales/da.yml

@@ -30,3 +30,4 @@ da:
       aspect_ratio_not_landscape: "skal være et landskabsbillede"
       aspect_ratio_is_not: "skal have et størrelsesforhold på %{aspect_ratio}"
       image_not_processable: "er ikke et gyldigt billede"
+      aspect_ratio_invalid: "har et ugyldigt billedformat"

data/config/locales/de.yml

@@ -30,3 +30,4 @@ de:
       aspect_ratio_not_landscape: "muss Querformat sein"
       aspect_ratio_is_not: "muss ein Bildseitenverhältnis von %{aspect_ratio} haben"
       image_not_processable: "ist kein gültiges Bild"
+      aspect_ratio_invalid: "hat ein ungültiges Seitenverhältnis"

data/config/locales/en.yml

@@ -30,3 +30,4 @@ en:
       aspect_ratio_not_landscape: "must be a landscape image"
       aspect_ratio_is_not: "must have an aspect ratio of %{aspect_ratio}"
       image_not_processable: "is not a valid image"
+      aspect_ratio_invalid: "has an invalid aspect ratio"

data/config/locales/es.yml

@@ -30,3 +30,4 @@ es:
       aspect_ratio_not_landscape: "debe ser una imagen apaisada"
       aspect_ratio_is_not: "debe tener una relación de aspecto de %{aspect_ratio}"
       image_not_processable: "no es una imagen válida"
+      aspect_ratio_invalid: "tiene una relación de aspecto no válida"

data/config/locales/fr.yml

@@ -30,3 +30,4 @@ fr:
       aspect_ratio_not_landscape: "doit être une image en format paysage"
       aspect_ratio_is_not: "doit avoir un rapport hauteur / largeur de %{aspect_ratio}"
       image_not_processable: "n'est pas une image valide"
+      aspect_ratio_invalid: "a un rapport hauteur / largeur invalide"

data/config/locales/it.yml

@@ -30,3 +30,4 @@ it:
       aspect_ratio_not_landscape: "l’orientamento dell’immagine deve essere orizzontale"
       aspect_ratio_is_not: "deve avere un rapporto altezza / larghezza di %{aspect_ratio}"
       image_not_processable: "non è un'immagine valida"
+      aspect_ratio_invalid: "ha proporzioni non valide"

data/config/locales/ja.yml

@@ -30,3 +30,4 @@ ja:
       aspect_ratio_not_landscape: "は横長にしてください"
       aspect_ratio_is_not: "のアスペクト比は %{aspect_ratio} にしてください"
       image_not_processable: "は不正な画像です"
+      aspect_ratio_invalid: "アスペクト比が無効です"

data/config/locales/nl.yml

@@ -30,3 +30,4 @@ nl:
       aspect_ratio_not_landscape: "moet een liggende afbeelding zijn"
       aspect_ratio_is_not: "moet een beeldverhouding hebben van %{aspect_ratio}"
       image_not_processable: "is geen geldige afbeelding"
+      aspect_ratio_invalid: "heeft een ongeldige beeldverhouding"

data/config/locales/pl.yml

@@ -30,3 +30,4 @@ pl:
       aspect_ratio_not_landscape: "musi mieć proporcje pejzażu"
       aspect_ratio_is_not: "musi mieć proporcje %{aspect_ratio}"
       image_not_processable: "nie jest prawidłowym obrazem"
+      aspect_ratio_invalid: "ma nieprawidłowy współczynnik proporcji"

data/config/locales/pt-BR.yml

@@ -30,3 +30,4 @@ pt-BR:
       aspect_ratio_not_landscape: "não está no formato paisagem"
       aspect_ratio_is_not: "não contém uma proporção de %{aspect_ratio}"
       image_not_processable: "não é uma imagem válida"
+      aspect_ratio_invalid: "tem uma proporção de aspecto inválida"

data/config/locales/ru.yml

@@ -30,3 +30,4 @@ ru:
       aspect_ratio_not_landscape: "должно быть пейзажное изображение"
       aspect_ratio_is_not: "должен иметь соотношение сторон %{aspect_ratio}"
       image_not_processable: "не является допустимым изображением"
+      aspect_ratio_invalid: "имеет недопустимое соотношение сторон"

data/config/locales/sv.yml

@@ -30,3 +30,4 @@ sv:
       aspect_ratio_not_landscape: "måste vara en landskapsorienterad bild"
       aspect_ratio_is_not: "måste ha en följande aspect ratio  %{aspect_ratio}"
       image_not_processable: "är inte en giltig bild"
+      aspect_ratio_invalid: "har ett ogiltigt bildförhållande"

data/config/locales/tr.yml

@@ -30,3 +30,4 @@ tr:
       aspect_ratio_not_landscape: "yatay bir imaj olmalı"
       aspect_ratio_is_not: "%{aspect_ratio} en boy oranına sahip olmalı"
       image_not_processable: "geçerli bir imaj değil"
+      aspect_ratio_invalid: "geçersiz bir en boy oranına sahip"

data/config/locales/uk.yml

@@ -30,3 +30,4 @@ uk:
       aspect_ratio_not_landscape: "мусить бути пейзажне зображення"
       aspect_ratio_is_not: "мусить мати співвідношення сторін %{aspect_ratio}"
       image_not_processable: "не є допустимим зображенням"
+      aspect_ratio_invalid: "має недійсне співвідношення сторін"

data/config/locales/vi.yml

@@ -30,3 +30,4 @@ vi:
       aspect_ratio_not_landscape: "phải là ảnh ngang"
       aspect_ratio_is_not: "phải có tỉ lệ ảnh %{aspect_ratio}"
       image_not_processable: "không phải là ảnh"
+      aspect_ratio_invalid: "có tỷ lệ khung hình không hợp lệ"

data/config/locales/zh-CN.yml

@@ -30,3 +30,4 @@ zh-CN:
       aspect_ratio_not_landscape: "必须是横屏图片"
       aspect_ratio_is_not: "纵横比必须是 %{aspect_ratio}"
       image_not_processable: "不是有效的图像"
+      aspect_ratio_invalid: "宽高比无效"

data/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb

@@ -9,13 +9,6 @@ module ActiveStorageValidations
     private
 
     def read_image
-      begin
-        require "mini_magick" unless defined?(MiniMagick)
-      rescue LoadError
-        logger.info "Skipping image analysis because the mini_magick gem isn't installed"
-        return {}
-      end
-
       Tempfile.create(binmode: true) do |tempfile|
         begin
           if image(tempfile).valid?
@@ -42,5 +35,13 @@ module ActiveStorageValidations
     def rotated_image?(image)
       %w[ RightTop LeftBottom TopRight BottomLeft ].include?(image["%[orientation]"])
     end
+
+    def supported?
+      require "mini_magick"
+      true
+    rescue LoadError
+      logger.info "Skipping image analysis because the mini_magick gem isn't installed"
+      false
+    end
   end
 end

data/lib/active_storage_validations/analyzer/image_analyzer/vips.rb

@@ -8,13 +8,6 @@ module ActiveStorageValidations
     private
 
     def read_image
-      begin
-        require "vips" unless defined?(::Vips)
-      rescue LoadError
-        logger.info "Skipping image analysis because the ruby-vips gem isn't installed"
-        return {}
-      end
-
       Tempfile.create(binmode: true) do |tempfile|
         begin
           if image(tempfile)
@@ -47,6 +40,14 @@ module ActiveStorageValidations
       end
     end
 
+    def supported?
+      require "vips"
+      true
+    rescue LoadError
+      logger.info "Skipping image analysis because the ruby-vips gem isn't installed"
+      false
+    end
+
     ROTATIONS = /Right-top|Left-bottom|Top-right|Bottom-left/
     def rotated_image?(image)
       ROTATIONS === image.get("exif-ifd0-Orientation")

data/lib/active_storage_validations/analyzer/image_analyzer.rb

@@ -12,7 +12,11 @@ module ActiveStorageValidations
   #   ActiveStorage::Analyzer::ImageAnalyzer::ImageMagick.new(attachable).metadata
   #   # => { width: 4104, height: 2736 }
   class Analyzer::ImageAnalyzer < Analyzer
+    @@supported_analyzers = {}
+
     def metadata
+      return {} unless analyzer_supported?
+
       read_image do |image|
         if rotated_image?(image)
           { width: image.height, height: image.width }
@@ -62,6 +66,14 @@ module ActiveStorageValidations
       image_from_path(tempfile.path)
     end
 
+    def analyzer_supported?
+      if @@supported_analyzers.key?(self)
+        @@supported_analyzers.fetch(self)
+      else
+        @@supported_analyzers[self] = supported?
+      end
+    end
+
     def read_image
       raise NotImplementedError
     end
@@ -73,5 +85,9 @@ module ActiveStorageValidations
     def rotated_image?(image)
       raise NotImplementedError
     end
+
+    def supported?
+      raise NotImplementedError
+    end
   end
 end

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -1,120 +1,150 @@
-# frozen_string_literal: true
-
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_analyzable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_errorable'
-require_relative 'shared/asv_optionable'
-require_relative 'shared/asv_symbolizable'
-
-module ActiveStorageValidations
-  class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
-    include ASVActiveStorageable
-    include ASVAnalyzable
-    include ASVAttachable
-    include ASVErrorable
-    include ASVOptionable
-    include ASVSymbolizable
-
-    AVAILABLE_CHECKS = %i[with].freeze
-    NAMED_ASPECT_RATIOS = %i[square portrait landscape].freeze
-    ASPECT_RATIO_REGEX = /is_([1-9]\d*)_([1-9]\d*)/.freeze
-    ERROR_TYPES = %i[
-      image_metadata_missing
-      aspect_ratio_not_square
-      aspect_ratio_not_portrait
-      aspect_ratio_not_landscape
-      aspect_ratio_is_not
-    ].freeze
-    PRECISION = 3.freeze
-
-    def check_validity!
-      ensure_at_least_one_validator_option
-      ensure_aspect_ratio_validity
-    end
-
-    def validate_each(record, attribute, _value)
-      return if no_attachments?(record, attribute)
-
-      validate_changed_files_from_metadata(record, attribute)
-    end
-
-    private
-
-    def is_valid?(record, attribute, attachable, metadata)
-      flat_options = set_flat_options(record)
-
-      return if image_metadata_missing?(record, attribute, attachable, flat_options, metadata)
-
-      case flat_options[:with]
-      when :square then validate_square_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      when :portrait then validate_portrait_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      when :landscape then validate_landscape_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      when ASPECT_RATIO_REGEX then validate_regex_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      end
-    end
-
-    def image_metadata_missing?(record, attribute, attachable, flat_options, metadata)
-      return false if metadata.present? && metadata[:width].to_i > 0 && metadata[:height].to_i > 0
-
-      errors_options = initialize_error_options(options, attachable)
-      errors_options[:aspect_ratio] = flat_options[:with]
-      add_error(record, attribute, :image_metadata_missing, **errors_options)
-      true
-    end
-
-    def validate_square_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      return if metadata[:width] == metadata[:height]
-
-      errors_options = initialize_error_options(options, attachable)
-      errors_options[:aspect_ratio] = flat_options[:with]
-      add_error(record, attribute, :aspect_ratio_not_square, **errors_options)
-    end
-
-    def validate_portrait_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      return if metadata[:width] < metadata[:height]
-
-      errors_options = initialize_error_options(options, attachable)
-      errors_options[:aspect_ratio] = flat_options[:with]
-      add_error(record, attribute, :aspect_ratio_not_portrait, **errors_options)
-    end
-
-    def validate_landscape_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      return if metadata[:width] > metadata[:height]
-
-      errors_options = initialize_error_options(options, attachable)
-      errors_options[:aspect_ratio] = flat_options[:with]
-      add_error(record, attribute, :aspect_ratio_not_landscape, **errors_options)
-    end
-
-    def validate_regex_aspect_ratio(record, attribute, attachable, flat_options, metadata)
-      flat_options[:with] =~ ASPECT_RATIO_REGEX
-      x = $1.to_i
-      y = $2.to_i
-
-      return if x > 0 && y > 0 && (x.to_f / y).round(PRECISION) == (metadata[:width].to_f / metadata[:height]).round(PRECISION)
-
-      errors_options = initialize_error_options(options, attachable)
-      errors_options[:aspect_ratio] = "#{x}:#{y}"
-      add_error(record, attribute, :aspect_ratio_is_not, **errors_options)
-    end
-
-    def ensure_at_least_one_validator_option
-      unless AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass :with to the validator'
-      end
-    end
-
-    def ensure_aspect_ratio_validity
-      return true if options[:with]&.is_a?(Proc)
-
-      unless NAMED_ASPECT_RATIOS.include?(options[:with]) || options[:with] =~ ASPECT_RATIO_REGEX
-        raise ArgumentError, <<~ERROR_MESSAGE
-          You must pass a valid aspect ratio to the validator
-          It should either be a named aspect ratio (#{NAMED_ASPECT_RATIOS.join(', ')})
-          Or an aspect ratio like 'is_16_9' (matching /#{ASPECT_RATIO_REGEX.source}/)
-        ERROR_MESSAGE
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_analyzable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
+
+module ActiveStorageValidations
+  class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
+    include ASVActiveStorageable
+    include ASVAnalyzable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
+
+    AVAILABLE_CHECKS = %i[with in].freeze
+    NAMED_ASPECT_RATIOS = %i[square portrait landscape].freeze
+    ASPECT_RATIO_REGEX = /is_([1-9]\d*)_([1-9]\d*)/.freeze
+    ERROR_TYPES = %i[
+      aspect_ratio_not_square
+      aspect_ratio_not_portrait
+      aspect_ratio_not_landscape
+      aspect_ratio_is_not
+      aspect_ratio_invalid
+      image_metadata_missing
+    ].freeze
+    PRECISION = 3.freeze
+
+    def check_validity!
+      ensure_at_least_one_validator_option
+      ensure_aspect_ratio_validity
+    end
+
+    def validate_each(record, attribute, _value)
+      return if no_attachments?(record, attribute)
+
+      flat_options = set_flat_options(record)
+      @authorized_aspect_ratios = authorized_aspect_ratios_from_options(flat_options).compact
+      return if @authorized_aspect_ratios.empty?
+
+      validate_changed_files_from_metadata(record, attribute)
+    end
+
+    private
+
+    def is_valid?(record, attribute, attachable, metadata)
+      !image_metadata_missing?(record, attribute, attachable, metadata) &&
+        authorized_aspect_ratio?(record, attribute, attachable, metadata)
+    end
+
+    def authorized_aspect_ratio?(record, attribute, attachable, metadata)
+      attachable_aspect_ratio_is_authorized = @authorized_aspect_ratios.any? do |authorized_aspect_ratio|
+        case authorized_aspect_ratio
+        when :square then valid_square_aspect_ratio?(metadata)
+        when :portrait then valid_portrait_aspect_ratio?(metadata)
+        when :landscape then valid_landscape_aspect_ratio?(metadata)
+        when ASPECT_RATIO_REGEX then valid_regex_aspect_ratio?(authorized_aspect_ratio, metadata)
+        end
+      end
+
+      return true if attachable_aspect_ratio_is_authorized
+
+      errors_options = initialize_error_options(options, attachable)
+      errors_options[:aspect_ratio] = string_aspect_ratios
+      add_error(record, attribute, aspect_ratio_error_mapping, **errors_options)
+      false
+    end
+
+    def aspect_ratio_error_mapping
+      return :aspect_ratio_invalid unless @authorized_aspect_ratios.one?
+
+      aspect_ratio = @authorized_aspect_ratios.first
+      NAMED_ASPECT_RATIOS.include?(aspect_ratio) ? :"aspect_ratio_not_#{aspect_ratio}" : :aspect_ratio_is_not
+    end
+
+    def image_metadata_missing?(record, attribute, attachable, metadata)
+      return false if metadata[:width].to_i > 0 && metadata[:height].to_i > 0
+
+      errors_options = initialize_error_options(options, attachable)
+      errors_options[:aspect_ratio] = string_aspect_ratios
+      add_error(record, attribute, :image_metadata_missing, **errors_options)
+      true
+    end
+
+    def valid_square_aspect_ratio?(metadata)
+      metadata[:width] == metadata[:height]
+    end
+
+    def valid_portrait_aspect_ratio?(metadata)
+      metadata[:width] < metadata[:height]
+    end
+
+    def valid_landscape_aspect_ratio?(metadata)
+      metadata[:width] > metadata[:height]
+    end
+
+    def valid_regex_aspect_ratio?(aspect_ratio, metadata)
+      aspect_ratio =~ ASPECT_RATIO_REGEX
+      x = ::Regexp.last_match(1).to_i
+      y = ::Regexp.last_match(2).to_i
+
+      x > 0 && y > 0 && (x.to_f / y).round(PRECISION) == (metadata[:width].to_f / metadata[:height]).round(PRECISION)
+    end
+
+    def ensure_at_least_one_validator_option
+      return if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+
+      raise ArgumentError, 'You must pass either :with or :in to the validator'
+    end
+
+    def ensure_aspect_ratio_validity
+      return true if options[:with]&.is_a?(Proc) || options[:in]&.is_a?(Proc)
+
+      authorized_aspect_ratios_from_options(options).each do |aspect_ratio|
+        unless NAMED_ASPECT_RATIOS.include?(aspect_ratio) || aspect_ratio =~ ASPECT_RATIO_REGEX
+          raise ArgumentError, invalid_aspect_ratio_message
+        end
+      end
+    end
+
+    def invalid_aspect_ratio_message
+      <<~ERROR_MESSAGE
+        You must pass a valid aspect ratio to the validator
+        It should either be a named aspect ratio (#{NAMED_ASPECT_RATIOS.join(', ')})
+        Or an aspect ratio like 'is_16_9' (matching /#{ASPECT_RATIO_REGEX.source}/)
+      ERROR_MESSAGE
+    end
+
+    def authorized_aspect_ratios_from_options(flat_options)
+      (Array.wrap(flat_options[:with]) + Array.wrap(flat_options[:in]))
+    end
+
+    def string_aspect_ratios
+      @authorized_aspect_ratios.map do |aspect_ratio|
+        if NAMED_ASPECT_RATIOS.include?(aspect_ratio)
+          aspect_ratio
+        else
+          aspect_ratio =~ ASPECT_RATIO_REGEX
+          x = ::Regexp.last_match(1).to_i
+          y = ::Regexp.last_match(2).to_i
+
+          "#{x}:#{y}"
+        end
+      end.join(', ')
+    end
+  end
+end

data/lib/active_storage_validations/content_type_spoof_detector.rb

@@ -51,7 +51,7 @@ module ActiveStorageValidations
     end
 
     def open3_mime_type_for_io
-      return nil if io.blank?
+      return nil if io.bytesize == 0
 
       Tempfile.create do |tempfile|
         tempfile.binmode

data/lib/active_storage_validations/content_type_validator.rb

@@ -34,9 +34,11 @@ module ActiveStorageValidations
       @authorized_content_types = authorized_content_types_from_options(record)
       return if @authorized_content_types.empty?
 
-      attachables_from_changes(record, attribute).each do |attachable|
-        set_attachable_cached_values(attachable)
-        is_valid?(record, attribute, attachable)
+      checked_files = disable_spoofing_protection? ? attached_files(record, attribute) : attachables_from_changes(record, attribute)
+
+      checked_files.each do |file|
+        set_attachable_cached_values(file)
+        is_valid?(record, attribute, file)
       end
     end
 
@@ -54,8 +56,8 @@ module ActiveStorageValidations
     end
 
     def set_attachable_cached_values(attachable)
-      @attachable_content_type = attachable_content_type_rails_like(attachable)
-      @attachable_filename = attachable_filename(attachable).to_s
+      @attachable_content_type = disable_spoofing_protection? ? attachable.blob.content_type : attachable_content_type_rails_like(attachable)
+      @attachable_filename = disable_spoofing_protection? ? attachable.blob.filename.to_s : attachable_filename(attachable).to_s
     end
 
     # Check if the provided content_type is authorized and not spoofed against
@@ -116,6 +118,10 @@ module ActiveStorageValidations
       Marcel::MimeType.for(declared_type: @attachable_content_type, name: @attachable_filename)
     end
 
+    def disable_spoofing_protection?
+      !enable_spoofing_protection?
+    end
+
     def enable_spoofing_protection?
       options[:spoofing_protection] == true
     end

data/lib/active_storage_validations/marcel_extensor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "marcel"
+
 Marcel::MimeType.extend "application/x-rar-compressed", parents: %(application/x-rar)
 Marcel::MimeType.extend "audio/x-hx-aac-adts", parents: %(audio/x-aac)
 Marcel::MimeType.extend "audio/x-m4a", parents: %(audio/mp4)

data/lib/active_storage_validations/shared/asv_active_storageable.rb

@@ -9,8 +9,8 @@ module ActiveStorageValidations
 
     private
 
-    # Retrieve either an ActiveStorage::Attached::One or an
-    # ActiveStorage::Attached::Many instance depending on attribute definition
+    # Retrieve either an `ActiveStorage::Attached::One` or an
+    # `ActiveStorage::Attached::Many` instance depending on attribute definition
     def attached_files(record, attribute)
       Array.wrap(record.send(attribute))
     end

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob