active_storage_validations 3.0.5 → 4.0.0

data/lib/active_storage_validations/shared/asv_commandable.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  # ActiveStorageValidations::ASVCommandable
+  #
+  # Runs external analyzer commands with an optional deadline and process-group
+  # kill. Used by analyzers that shell out (ffprobe, pdfinfo, file, identify).
+  module ASVCommandable
+    extend ActiveSupport::Concern
+
+    CommandResult = Struct.new(:stdout, :stderr, :status, :timed_out, keyword_init: true) do
+      def success?
+        !timed_out && status.respond_to?(:success?) && status.success?
+      end
+    end
+
+    TERM_GRACE_SECONDS = 1
+
+    private
+
+    def run_command(*argv, payload: nil)
+      timeout = timeout_in_seconds
+      stdout_reader, stdout_writer = IO.pipe
+      stderr_reader, stderr_writer = IO.pipe
+
+      pid = Process.spawn(*argv.map(&:to_s), out: stdout_writer, err: stderr_writer, pgroup: true)
+      stdout_writer.close
+      stderr_writer.close
+
+      # Drain pipes concurrently so a chatty child cannot fill the buffer and
+      # deadlock while we wait / kill it.
+      stdout_thread = Thread.new { stdout_reader.read }
+      stderr_thread = Thread.new { stderr_reader.read }
+
+      status, timed_out = wait_for_command(pid, timeout)
+      mark_timed_out!(payload, argv.first) if timed_out
+
+      CommandResult.new(
+        stdout: stdout_thread.value,
+        stderr: stderr_thread.value,
+        status: status,
+        timed_out: timed_out
+      )
+    ensure
+      close_pipe(stdout_reader)
+      close_pipe(stderr_reader)
+      close_pipe(stdout_writer)
+      close_pipe(stderr_writer)
+    end
+
+    # Waits via a reaper thread + Thread#join(timeout) so fast commands return
+    # as soon as they exit (no polling sleep). On timeout, TERM then always KILL
+    # the process group — KILL is unconditional because the direct child can exit
+    # on TERM while a grandchild forked after the group signal is still alive.
+    # The same waiter reaps so we never leave zombies.
+    def wait_for_command(pid, timeout)
+      return [ Process.wait2(pid)[1], false ] if timeout.nil?
+
+      waiter = Thread.new do
+        Process.wait2(pid)
+      rescue Errno::ECHILD
+        nil
+      end
+
+      if waiter.join(timeout)
+        return [ wait_status_from(waiter), false ]
+      end
+
+      signal_process_group(pid, :TERM)
+      waiter.join(TERM_GRACE_SECONDS)
+      signal_process_group(pid, :KILL)
+      waiter.join
+
+      [ wait_status_from(waiter), true ]
+    end
+
+    def wait_status_from(waiter)
+      waiter.value&.last
+    end
+
+    def signal_process_group(pid, signal)
+      Process.kill(signal, -pid)
+    rescue Errno::ESRCH
+      # Already exited; waiter will reap.
+    end
+
+    def close_pipe(io)
+      io&.close unless io.nil? || io.closed?
+    end
+
+    def monotonic_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+  end
+end

data/lib/active_storage_validations/shared/asv_optionable.rb

@@ -22,7 +22,11 @@ module ActiveStorageValidations
       when Array
         options.map { |option| flatten_options(record, option, available_checks) }
       else
-        options.is_a?(Proc) ? options.call(record) : options
+        if options.is_a?(Proc)
+          options.arity == 0 ? options.call : options.call(record)
+        else
+          options
+        end
       end
     end
   end

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = "3.0.5"
+  VERSION = "4.0.0"
 end

data/lib/active_storage_validations.rb

@@ -2,8 +2,29 @@
 
 require "active_model"
 require "active_support/concern"
+require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/numeric/time"
+
+module ActiveStorageValidations
+  # When true (default), FormBuilder#file_field automatically sets the HTML
+  # +accept+ attribute from +content_type+ validators. Can also be overridden
+  # per field with +infer_accept:+.
+  mattr_accessor :infer_file_field_accept, instance_accessor: false, default: true
+
+  # Maximum time allowed for external analyzer commands (ffprobe, pdfinfo, file,
+  # magika, MiniMagick, libvips). Set to +nil+ to disable. Per-validator +timeout:+
+  # overrides this value for the analysis that validator triggers.
+  mattr_accessor :command_timeout, instance_accessor: false, default: 10.seconds
+
+  def self.configure
+    yield self
+  end
+end
 
 require "active_storage_validations/analyzer"
+require "active_storage_validations/analyzer/content_type_analyzer"
+require "active_storage_validations/analyzer/content_type_analyzer/file"
+require "active_storage_validations/analyzer/content_type_analyzer/magika"
 require "active_storage_validations/analyzer/image_analyzer"
 require "active_storage_validations/analyzer/image_analyzer/image_magick"
 require "active_storage_validations/analyzer/image_analyzer/vips"
@@ -26,5 +47,6 @@ require "active_storage_validations/size_validator"
 require "active_storage_validations/total_size_validator"
 require "active_storage_validations/pages_validator"
 
+require "active_storage_validations/form_builder"
 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: 3.0.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-17 00:00:00.000000000 Z
+date: 2026-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -109,73 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.9.5
 - !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: minitest-mock_expectations
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-stub_any_instance
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '7.0'
   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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +192,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: Validations for Active Storage (presence)
+description: Validations for Active Storage (presence, size, content type, ...)
 email:
 - igorkasyanchuk@gmail.com
 executables: []
@@ -263,6 +223,8 @@ files:
 - 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/content_type_analyzer/file.rb
+- lib/active_storage_validations/analyzer/content_type_analyzer/magika.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
@@ -279,6 +241,7 @@ files:
 - 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/form_builder.rb
 - lib/active_storage_validations/limit_validator.rb
 - lib/active_storage_validations/matchers.rb
 - lib/active_storage_validations/matchers/aspect_ratio_validator_matcher.rb
@@ -294,8 +257,11 @@ files:
 - 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_except_onable.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_spoofing_protectable.rb
+- lib/active_storage_validations/matchers/shared/asv_timeoutable.rb
 - lib/active_storage_validations/matchers/shared/asv_validatable.rb
 - lib/active_storage_validations/matchers/size_validator_matcher.rb
 - lib/active_storage_validations/matchers/total_size_validator_matcher.rb
@@ -305,6 +271,7 @@ files:
 - 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_commandable.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
@@ -328,7 +295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="