active_storage_validations 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b512ecda0ff1fa0f06649f78b7b4f58433ca7f108abd729ce08cd0eea2b1baf
-  data.tar.gz: 1ef72d050d31ed0d4052672370849c5d66538df5b06e5a477ebc3575fc110e40
+  metadata.gz: 288f21f798861bd7e44ad225052620bfcfd2d58efe73f0aeda8f4964ace98f56
+  data.tar.gz: b19cce430aae6c1eed3c2d29cbafa6d07b36423f122157603d4391a892267d64
 SHA512:
-  metadata.gz: dc0392b8725f2a567df3f99b61c5053ab0870e877ba16f3085871842a70ca7f5db328b63b3275912017831d4ed29697a66106cdad4e7cfbb779a1985b7d20488
-  data.tar.gz: 8a6883ac4f1cbf0e703c41d1e8ddf6136397fb3973997cc37c83aef3f0456ab5278b5475518ce3ddb8a776a41c8e8f7774160850ddcb49b5ece6e9c846cab8db
+  metadata.gz: e7d6e8ac601a1bd25c2c4f4a199782e7b8dd5821ce99a2bcf14a60c0d8dd2f5e55c46d1eeae758438f8e9da34ae2f9366bf4690345dde242af897cf405dc1624
+  data.tar.gz: a4335b501b1298517053f45ec6f1192d053cd73fd682bc19127f5891aa7704e2116659991e29c3d2c4bd6ff9acf0847b91389b6bbfafb52d2c45a941dbb9dd35

data/README.md

