active_storage_validations 0.9.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f77bdb678731cdb6bb3aca1bddf3a3b1d1d4f34355a778c504931d067f6d0e2
-  data.tar.gz: cb723cb17a4cbfcfec2e7a9b8432ac0d2641afbef327a92e38baa376d15ba2fd
+  metadata.gz: c3fa76d4dc0cf3d5bffc62dcc604d6f38edf165931c94d9314288606b6205a56
+  data.tar.gz: 9adb8defb7d44c65a4ea67cf632087d423a1c2c44b918822653638132f8beef4
 SHA512:
-  metadata.gz: d44aed46b1f790d3df1913009fc1c84ea5831be3c8809063c94a0c50de3d8b9f40613eab920c49fb8f81dd0808d9c489aebb1705e022defe1e745d1205a48203
-  data.tar.gz: 3d770860efb253f13ea1f18086c5b8a51253caf69875ba1d9d7921c17b9c5ce43f8001f4d8eeb1e095f8f37d1f0924dbddcdb35ca24b721d6fd5cf2a002d9a90
+  metadata.gz: 9a2d4ce5113ed8a018d71b4d40b01c11946892eea438d2b7481b7007511022695998271d06215e6ddf07929d4e057fc8411a2b0babcb508f70af6140fb4d65c8
+  data.tar.gz: 3d31b7848f3174a8df330e5410b5c1aec018a243bfdefa2abdfc8eee9d9f652e34645853da38dee2b1627ef42efa679fabdac11e896a6a37ce9cd0ed1c5569f7

data/README.md

@@ -1,3 +1,6 @@
+[<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
+/>](https://www.railsjazz.com/?utm_source=github&utm_medium=top&utm_campaign=active_storage_validations)
+
 # Active Storage Validations
 
 [![MiniTest](https://github.com/igorkasyanchuk/active_storage_validations/workflows/MiniTest/badge.svg)](https://github.com/igorkasyanchuk/active_storage_validations/actions)
@@ -17,6 +20,7 @@ This gems doing it for you. Just use `attached: true` or `content_type: 'image/p
 * validates number of uploaded files (min/max required)
 * validates aspect ratio (if square, portrait, landscape, is_16_9, ...)
 * custom error messages
+* allow procs for dynamic determination of values
 
 ## Usage
 
@@ -121,6 +125,18 @@ class User < ApplicationRecord
 end
 ```
 
+- Proc Usage:
+
+Procs can be used instead of values in all the above examples. They will be called on every validation.
+```ruby
+class User < ApplicationRecord
+  has_many_attached :proc_files
+
+  validates :proc_files, limit: { max: -> (record) { record.admin? ? 100 : 10 } }
+end
+
+```
+
 ## Internationalization (I18n)
 
 Active Storage Validations uses I18n for error messages. For this, add these keys in your translation file:
@@ -303,12 +319,10 @@ To run tests in root folder of gem:
 Snippet to run in console:
 
 ```
-BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle
-BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rake test
@@ -375,10 +389,16 @@ 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
+= https://github.com/gr8bit
+= https://github.com/codegeek319
+= https://github.com/clwy-cn
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 [<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
-/>](https://www.railsjazz.com/)
+/>](https://www.railsjazz.com/?utm_source=github&utm_medium=bottom&utm_campaign=active_storage_validations)

data/config/locales/zh-CN.yml

@@ -0,0 +1,22 @@
+zh-CN:
+  errors:
+    messages:
+      content_type_invalid: "文件类型错误"
+      file_size_out_of_range: "文件大小 %{file_size} 超出限定范围"
+      limit_out_of_range: "文件数超出限定范围"
+      image_metadata_missing: "不是有效的图像"
+      dimension_min_inclusion: "必须大于或等于 %{width} x %{height} 像素"
+      dimension_max_inclusion: "必须小于或等于 %{width} x %{height} 像素"
+      dimension_width_inclusion: "宽度不在 %{min} 和 %{max} 像素之间"
+      dimension_height_inclusion: "高度不在 %{min} 和 %{max} 像素之间"
+      dimension_width_greater_than_or_equal_to: "宽度必须大于或等于 %{length} 像素"
+      dimension_height_greater_than_or_equal_to: "高度必须大于或等于 %{length} 像素"
+      dimension_width_less_than_or_equal_to: "宽度必须小于或等于 %{length} 像素"
+      dimension_height_less_than_or_equal_to: "高度必须小于或等于 %{length} 像素"
+      dimension_width_equal_to: "宽度必须等于 %{length} 像素"
+      dimension_height_equal_to: "高度必须等于 %{length} 像素"
+      aspect_ratio_not_square: "必须是方形图片"
+      aspect_ratio_not_portrait: "必须是竖屏图片"
+      aspect_ratio_not_landscape: "必须是横屏图片"
+      aspect_ratio_is_not: "纵横比必须是 %{aspect_ratio}"
+      aspect_ratio_unknown: "未知的纵横比"

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -4,17 +4,14 @@ require_relative 'metadata.rb'
 
 module ActiveStorageValidations
   class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
+    include OptionProcUnfolding
+
     AVAILABLE_CHECKS = %i[with].freeze
     PRECISION = 3
 
-    def initialize(options)
-      super(options)
-    end
-
-
     def check_validity!
       return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-      raise ArgumentError, 'You must pass "aspect_ratio: :OPTION" option to the validator'
+      raise ArgumentError, 'You must pass :with to the validator'
     end
 
     if Rails.gem_version >= Gem::Version.new('6.0.0')
@@ -55,26 +52,27 @@ module ActiveStorageValidations
 
 
     def is_valid?(record, attribute, metadata)
+      flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
       if metadata[:width].to_i <= 0 || metadata[:height].to_i <= 0
-        add_error(record, attribute, options[:message].presence || :image_metadata_missing)
+        add_error(record, attribute, :image_metadata_missing, flat_options[:with])
         return false
       end
 
-      case options[:with]
+      case flat_options[:with]
       when :square
         return true if metadata[:width] == metadata[:height]
-        add_error(record, attribute, :aspect_ratio_not_square)
+        add_error(record, attribute, :aspect_ratio_not_square, flat_options[:with])
 
       when :portrait
         return true if metadata[:height] > metadata[:width]
-        add_error(record, attribute, :aspect_ratio_not_portrait)
+        add_error(record, attribute, :aspect_ratio_not_portrait, flat_options[:with])
 
       when :landscape
         return true if metadata[:width] > metadata[:height]
-        add_error(record, attribute, :aspect_ratio_not_landscape)
+        add_error(record, attribute, :aspect_ratio_not_landscape, flat_options[:with])
 
       else
-        if options[:with] =~ /is\_(\d*)\_(\d*)/
+        if flat_options[:with] =~ /is_(\d*)_(\d*)/
           x = $1.to_i
           y = $2.to_i
 
@@ -82,17 +80,17 @@ module ActiveStorageValidations
 
           add_error(record, attribute, :aspect_ratio_is_not, "#{x}x#{y}")
         else
-          add_error(record, attribute, :aspect_ratio_unknown)
+          add_error(record, attribute, :aspect_ratio_unknown, flat_options[:with])
         end
       end
       false
     end
 
 
-    def add_error(record, attribute, type, interpolate = options[:with])
-      key = options[:message].presence || type
-      return if record.errors.added?(attribute, key)
-      record.errors.add(attribute, key, aspect_ratio: interpolate)
+    def add_error(record, attribute, default_message, interpolate)
+      message = options[:message].presence || default_message
+      return if record.errors.added?(attribute, message)
+      record.errors.add(attribute, message, aspect_ratio: interpolate)
     end
 
   end

data/lib/active_storage_validations/content_type_validator.rb

@@ -2,16 +2,23 @@
 
 module ActiveStorageValidations
   class ContentTypeValidator < ActiveModel::EachValidator # :nodoc:
+    include OptionProcUnfolding
+
+    AVAILABLE_CHECKS = %i[with in].freeze
+    
     def validate_each(record, attribute, _value)
-      return true if !record.send(attribute).attached? || types.empty?
+      return true unless record.send(attribute).attached?
 
+      types = authorized_types(record)
+      return true if types.empty?
+      
       files = Array.wrap(record.send(attribute))
 
-      errors_options = { authorized_types: types_to_human_format }
+      errors_options = { authorized_types: types_to_human_format(types) }
       errors_options[:message] = options[:message] if options[:message].present?
 
       files.each do |file|
-        next if is_valid?(file)
+        next if is_valid?(file, types)
 
         errors_options[:content_type] = content_type(file)
         record.errors.add(attribute, :content_type_invalid, **errors_options)
@@ -19,10 +26,9 @@ module ActiveStorageValidations
       end
     end
 
-    def types
-      return @types if defined? @types
-
-      @types = (Array.wrap(options[:with]) + Array.wrap(options[:in])).compact.map do |type|
+    def authorized_types(record)
+      flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
+      (Array.wrap(flat_options[:with]) + Array.wrap(flat_options[:in])).compact.map do |type|
         if type.is_a?(Regexp)
           type
         else
@@ -31,7 +37,7 @@ module ActiveStorageValidations
       end
     end
 
-    def types_to_human_format
+    def types_to_human_format(types)
       types
         .map { |type| type.to_s.split('/').last.upcase }
         .join(', ')
@@ -41,7 +47,7 @@ module ActiveStorageValidations
       file.blob.present? && file.blob.content_type
     end
 
-    def is_valid?(file)
+    def is_valid?(file, types)
       file_type = content_type(file)
       types.any? do |type|
         type == file_type || (type.is_a?(Regexp) && type.match?(file_type.to_s))

data/lib/active_storage_validations/dimension_validator.rb

@@ -4,25 +4,30 @@ require_relative 'metadata.rb'
 
 module ActiveStorageValidations
   class DimensionValidator < ActiveModel::EachValidator # :nodoc
+    include OptionProcUnfolding
+
     AVAILABLE_CHECKS = %i[width height min max].freeze
 
-    def initialize(options)
+    def process_options(record)
+      flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
+
       [:width, :height].each do |length|
-        if options[length] and options[length].is_a?(Hash)
-          if range = options[length][:in]
+        if flat_options[length] and flat_options[length].is_a?(Hash)
+          if (range = flat_options[length][:in])
             raise ArgumentError, ":in must be a Range" unless range.is_a?(Range)
-            options[length][:min], options[length][:max] = range.min, range.max
+            flat_options[length][:min], flat_options[length][:max] = range.min, range.max
           end
         end
       end
       [:min, :max].each do |dim|
-        if range = options[dim]
+        if (range = flat_options[dim])
           raise ArgumentError, ":#{dim} must be a Range (width..height)" unless range.is_a?(Range)
-          options[:width] = { dim => range.first }
-          options[:height] = { dim => range.last }
+          flat_options[:width] = { dim => range.first }
+          flat_options[:height] = { dim => range.last }
         end
       end
-      super
+
+      flat_options
     end
 
 
@@ -64,63 +69,67 @@ module ActiveStorageValidations
 
 
     def is_valid?(record, attribute, file_metadata)
+      flat_options = process_options(record)
       # Validation fails unless file metadata contains valid width and height.
       if file_metadata[:width].to_i <= 0 || file_metadata[:height].to_i <= 0
-        add_error(record, attribute, options[:message].presence || :image_metadata_missing)
+        add_error(record, attribute, :image_metadata_missing)
         return false
       end
 
       # Validation based on checks :min and :max (:min, :max has higher priority to :width, :height).
-      if options[:min] || options[:max]
-        if options[:min] && (
-          (options[:width][:min] && file_metadata[:width] < options[:width][:min]) ||
-          (options[:height][:min] && file_metadata[:height] < options[:height][:min])
+      if flat_options[:min] || flat_options[:max]
+        if flat_options[:min] && (
+          (flat_options[:width][:min] && file_metadata[:width] < flat_options[:width][:min]) ||
+          (flat_options[:height][:min] && file_metadata[:height] < flat_options[:height][:min])
           )
-          add_error(record, attribute, options[:message].presence || :"dimension_min_inclusion", width: options[:width][:min], height: options[:height][:min])
+          add_error(record, attribute, :dimension_min_inclusion, width: flat_options[:width][:min], height: flat_options[:height][:min])
           return false
         end
-        if options[:max] && (
-          (options[:width][:max] && file_metadata[:width] > options[:width][:max]) ||
-          (options[:height][:max] && file_metadata[:height] > options[:height][:max])
+        if flat_options[:max] && (
+          (flat_options[:width][:max] && file_metadata[:width] > flat_options[:width][:max]) ||
+          (flat_options[:height][:max] && file_metadata[:height] > flat_options[:height][:max])
           )
-          add_error(record, attribute, options[:message].presence || :"dimension_max_inclusion", width: options[:width][:max], height: options[:height][:max])
+          add_error(record, attribute, :dimension_max_inclusion, width: flat_options[:width][:max], height: flat_options[:height][:max])
           return false
         end
 
       # 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
+          next unless flat_options[length]
+          if flat_options[length].is_a?(Hash)
+            if flat_options[length][:in] && (file_metadata[length] < flat_options[length][:min] || file_metadata[length] > flat_options[length][:max])
+              add_error(record, attribute, :"dimension_#{length}_inclusion", min: flat_options[length][:min], max: flat_options[length][:max])
+              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
+              if flat_options[length][:min] && file_metadata[length] < flat_options[length][:min]
+                add_error(record, attribute, :"dimension_#{length}_greater_than_or_equal_to", length: flat_options[length][:min])
+                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
+              if flat_options[length][:max] && file_metadata[length] > flat_options[length][:max]
+                add_error(record, attribute, :"dimension_#{length}_less_than_or_equal_to", length: flat_options[length][:max])
+                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
+            if file_metadata[length] != flat_options[length]
+              add_error(record, attribute, :"dimension_#{length}_equal_to", length: flat_options[length])
+              width_or_height_invalid = true
             end
           end
         end
+
+        return false if width_or_height_invalid
       end
 
       true # valid file
     end
 
-    def add_error(record, attribute, type, **attrs)
-      key = options[:message].presence || type
-      return if record.errors.added?(attribute, key)
-      record.errors.add(attribute, key, **attrs)
+    def add_error(record, attribute, default_message, **attrs)
+      message = options[:message].presence || default_message
+      return if record.errors.added?(attribute, message)
+      record.errors.add(attribute, message, **attrs)
     end
 
   end

data/lib/active_storage_validations/limit_validator.rb

@@ -2,11 +2,12 @@
 
 module ActiveStorageValidations
   class LimitValidator < ActiveModel::EachValidator # :nodoc:
+    include OptionProcUnfolding
+
     AVAILABLE_CHECKS = %i[max min].freeze
 
     def check_validity!
       return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-
       raise ArgumentError, 'You must pass either :max or :min to the validator'
     end
 
@@ -14,19 +15,20 @@ module ActiveStorageValidations
       return true unless record.send(attribute).attached?
 
       files = Array.wrap(record.send(attribute)).compact.uniq
-      errors_options = { min: options[:min], max: options[:max] }
+      flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
+      errors_options = { min: flat_options[:min], max: flat_options[:max] }
 
-      return true if files_count_valid?(files.count)
+      return true if files_count_valid?(files.count, flat_options)
       record.errors.add(attribute, options[:message].presence || :limit_out_of_range, **errors_options)
     end
 
-    def files_count_valid?(count)
-      if options[:max].present? && options[:min].present?
-        count >= options[:min] && count <= options[:max]
-      elsif options[:max].present?
-        count <= options[:max]
-      elsif options[:min].present?
-        count >= options[:min]
+    def files_count_valid?(count, flat_options)
+      if flat_options[:max].present? && flat_options[:min].present?
+        count >= flat_options[:min] && count <= flat_options[:max]
+      elsif flat_options[:max].present?
+        count <= flat_options[:max]
+      elsif flat_options[:min].present?
+        count >= flat_options[:min]
       end
     end
   end

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/option_proc_unfolding.rb

@@ -0,0 +1,16 @@
+module ActiveStorageValidations
+  module OptionProcUnfolding
+
+    def unfold_procs(record, object, only_keys = nil)
+      case object
+      when Hash
+        object.merge(object) { |key, value| only_keys&.exclude?(key) ? unfold_procs(record, value, []) : unfold_procs(record, value) }
+      when Array
+        object.map { |o| unfold_procs(record, o, only_keys) }
+      else
+        object.is_a?(Proc) ? object.call(record) : object
+      end
+    end
+
+  end
+end

data/lib/active_storage_validations/size_validator.rb

@@ -2,14 +2,15 @@
 
 module ActiveStorageValidations
   class SizeValidator < ActiveModel::EachValidator # :nodoc:
+    include OptionProcUnfolding
+
     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
 
     def check_validity!
       return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
-
-      raise ArgumentError, 'You must pass either :less_than, :greater_than, or :between to the validator'
+      raise ArgumentError, 'You must pass either :less_than(_or_equal_to), :greater_than(_or_equal_to), or :between to the validator'
     end
 
     def validate_each(record, attribute, _value)
@@ -20,39 +21,40 @@ module ActiveStorageValidations
 
       errors_options = {}
       errors_options[:message] = options[:message] if options[:message].present?
+      flat_options = unfold_procs(record, self.options, AVAILABLE_CHECKS)
 
       files.each do |file|
-        next if content_size_valid?(file.blob.byte_size)
+        next if content_size_valid?(file.blob.byte_size, flat_options)
 
         errors_options[:file_size] = number_to_human_size(file.blob.byte_size)
-        errors_options[:min_size] = number_to_human_size(min_size)
-        errors_options[:max_size] = number_to_human_size(max_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))
 
         record.errors.add(attribute, :file_size_out_of_range, **errors_options)
         break
       end
     end
 
-    def content_size_valid?(file_size)
-      if options[:between].present?
-        options[:between].include?(file_size)
-      elsif options[:less_than].present?
-        file_size < options[:less_than]
-      elsif options[:less_than_or_equal_to].present?
-        file_size <= options[:less_than_or_equal_to]
-      elsif options[:greater_than].present?
-        file_size > options[:greater_than]
-      elsif options[:greater_than_or_equal_to].present?
-        file_size >= options[:greater_than_or_equal_to]
+    def content_size_valid?(file_size, flat_options)
+      if flat_options[:between].present?
+        flat_options[:between].include?(file_size)
+      elsif flat_options[:less_than].present?
+        file_size < flat_options[:less_than]
+      elsif flat_options[:less_than_or_equal_to].present?
+        file_size <= flat_options[:less_than_or_equal_to]
+      elsif flat_options[:greater_than].present?
+        file_size > flat_options[:greater_than]
+      elsif flat_options[:greater_than_or_equal_to].present?
+        file_size >= flat_options[:greater_than_or_equal_to]
       end
     end
 
-    def min_size
-      options[:between]&.min || options[:greater_than] || options[:greater_than_or_equal_to]
+    def min_size(flat_options)
+      flat_options[:between]&.min || flat_options[:greater_than] || flat_options[:greater_than_or_equal_to]
     end
 
-    def max_size
-      options[:between]&.max || options[:less_than] || options[:less_than_or_equal_to]
+    def max_size(flat_options)
+      flat_options[:between]&.max || flat_options[:less_than] || flat_options[:less_than_or_equal_to]
     end
   end
 end

data/lib/active_storage_validations/version.rb

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

data/lib/active_storage_validations.rb

@@ -2,6 +2,7 @@
 
 require 'active_storage_validations/railtie'
 require 'active_storage_validations/engine'
+require 'active_storage_validations/option_proc_unfolding'
 require 'active_storage_validations/attached_validator'
 require 'active_storage_validations/content_type_validator'
 require 'active_storage_validations/size_validator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Validations for Active Storage (presence)
 email:
 - igorkasyanchuk@gmail.com
@@ -187,6 +201,7 @@ files:
 - config/locales/tr.yml
 - config/locales/uk.yml
 - config/locales/vi.yml
+- config/locales/zh-CN.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
@@ -200,6 +215,7 @@ files:
 - lib/active_storage_validations/matchers/dimension_validator_matcher.rb
 - lib/active_storage_validations/matchers/size_validator_matcher.rb
 - lib/active_storage_validations/metadata.rb
+- lib/active_storage_validations/option_proc_unfolding.rb
 - lib/active_storage_validations/railtie.rb
 - lib/active_storage_validations/size_validator.rb
 - lib/active_storage_validations/version.rb
@@ -223,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Validations for Active Storage