active_storage_validations 0.9.7 → 2.0.2

data/lib/active_storage_validations/shared/asv_errorable.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  module ASVErrorable
+    extend ActiveSupport::Concern
+
+    def initialize_error_options(options, file = nil)
+      not_explicitly_written_options = %i(with in)
+      curated_options = options.except(*not_explicitly_written_options)
+
+      active_storage_validations_options = {
+        validator_type: self.class.to_sym,
+        custom_message: (options[:message] if options[:message].present?),
+        filename: (get_filename(file) unless self.class.to_sym == :total_size)
+      }.compact
+
+      curated_options.merge(active_storage_validations_options)
+    end
+
+    def add_error(record, attribute, error_type, **errors_options)
+      return if record.errors.added?(attribute, error_type)
+
+      # 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, error_type, **errors_options)
+    end
+
+    private
+
+    def get_filename(file)
+      return nil unless file
+
+      case file
+      when ActiveStorage::Attached, ActiveStorage::Attachment then file.blob&.filename&.to_s
+      when ActiveStorage::Blob then file.filename
+      when Hash then file[:filename]
+      end.to_s
+    end
+  end
+end

data/lib/active_storage_validations/shared/asv_loggable.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  module ASVLoggable
+    extend ActiveSupport::Concern
+
+    def logger
+      Rails.logger
+    end
+  end
+end

data/lib/active_storage_validations/shared/asv_optionable.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  # ActiveStorageValidations::ASVOptionable
+  #
+  # Helper method to flatten the validator options.
+  module ASVOptionable
+    extend ActiveSupport::Concern
+
+    private
+
+    def set_flat_options(record)
+      flatten_options(record, self.options)
+    end
+
+    def flatten_options(record, options, available_checks = self.class::AVAILABLE_CHECKS)
+      case options
+      when Hash
+        options.merge(options) do |key, value|
+          available_checks&.exclude?(key) ? {} : flatten_options(record, value, nil)
+        end
+      when Array
+        options.map { |option| flatten_options(record, option, available_checks) }
+      else
+        options.is_a?(Proc) ? options.call(record) : options
+      end
+    end
+  end
+end

data/lib/active_storage_validations/shared/asv_symbolizable.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  module ASVSymbolizable
+    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
+end

data/lib/active_storage_validations/size_validator.rb

@@ -1,58 +1,42 @@
 # frozen_string_literal: true
 
-module ActiveStorageValidations
-  class SizeValidator < ActiveModel::EachValidator # :nodoc:
-    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
+require_relative 'base_comparison_validator'
 
-    def check_validity!
-      return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+module ActiveStorageValidations
+  class SizeValidator < BaseComparisonValidator
+    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
 
-      raise ArgumentError, 'You must pass either :less_than, :greater_than, or :between to the validator'
-    end
+    delegate :number_to_human_size, to: ActiveSupport::NumberHelper
 
     def validate_each(record, attribute, _value)
-      # only attached
-      return true unless record.send(attribute).attached?
+      return if no_attachments?(record, attribute)
 
-      files = Array.wrap(record.send(attribute))
+      flat_options = set_flat_options(record)
 
-      errors_options = {}
-      errors_options[:message] = options[:message] if options[:message].present?
+      attached_files(record, attribute).each do |file|
+        next if is_valid?(file.blob.byte_size, flat_options)
 
-      files.each do |file|
-        next if content_size_valid?(file.blob.byte_size)
+        errors_options = initialize_error_options(options, file)
+        populate_error_options(errors_options, flat_options)
+        errors_options[:file_size] = format_bound_value(file.blob.byte_size)
 
-        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)
+        keys = AVAILABLE_CHECKS & flat_options.keys
+        error_type = "file_size_not_#{keys.first}".to_sym
 
-        record.errors.add(attribute, :file_size_out_of_range, **errors_options)
-        break
+        add_error(record, attribute, error_type, **errors_options)
       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]
-      end
-    end
-
-    def min_size
-      options[:between]&.min || options[:greater_than] || options[:greater_than_or_equal_to]
-    end
+    private
 
-    def max_size
-      options[:between]&.max || options[:less_than] || options[:less_than_or_equal_to]
+    def format_bound_value(value)
+      number_to_human_size(value)
     end
   end
 end

data/lib/active_storage_validations/total_size_validator.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'base_comparison_validator'
+
+module ActiveStorageValidations
+  class TotalSizeValidator < BaseComparisonValidator
+    ERROR_TYPES = %i[
+      total_file_size_not_less_than
+      total_file_size_not_less_than_or_equal_to
+      total_file_size_not_greater_than
+      total_file_size_not_greater_than_or_equal_to
+      total_file_size_not_between
+    ].freeze
+
+    delegate :number_to_human_size, to: ActiveSupport::NumberHelper
+
+    def validate_each(record, attribute, _value)
+      custom_check_validity!(record, attribute)
+
+      return if no_attachments?(record, attribute)
+
+      total_file_size = attached_files(record, attribute).sum { |file| file.blob.byte_size }
+      flat_options = set_flat_options(record)
+
+      return if is_valid?(total_file_size, flat_options)
+
+      errors_options = initialize_error_options(options, nil)
+      populate_error_options(errors_options, flat_options)
+      errors_options[:total_file_size] = format_bound_value(total_file_size)
+
+      keys = AVAILABLE_CHECKS & flat_options.keys
+      error_type = "total_file_size_not_#{keys.first}".to_sym
+
+      add_error(record, attribute, error_type, **errors_options)
+    end
+
+    private
+
+    def custom_check_validity!(record, attribute)
+      # We can't perform this check in the #check_validity! hook because we do not
+      # have enough data (only options & attributes are accessible)
+      unless record.send(attribute).is_a?(ActiveStorage::Attached::Many)
+        raise ArgumentError, 'This validator is only available for has_many_attached relations'
+      end
+    end
+
+    def format_bound_value(value)
+      number_to_human_size(value)
+    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 = '2.0.2'
 end