@@ -368,6 +368,11 @@ BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle exec rake test
 ```
 
+Tips:
+- To focus a specific test, use the `focus` class method provided by [minitest-focus](https://github.com/minitest/minitest-focus)
+- To focus a specific file, use the TEST option provided by minitest, e.g. to only run size_validator_test.rb file you will execute the following command: `bundle exec rake test TEST=test/validators/size_validator_test.rb`
+
+
 ## Known issues
 
 - There is an issue in Rails which it possible to get if you have added a validation and generating for example an image preview of attachments. It can be fixed with this:
@@ -446,6 +451,8 @@ You are welcome to contribute.
 - https://github.com/technicalpickles
 - https://github.com/ricsdeol
 - https://github.com/Fonsan
+- https://github.com/tagliala
+- https://github.com/ocarreterom
 
 
 ## License

data/config/locales/de.yml

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

data/config/locales/es.yml

@@ -24,3 +24,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}"
       aspect_ratio_unknown: "tiene una relación de aspecto desconocida"
+      image_not_processable: "no es una imagen válida"

data/config/locales/fr.yml

@@ -24,3 +24,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}"
       aspect_ratio_unknown: "a un rapport d'aspect inconnu"
+      image_not_processable: "n'est pas une image valide"

data/config/locales/it.yml

@@ -24,3 +24,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}"
       aspect_ratio_unknown: "ha un rapporto altezza / larghezza sconosciuto"
+      image_not_processable: "non è un'immagine valida"

data/config/locales/ja.yml

@@ -24,3 +24,4 @@ ja:
       aspect_ratio_not_landscape: "は横長にしてください"
       aspect_ratio_is_not: "のアスペクト比は %{aspect_ratio} にしてください"
       aspect_ratio_unknown: "のアスペクト比を取得できませんでした"
+      image_not_processable: "は不正な画像です"

data/config/locales/nl.yml

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

data/config/locales/pl.yml

@@ -24,3 +24,4 @@ pl:
       aspect_ratio_not_landscape: "musi mieć proporcje pejzażu"
       aspect_ratio_is_not: "musi mieć proporcje %{aspect_ratio}"
       aspect_ratio_unknown: "ma nieokreślone proporcje"
+      image_not_processable: "nie jest prawidłowym obrazem"

data/config/locales/ru.yml

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

data/config/locales/tr.yml

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

data/config/locales/uk.yml

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

data/config/locales/vi.yml

@@ -24,3 +24,4 @@ vi:
       aspect_ratio_not_landscape: "phải là ảnh ngang"
       aspect_ratio_is_not: "phải có tỉ lệ ảnh %{aspect_ratio}"
       aspect_ratio_unknown: "tỉ lệ ảnh không xác định"
+      image_not_processable: "không phải là ảnh"

data/config/locales/zh-CN.yml

@@ -24,3 +24,4 @@ zh-CN:
       aspect_ratio_not_landscape: "必须是横屏图片"
       aspect_ratio_is_not: "纵横比必须是 %{aspect_ratio}"
       aspect_ratio_unknown: "未知的纵横比"
+      image_not_processable: "不是有效的图像"

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
 require_relative 'metadata.rb'
 
 module ActiveStorageValidations
   class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     AVAILABLE_CHECKS = %i[with].freeze
     PRECISION = 3

data/lib/active_storage_validations/attached_validator.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
+
 module ActiveStorageValidations
   class AttachedValidator < ActiveModel::EachValidator # :nodoc:
     include ErrorHandler
+    include Symbolizable
+
+    ERROR_TYPES = %i[blank].freeze
 
     def validate_each(record, attribute, _value)
       return if record.send(attribute).attached?
 
       errors_options = initialize_error_options(options)
 
-      add_error(record, attribute, :blank, **errors_options)
+      add_error(record, attribute, ERROR_TYPES.first, **errors_options)
     end
   end
 end

data/lib/active_storage_validations/concerns/symbolizable.rb

@@ -0,0 +1,10 @@
+module Symbolizable
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def to_sym
+      validator_class = self.name.split("::").last
+      validator_class.sub(/Validator/, '').underscore.to_sym
+    end
+  end
+end

data/lib/active_storage_validations/content_type_validator.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
+
 module ActiveStorageValidations
   class ContentTypeValidator < ActiveModel::EachValidator # :nodoc:
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     AVAILABLE_CHECKS = %i[with in].freeze
-    
+    ERROR_TYPES = %i[content_type_invalid].freeze
+
     def validate_each(record, attribute, _value)
       return true unless record.send(attribute).attached?
 
@@ -22,7 +26,7 @@ module ActiveStorageValidations
         next if is_valid?(file, types)
 
         errors_options[:content_type] = content_type(file)
-        add_error(record, attribute, :content_type_invalid, **errors_options)
+        add_error(record, attribute, ERROR_TYPES.first, **errors_options)
         break
       end
     end

data/lib/active_storage_validations/dimension_validator.rb

@@ -1,13 +1,28 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
 require_relative 'metadata.rb'
 
 module ActiveStorageValidations
   class DimensionValidator < ActiveModel::EachValidator # :nodoc
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     AVAILABLE_CHECKS = %i[width height min max].freeze
+    ERROR_TYPES = %i[
+      image_metadata_missing
+      dimension_min_inclusion
+      dimension_max_inclusion
+      dimension_width_inclusion
+      dimension_height_inclusion
+      dimension_width_greater_than_or_equal_to
+      dimension_height_greater_than_or_equal_to
+      dimension_width_less_than_or_equal_to
+      dimension_height_less_than_or_equal_to
+      dimension_width_equal_to
+      dimension_height_equal_to
+    ].freeze
 
     def process_options(record)
       flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)

data/lib/active_storage_validations/error_handler.rb

@@ -3,15 +3,18 @@ module ActiveStorageValidations
 
     def initialize_error_options(options)
       {
-        message: (options[:message] if options[:message].present?)
-      }
+        validator_type: self.class.to_sym,
+        custom_message: (options[:message] if options[:message].present?)
+      }.compact
     end
 
-    def add_error(record, attribute, default_message, **errors_options)
-      message = errors_options[:message].presence || default_message
-      return if record.errors.added?(attribute, message)
+    def add_error(record, attribute, error_type, **errors_options)
+      type = errors_options[:custom_message].presence || error_type
+      return if record.errors.added?(attribute, type)
 
-      record.errors.add(attribute, message, **errors_options)
+      # You can read https://api.rubyonrails.org/classes/ActiveModel/Errors.html#method-i-add
+      # to better understand how Rails model errors work
+      record.errors.add(attribute, type, **errors_options)
     end
 
   end

data/lib/active_storage_validations/limit_validator.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
+
 module ActiveStorageValidations
   class LimitValidator < ActiveModel::EachValidator # :nodoc:
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     AVAILABLE_CHECKS = %i[max min].freeze
 
@@ -14,7 +17,7 @@ module ActiveStorageValidations
     end
 
     def validate_each(record, attribute, _)
-      files = Array.wrap(record.send(attribute)).compact.uniq
+      files = Array.wrap(record.send(attribute)).reject { |file| file.blank? }.compact.uniq
       flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
       errors_options = initialize_error_options(options)
       errors_options[:min] = flat_options[:min]

data/lib/active_storage_validations/matchers/attached_validator_matcher.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/validatable.rb'
+
 module ActiveStorageValidations
   module Matchers
     def validate_attached_of(name)
@@ -7,6 +9,8 @@ module ActiveStorageValidations
     end
 
     class AttachedValidatorMatcher
+      include Validatable
+
       def initialize(attribute_name)
         @attribute_name = attribute_name
         @custom_message = nil
@@ -23,7 +27,10 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        responds_to_methods && valid_when_attached && invalid_when_not_attached
+        responds_to_methods &&
+          is_valid_when_file_attached? &&
+          is_invalid_when_file_not_attached? &&
+          validate_custom_message?
       end
 
       def failure_message
@@ -42,27 +49,44 @@ module ActiveStorageValidations
           @subject.public_send(@attribute_name).respond_to?(:detach)
       end
 
-      def valid_when_attached
-        @subject.public_send(@attribute_name).attach(attachable) unless @subject.public_send(@attribute_name).attached?
-        @subject.validate
-        @subject.errors.details[@attribute_name].exclude?(error: error_message)
+      def is_valid_when_file_attached?
+        attach_dummy_file unless file_attached?
+        validate
+        is_valid?
       end
 
-      def invalid_when_not_attached
-        @subject.public_send(@attribute_name).detach
-        # Unset the direct relation since `detach` on an unpersisted record does not set `attached?` to false.
-        @subject.public_send("#{@attribute_name}=", nil)
+      def is_invalid_when_file_not_attached?
+        detach_file if file_attached?
+        validate
+        !is_valid?
+      end
+
+      def validate_custom_message?
+        return true unless @custom_message
 
-        @subject.validate
-        @subject.errors.details[@attribute_name].include?(error: error_message)
+        detach_file if file_attached?
+        validate
+        has_an_error_message_which_is_custom_message?
       end
 
-      def error_message
-        @custom_message || :blank
+      def attach_dummy_file
+        dummy_file = {
+          io: Tempfile.new('.'),
+          filename: 'dummy.txt',
+          content_type: 'text/plain'
+        }
+
+        @subject.public_send(@attribute_name).attach(dummy_file)
+      end
+
+      def file_attached?
+        @subject.public_send(@attribute_name).attached?
       end
 
-      def attachable
-        { io: Tempfile.new('.'), filename: 'dummy.txt', content_type: 'text/plain' }
+      def detach_file
+        @subject.public_send(@attribute_name).detach
+        # Unset the direct relation since `detach` on an unpersisted record does not set `attached?` to false.
+        @subject.public_send("#{@attribute_name}=", nil)
       end
     end
   end

data/lib/active_storage_validations/matchers/concerns/validatable.rb

@@ -0,0 +1,46 @@
+module Validatable
+  extend ActiveSupport::Concern
+
+  private
+
+  def validate
+    @subject.validate
+  end
+
+  def validator_errors_for_attribute
+    @subject.errors.details[@attribute_name].select do |error|
+      error[:validator_type] == validator_class.to_sym
+    end
+  end
+
+  def is_valid?
+    validator_errors_for_attribute.none? do |error|
+      error[:error].in?(available_errors)
+    end
+  end
+
+  def available_errors
+    [
+      *validator_class::ERROR_TYPES,
+      *error_from_custom_message
+    ].compact
+  end
+
+  def validator_class
+    self.class.name.gsub(/::Matchers|Matcher/, '').constantize
+  end
+
+  def error_from_custom_message
+    associated_validation = @subject.class.validators_on(@attribute_name).find do |validator|
+      validator.class == validator_class
+    end
+
+    associated_validation.options[:message]
+  end
+
+  def has_an_error_message_which_is_custom_message?
+    validator_errors_for_attribute.one? do |error|
+      error[:error] == @custom_message
+    end
+  end
+end

data/lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -2,6 +2,9 @@
 
 # Big thank you to the paperclip validation matchers:
 # https://github.com/thoughtbot/paperclip/blob/v6.1.0/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
+
+require_relative 'concerns/validatable.rb'
+
 module ActiveStorageValidations
   module Matchers
     def validate_content_type_of(name)
@@ -9,8 +12,11 @@ module ActiveStorageValidations
     end
 
     class ContentTypeValidatorMatcher
+      include Validatable
+
       def initialize(attribute_name)
         @attribute_name = attribute_name
+        @allowed_types = @rejected_types = []
         @custom_message = nil
       end
 
@@ -35,20 +41,24 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        responds_to_methods && allowed_types_allowed? && rejected_types_rejected? && validate_custom_message?
+
+        responds_to_methods &&
+          all_allowed_types_allowed? &&
+          all_rejected_types_rejected? &&
+          validate_custom_message?
       end
 
       def failure_message
         message = ["Expected #{@attribute_name}"]
 
-        if @allowed_types
-          message << "Accept content types: #{allowed_types.join(", ")}"
-          message << "#{@missing_allowed_types.join(", ")} were rejected"
+        if @allowed_types_not_allowed.present?
+          message << "Accept content types: #{@allowed_types.join(", ")}"
+          message << "#{@allowed_types_not_allowed.join(", ")} were rejected"
         end
 
-        if @rejected_types
-          message << "Reject content types: #{rejected_types.join(", ")}"
-          message << "#{@missing_rejected_types.join(", ")} were accepted"
+        if @rejected_types_not_rejected.present?
+          message << "Reject content types: #{@rejected_types.join(", ")}"
+          message << "#{@rejected_types_not_rejected.join(", ")} were accepted"
         end
 
         message.join("\n")
@@ -62,49 +72,46 @@ module ActiveStorageValidations
           @subject.public_send(@attribute_name).respond_to?(:detach)
       end
 
-      def allowed_types
-        @allowed_types || []
+      def all_allowed_types_allowed?
+        @allowed_types_not_allowed ||= @allowed_types.reject { |type| type_allowed?(type) }
+        @allowed_types_not_allowed.empty?
       end
 
-      def rejected_types
-        @rejected_types || []
+      def all_rejected_types_rejected?
+        @rejected_types_not_rejected ||= @rejected_types.select { |type| type_allowed?(type) }
+        @rejected_types_not_rejected.empty?
       end
 
-      def allowed_types_allowed?
-        @missing_allowed_types ||= allowed_types.reject { |type| type_allowed?(type) }
-        @missing_allowed_types.none?
-      end
-
-      def rejected_types_rejected?
-        @missing_rejected_types ||= rejected_types.select { |type| type_allowed?(type) }
-        @missing_rejected_types.none?
+      def type_allowed?(type)
+        attach_file_of_type(type)
+        validate
+        is_valid?
       end
 
-      def type_allowed?(type)
+      def attach_file_of_type(type)
         @subject.public_send(@attribute_name).attach(attachment_for(type))
-        @subject.validate
-        @subject.errors.details[@attribute_name].none? do |error|
-          error[:error].to_s.include?(error_message)
-        end
       end
 
       def validate_custom_message?
         return true unless @custom_message
 
-        @subject.public_send(@attribute_name).attach(attachment_for('fake/fake'))
-        @subject.validate
-        @subject.errors.details[@attribute_name].select{|error| error[:content_type]}.all? do |error|
-          error[:error].to_s.include?(error_message)
-        end
+        attach_invalid_content_type_file
+        validate
+        has_an_error_message_which_is_custom_message?
       end
 
-      def error_message
-        @custom_message || :content_type_invalid.to_s
+      def attach_invalid_content_type_file
+        @subject.public_send(@attribute_name).attach(attachment_for('fake/fake'))
       end
 
       def attachment_for(type)
         suffix = type.to_s.split('/').last
-        { io: Tempfile.new('.'), filename: "test.#{suffix}", content_type: type }
+
+        {
+          io: Tempfile.new('.'),
+          filename: "test.#{suffix}",
+          content_type: type
+        }
       end
     end
   end

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/validatable.rb'
+
 module ActiveStorageValidations
   module Matchers
     def validate_dimensions_of(name)
@@ -7,6 +9,8 @@ module ActiveStorageValidations
     end
 
     class DimensionValidatorMatcher
+      include Validatable
+
       def initialize(attribute_name)
         @attribute_name = attribute_name
         @width_min = @width_max = @height_min = @height_max = nil
@@ -64,9 +68,19 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
+
         responds_to_methods &&
-          width_not_smaller_than_min? && width_larger_than_min? && width_smaller_than_max? && width_not_larger_than_max? && width_equals? &&
-          height_not_smaller_than_min? && height_larger_than_min? && height_smaller_than_max? && height_not_larger_than_max? && height_equals?
+          width_not_smaller_than_min? &&
+          width_larger_than_min? &&
+          width_smaller_than_max? &&
+          width_not_larger_than_max? &&
+          width_equals? &&
+          height_not_smaller_than_min? &&
+          height_larger_than_min? &&
+          height_smaller_than_max? &&
+          height_not_larger_than_max? &&
+          height_equals? &&
+          validate_custom_message?
       end
 
       def failure_message
@@ -134,22 +148,38 @@ module ActiveStorageValidations
       end
 
       def passes_validation_with_dimensions(width, height, check)
-        @subject.public_send(@attribute_name).attach attachment_for(width, height)
+        mock_dimensions_for(attach_file, width, height) do
+          validate
+          is_valid?
+        end
+      end
+
+      def validate_custom_message?
+        return true unless @custom_message
 
-        attachment = @subject.public_send(@attribute_name)
+        mock_dimensions_for(attach_file, -1, -1) do
+          validate
+          has_an_error_message_which_is_custom_message?
+        end
+      end
+
+      def mock_dimensions_for(attachment, width, height)
         Matchers.mock_metadata(attachment, width, height) do
-          @subject.validate
-          exclude_error_message = @custom_message || "dimension_#{check}"
-          @subject.errors.details[@attribute_name].none? do |error|
-            error[:error].to_s.include?(exclude_error_message) ||
-            error[:error].to_s.include?("dimension_min") ||
-            error[:error].to_s.include?("dimension_max")
-          end
+          yield
         end
       end
 
-      def attachment_for(width, height)
-        { io: Tempfile.new('Hello world!'), filename: 'test.png', content_type: 'image/png' }
+      def attach_file
+        @subject.public_send(@attribute_name).attach(dummy_file)
+        @subject.public_send(@attribute_name)
+      end
+
+      def dummy_file
+        {
+          io: Tempfile.new('Hello world!'),
+          filename: 'test.png',
+          content_type: 'image/png'
+        }
       end
     end
   end

data/lib/active_storage_validations/matchers/size_validator_matcher.rb

@@ -2,6 +2,9 @@
 
 # Big thank you to the paperclip validation matchers:
 # https://github.com/thoughtbot/paperclip/blob/v6.1.0/lib/paperclip/matchers/validate_attachment_size_matcher.rb
+
+require_relative 'concerns/validatable.rb'
+
 module ActiveStorageValidations
   module Matchers
     def validate_size_of(name)
@@ -9,6 +12,8 @@ module ActiveStorageValidations
     end
 
     class SizeValidatorMatcher
+      include Validatable
+
       def initialize(attribute_name)
         @attribute_name = attribute_name
         @min = @max = nil
@@ -51,7 +56,13 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        responds_to_methods && not_lower_than_min? && higher_than_min? && lower_than_max? && not_higher_than_max?
+
+        responds_to_methods &&
+          not_lower_than_min? &&
+          higher_than_min? &&
+          lower_than_max? &&
+          not_higher_than_max? &&
+          validate_custom_message?
       end
 
       def failure_message
@@ -86,17 +97,45 @@ module ActiveStorageValidations
         @max.nil? || @max == Float::INFINITY || !passes_validation_with_size(@max + 1)
       end
 
-      def passes_validation_with_size(new_size)
-        io = Tempfile.new('Hello world!')
-        Matchers.stub_method(io, :size, new_size) do
-          @subject.public_send(@attribute_name).attach(io: io, filename: 'test.png', content_type: 'image/pg')
-          @subject.validate
-          exclude_error_message = @custom_message || "file_size_not_"
-          @subject.errors.details[@attribute_name].none? do |error|
-            error[:error].to_s.include?(exclude_error_message)
-          end
+      def passes_validation_with_size(size)
+        mock_size_for(io, size) do
+          attach_file
+          validate
+          is_valid?
         end
       end
+
+      def validate_custom_message?
+        return true unless @custom_message
+
+        mock_size_for(io, -1.kilobytes) do
+          attach_file
+          validate
+          has_an_error_message_which_is_custom_message?
+        end
+      end
+
+      def mock_size_for(io, size)
+        Matchers.stub_method(io, :size, size) do
+          yield
+        end
+      end
+
+      def attach_file
+        @subject.public_send(@attribute_name).attach(dummy_file)
+      end
+
+      def dummy_file
+        {
+          io: io,
+          filename: 'test.png',
+          content_type: 'image/png'
+        }
+      end
+
+      def io
+        @io ||= Tempfile.new('Hello world!')
+      end
     end
   end
 end

data/lib/active_storage_validations/processable_image_validator.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
 require_relative 'metadata.rb'
 
 module ActiveStorageValidations
   class ProcessableImageValidator < ActiveModel::EachValidator # :nodoc
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     if Rails.gem_version >= Gem::Version.new('6.0.0')
       def validate_each(record, attribute, _value)

data/lib/active_storage_validations/size_validator.rb

@@ -1,13 +1,29 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/symbolizable.rb'
+
 module ActiveStorageValidations
   class SizeValidator < ActiveModel::EachValidator # :nodoc:
     include OptionProcUnfolding
     include ErrorHandler
+    include Symbolizable
 
     delegate :number_to_human_size, to: ActiveSupport::NumberHelper
 
-    AVAILABLE_CHECKS = %i[less_than less_than_or_equal_to greater_than greater_than_or_equal_to between].freeze
+    AVAILABLE_CHECKS = %i[
+      less_than
+      less_than_or_equal_to
+      greater_than
+      greater_than_or_equal_to
+      between
+    ].freeze
+    ERROR_TYPES = %i[
+      file_size_not_less_than
+      file_size_not_less_than_or_equal_to
+      file_size_not_greater_than
+      file_size_not_greater_than_or_equal_to
+      file_size_not_between
+    ].freeze
 
     def check_validity!
       unless AVAILABLE_CHECKS.one? { |argument| options.key?(argument) }
@@ -31,7 +47,8 @@ module ActiveStorageValidations
         errors_options[:file_size] = number_to_human_size(file.blob.byte_size)
         errors_options[:min_size] = number_to_human_size(min_size(flat_options))
         errors_options[:max_size] = number_to_human_size(max_size(flat_options))
-        error_type = "file_size_not_#{flat_options.keys.first}".to_sym
+        keys = AVAILABLE_CHECKS & flat_options.keys
+        error_type = "file_size_not_#{keys.first}".to_sym
 
         add_error(record, attribute, error_type, **errors_options)
         break
@@ -39,6 +56,8 @@ module ActiveStorageValidations
     end
 
     def content_size_valid?(file_size, flat_options)
+      return false if file_size < 0
+
       if flat_options[:between].present?
         flat_options[:between].include?(file_size)
       elsif flat_options[:less_than].present?

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,7 @@ files:
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
+- lib/active_storage_validations/concerns/symbolizable.rb
 - lib/active_storage_validations/content_type_validator.rb
 - lib/active_storage_validations/dimension_validator.rb
 - lib/active_storage_validations/engine.rb
@@ -227,6 +242,7 @@ files:
 - lib/active_storage_validations/limit_validator.rb
 - lib/active_storage_validations/matchers.rb
 - lib/active_storage_validations/matchers/attached_validator_matcher.rb
+- lib/active_storage_validations/matchers/concerns/validatable.rb
 - lib/active_storage_validations/matchers/content_type_validator_matcher.rb
 - lib/active_storage_validations/matchers/dimension_validator_matcher.rb
 - lib/active_storage_validations/matchers/size_validator_matcher.rb
@@ -240,7 +256,8 @@ files:
 homepage: https://github.com/igorkasyanchuk/active_storage_validations
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: