active_storage_validations 1.0.4 → 3.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 3.0.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2025-09-13 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,35 +109,61 @@ 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: pry
+  name: minitest-stub_any_instance
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        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: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,21 +177,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +205,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,19 +219,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: globalid
+  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
@@ -202,7 +242,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/locales/da.yml
 - config/locales/de.yml
+- config/locales/en-GB.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
@@ -212,33 +254,73 @@ 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/pdf_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/pages_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/option_proc_unfolding.rb
-- lib/active_storage_validations/processable_image_validator.rb
+- lib/active_storage_validations/matchers/total_size_validator_matcher.rb
+- lib/active_storage_validations/pages_validator.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'
+  changelog_uri: https://github.com/igorkasyanchuk/active_storage_validations/blob/master/CHANGES.md
+  source_code_uri: https://github.com/igorkasyanchuk/active_storage_validations
+  bug_tracker_uri: https://github.com/igorkasyanchuk/active_storage_validations/issues
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -247,14 +329,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.4.13
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Validations for Active Storage

data/lib/active_storage_validations/metadata.rb

@@ -1,151 +0,0 @@
-module ActiveStorageValidations
-  class Metadata
-    class InvalidImageError < StandardError; end
-
-    attr_reader :file
-
-    def initialize(file)
-      require_image_processor
-      @file = file
-    end
-
-    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
-        require 'vips' unless defined?(Vips)
-      else
-        require 'mini_magick' unless defined?(MiniMagick)
-      end
-    end
-
-    def metadata
-      read_image do |image|
-        if rotated_image?(image)
-          { width: image.height, height: image.width }
-        else
-          { width: image.width, height: image.height }
-        end
-      end
-    rescue InvalidImageError
-      logger.info "Skipping image analysis because ImageMagick or Vips doesn't support the file"
-      {}
-    end
-
-    def valid?
-      read_image
-      true
-    rescue InvalidImageError
-      false
-    end
-
-    private
-
-    def read_image
-      is_string = file.is_a?(String)
-      if is_string || file.is_a?(ActiveStorage::Blob)
-        blob =
-          if is_string
-            if Rails.gem_version < Gem::Version.new('6.1.0')
-              ActiveStorage::Blob.find_signed(file)
-            else
-              ActiveStorage::Blob.find_signed!(file)
-            end
-          else
-            file
-          end
-
-        tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
-        tempfile.binmode
-
-        blob.download do |chunk|
-          tempfile.write(chunk)
-        end
-
-        tempfile.flush
-        tempfile.rewind
-
-        image = new_image_from_path(tempfile.path)
-      else
-        file_path = read_file_path
-        image = new_image_from_path(file_path)
-      end
-
-
-      raise InvalidImageError unless valid_image?(image)
-      yield image if block_given?
-    rescue LoadError, NameError
-      logger.info "Skipping image analysis because the mini_magick or ruby-vips gem isn't installed"
-      {}
-    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 new_image_from_path(path)
-      if image_processor == :vips && defined?(Vips) && (Vips::get_suffixes.include?(File.extname(path).downcase) || !Vips::respond_to?(:vips_foreign_get_suffixes))
-        Vips::Image.new_from_file(path)
-      elsif defined?(MiniMagick)
-        MiniMagick::Image.new(path)
-      end
-    end
-
-    def valid_image?(image)
-      return false unless image
-
-      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 && 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 exception_class # field "exif-ifd0-Orientation" not found
-      false
-    end
-
-    def read_file_path
-      case file
-      when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile
-        file.path
-      when Hash
-        io = file.fetch(:io)
-        if io.is_a?(StringIO)
-          tempfile = Tempfile.new([File.basename(file[:filename], '.*'), File.extname(file[:filename])])
-          tempfile.binmode
-          IO.copy_stream(io, tempfile)
-          io.rewind
-          tempfile.flush
-          tempfile.rewind
-          tempfile.path
-        else
-          File.open(io).path
-        end
-      else
-        raise "Something wrong with params."
-      end
-    end
-
-    def logger
-      Rails.logger
-    end
-
-  end
-end

data/lib/active_storage_validations/option_proc_unfolding.rb

@@ -1,16 +0,0 @@
-module ActiveStorageValidations
-  module OptionProcUnfolding
-
-    def unfold_procs(record, object, only_keys)
-      case object
-      when Hash
-        object.merge(object) { |key, value| only_keys&.exclude?(key) ? {} : unfold_procs(record, value, nil) }
-      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/processable_image_validator.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'metadata.rb'
-
-module ActiveStorageValidations
-  class ProcessableImageValidator < ActiveModel::EachValidator # :nodoc
-    include OptionProcUnfolding
-
-    if Rails.gem_version >= Gem::Version.new('6.0.0')
-      def validate_each(record, attribute, _value)
-        return true unless record.send(attribute).attached?
-
-        changes = record.attachment_changes[attribute.to_s]
-        return true if changes.blank?
-
-        files = Array.wrap(changes.is_a?(ActiveStorage::Attached::Changes::CreateMany) ? changes.attachables : changes.attachable)
-
-        files.each do |file|
-          add_error(record, attribute, :image_not_processable) unless Metadata.new(file).valid?
-        end
-      end
-    else
-      # Rails 5
-      def validate_each(record, attribute, _value)
-        return true unless record.send(attribute).attached?
-
-        files = Array.wrap(record.send(attribute))
-
-        files.each do |file|
-          add_error(record, attribute, :image_not_processable) unless Metadata.new(file).valid?
-        end
-      end
-    end
-
-    private
-
-    def add_error(record, attribute, default_message)
-      message = options[:message].presence || default_message
-      return if record.errors.added?(attribute, message)
-      record.errors.add(attribute, message)
-    end
-  end
-end