data/lib/active_storage_validations.rb

@@ -1,14 +1,28 @@
 # frozen_string_literal: true
 
-require 'active_storage_validations/railtie'
-require 'active_storage_validations/engine'
+require 'active_model'
+require 'active_support/concern'
+
+require 'active_storage_validations/analyzer'
+require 'active_storage_validations/analyzer/image_analyzer'
+require 'active_storage_validations/analyzer/image_analyzer/image_magick'
+require 'active_storage_validations/analyzer/image_analyzer/vips'
+require 'active_storage_validations/analyzer/null_analyzer'
+require 'active_storage_validations/analyzer/video_analyzer'
+require 'active_storage_validations/analyzer/audio_analyzer'
+
+require 'active_storage_validations/extensors/asv_blob_metadatable'
+require 'active_storage_validations/extensors/asv_marcelable'
+
 require 'active_storage_validations/attached_validator'
 require 'active_storage_validations/content_type_validator'
-require 'active_storage_validations/size_validator'
 require 'active_storage_validations/limit_validator'
 require 'active_storage_validations/dimension_validator'
+require 'active_storage_validations/duration_validator'
 require 'active_storage_validations/aspect_ratio_validator'
+require 'active_storage_validations/processable_file_validator'
+require 'active_storage_validations/size_validator'
+require 'active_storage_validations/total_size_validator'
 
-ActiveSupport.on_load(:active_record) do
-  send :include, ActiveStorageValidations
-end
+require 'active_storage_validations/engine'
+require 'active_storage_validations/railtie'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 2.0.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.4
+- !ruby/object:Gem::Dependency
+  name: marcel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +109,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.9.5
 - !ruby/object:Gem::Dependency
-  name: ruby-vips
+  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: minitest-mock_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: minitest-stub_any_instance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +177,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: ruby-vips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,19 +219,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Validations for Active Storage (presence)
 email:
 - igorkasyanchuk@gmail.com
@@ -174,6 +242,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -184,30 +253,67 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/sv.yml
 - 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/analyzer.rb
+- lib/active_storage_validations/analyzer/audio_analyzer.rb
+- lib/active_storage_validations/analyzer/content_type_analyzer.rb
+- lib/active_storage_validations/analyzer/image_analyzer.rb
+- lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb
+- lib/active_storage_validations/analyzer/image_analyzer/vips.rb
+- lib/active_storage_validations/analyzer/null_analyzer.rb
+- lib/active_storage_validations/analyzer/shared/asv_ff_probable.rb
+- lib/active_storage_validations/analyzer/video_analyzer.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
+- lib/active_storage_validations/base_comparison_validator.rb
 - lib/active_storage_validations/content_type_validator.rb
 - lib/active_storage_validations/dimension_validator.rb
+- lib/active_storage_validations/duration_validator.rb
 - lib/active_storage_validations/engine.rb
+- lib/active_storage_validations/extensors/asv_blob_metadatable.rb
+- lib/active_storage_validations/extensors/asv_marcelable.rb
 - lib/active_storage_validations/limit_validator.rb
 - lib/active_storage_validations/matchers.rb
+- lib/active_storage_validations/matchers/aspect_ratio_validator_matcher.rb
 - lib/active_storage_validations/matchers/attached_validator_matcher.rb
+- lib/active_storage_validations/matchers/base_comparison_validator_matcher.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/duration_validator_matcher.rb
+- lib/active_storage_validations/matchers/limit_validator_matcher.rb
+- lib/active_storage_validations/matchers/processable_file_validator_matcher.rb
+- lib/active_storage_validations/matchers/shared/asv_active_storageable.rb
+- lib/active_storage_validations/matchers/shared/asv_allow_blankable.rb
+- lib/active_storage_validations/matchers/shared/asv_attachable.rb
+- lib/active_storage_validations/matchers/shared/asv_contextable.rb
+- lib/active_storage_validations/matchers/shared/asv_messageable.rb
+- lib/active_storage_validations/matchers/shared/asv_rspecable.rb
+- lib/active_storage_validations/matchers/shared/asv_validatable.rb
 - lib/active_storage_validations/matchers/size_validator_matcher.rb
-- lib/active_storage_validations/metadata.rb
+- lib/active_storage_validations/matchers/total_size_validator_matcher.rb
+- lib/active_storage_validations/processable_file_validator.rb
 - lib/active_storage_validations/railtie.rb
+- lib/active_storage_validations/shared/asv_active_storageable.rb
+- lib/active_storage_validations/shared/asv_analyzable.rb
+- lib/active_storage_validations/shared/asv_attachable.rb
+- lib/active_storage_validations/shared/asv_errorable.rb
+- lib/active_storage_validations/shared/asv_loggable.rb
+- lib/active_storage_validations/shared/asv_optionable.rb
+- lib/active_storage_validations/shared/asv_symbolizable.rb
 - lib/active_storage_validations/size_validator.rb
+- lib/active_storage_validations/total_size_validator.rb
 - lib/active_storage_validations/version.rb
 - lib/tasks/active_storage_validations_tasks.rake
 homepage: https://github.com/igorkasyanchuk/active_storage_validations
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -216,14 +322,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Validations for Active Storage