active_storage_validations 2.0.1 → 2.0.3

data/lib/active_storage_validations/shared/asv_attachable.rb

@@ -18,7 +18,14 @@ module ActiveStorageValidations
     # to perform file analyses.
     def validate_changed_files_from_metadata(record, attribute, metadata_keys)
       attachables_and_blobs(record, attribute).each do |attachable, blob|
-        is_valid?(record, attribute, attachable, metadata_for(blob, attachable, metadata_keys))
+        metadata = begin
+          metadata_for(blob, attachable, metadata_keys)
+        rescue ActiveStorage::FileNotFoundError
+          add_attachment_missing_error(record, attribute, attachable)
+          next
+        end
+
+        is_valid?(record, attribute, attachable, metadata)
       end
     end
 
@@ -32,11 +39,7 @@ module ActiveStorageValidations
     # Some file could be passed several times, we just need to perform the
     # analysis once on the file, therefore the use of #uniq.
     def attachables_and_blobs(record, attribute)
-      changes = if record.public_send(attribute).is_a?(ActiveStorage::Attached::One)
-        record.attachment_changes[attribute.to_s].presence || record.public_send(attribute)
-      else
-        record.attachment_changes[attribute.to_s]
-      end
+      changes = changes_for(record, attribute)
 
       return to_enum(:attachables_and_blobs, record, attribute) if changes.blank? || !block_given?
 
@@ -49,7 +52,16 @@ module ActiveStorageValidations
       end
     end
 
+    def changes_for(record, attribute)
+      if record.public_send(attribute).is_a?(ActiveStorage::Attached::One)
+        record.attachment_changes[attribute.to_s].presence || record.public_send(attribute)
+      else
+        record.attachment_changes[attribute.to_s]
+      end
+    end
+
     # Retrieve the full declared content_type from attachable.
+    # rubocop:disable Metrics/MethodLength
     def full_attachable_content_type(attachable)
       case attachable
       when ActiveStorage::Blob
@@ -71,6 +83,7 @@ module ActiveStorageValidations
         raise_rails_like_error(attachable)
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Retrieve the declared content_type from attachable without potential mime
     # type parameters (e.g. 'application/x-rar-compressed;version=5')
@@ -102,32 +115,36 @@ module ActiveStorageValidations
     end
 
     # Retrieve the io from attachable.
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def attachable_io(attachable, max_byte_size: nil)
       io = case attachable
-           when ActiveStorage::Blob
-             (max_byte_size && supports_blob_download_chunk?) ? attachable.download_chunk(0...max_byte_size) : attachable.download
-           when ActionDispatch::Http::UploadedFile
-             max_byte_size ? attachable.read(max_byte_size) : attachable.read
-           when Rack::Test::UploadedFile
-             max_byte_size ? attachable.read(max_byte_size) : attachable.read
-           when String
-             blob = ActiveStorage::Blob.find_signed!(attachable)
-             (max_byte_size && supports_blob_download_chunk?) ? blob.download_chunk(0...max_byte_size) : blob.download
-           when Hash
-             max_byte_size ? attachable[:io].read(max_byte_size) : attachable[:io].read
-           when File
-             raise_rails_like_error(attachable) unless supports_file_attachment?
-             max_byte_size ? attachable.read(max_byte_size) : attachable.read
-           when Pathname
-             raise_rails_like_error(attachable) unless supports_pathname_attachment?
-             max_byte_size ? attachable.read(max_byte_size) : attachable.read
-           else
-             raise_rails_like_error(attachable)
-           end
+      when ActiveStorage::Blob
+        (max_byte_size && supports_blob_download_chunk?) ? attachable.download_chunk(0...max_byte_size) : attachable.download
+      when ActionDispatch::Http::UploadedFile
+        max_byte_size ? attachable.read(max_byte_size) : attachable.read
+      when Rack::Test::UploadedFile
+        max_byte_size ? attachable.read(max_byte_size) : attachable.read
+      when String
+        blob = ActiveStorage::Blob.find_signed!(attachable)
+        (max_byte_size && supports_blob_download_chunk?) ? blob.download_chunk(0...max_byte_size) : blob.download
+      when Hash
+        max_byte_size ? attachable[:io].read(max_byte_size) : attachable[:io].read
+      when File
+        raise_rails_like_error(attachable) unless supports_file_attachment?
+        max_byte_size ? attachable.read(max_byte_size) : attachable.read
+      when Pathname
+        raise_rails_like_error(attachable) unless supports_pathname_attachment?
+        max_byte_size ? attachable.read(max_byte_size) : attachable.read
+      else
+        raise_rails_like_error(attachable)
+      end
 
       rewind_attachable_io(attachable)
       io
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
 
     # Rewind the io attachable.
     def rewind_attachable_io(attachable)
@@ -150,6 +167,7 @@ module ActiveStorageValidations
     end
 
     # Retrieve the declared filename from attachable.
+    # rubocop:disable Metrics/MethodLength
     def attachable_filename(attachable)
       case attachable
       when ActiveStorage::Blob
@@ -171,6 +189,7 @@ module ActiveStorageValidations
         raise_rails_like_error(attachable)
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Raise the same Rails error for not-implemented file representations.
     def raise_rails_like_error(attachable)
@@ -185,7 +204,7 @@ module ActiveStorageValidations
     #
     # https://github.com/rails/rails/blob/7-1-stable/activestorage/CHANGELOG.md#rails-710rc1-september-27-2023
     def supports_file_attachment?
-      Rails.gem_version >= Gem::Version.new('7.1.0.rc1')
+      Rails.gem_version >= Gem::Version.new("7.1.0.rc1")
     end
     alias :supports_pathname_attachment? :supports_file_attachment?
 
@@ -193,12 +212,25 @@ module ActiveStorageValidations
     #
     # https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md#rails-700alpha1-september-15-2021
     def supports_blob_download_chunk?
-      Rails.gem_version >= Gem::Version.new('7.0.0.alpha1')
+      Rails.gem_version >= Gem::Version.new("7.0.0.alpha1")
     end
 
     # Retrieve the content_type from the file name only
     def marcel_content_type_from_filename(attachable)
       Marcel::MimeType.for(name: attachable_filename(attachable).to_s)
     end
+
+    # Add a media metadata missing error when metadata is missing.
+    def add_media_metadata_missing_error(record, attribute, attachable, already_set_errors_options = nil)
+      errors_options = already_set_errors_options || initialize_error_options(options, attachable)
+      add_error(record, attribute, :media_metadata_missing, **errors_options)
+    end
+
+    # Add an attachment missing error when an ActiveStorage::FileNotFoundError
+    # is raised.
+    def add_attachment_missing_error(record, attribute, attachable)
+      errors_options = initialize_error_options(options, attachable)
+      add_error(record, attribute, :attachment_missing, **errors_options)
+    end
   end
 end

data/lib/active_storage_validations/shared/asv_errorable.rb

@@ -5,7 +5,7 @@ module ActiveStorageValidations
     extend ActiveSupport::Concern
 
     def initialize_error_options(options, file = nil)
-      not_explicitly_written_options = %i(with in)
+      not_explicitly_written_options = %i[with in]
       curated_options = options.except(*not_explicitly_written_options)
 
       active_storage_validations_options = {

data/lib/active_storage_validations/shared/asv_symbolizable.rb

@@ -7,7 +7,7 @@ module ActiveStorageValidations
     class_methods do
       def to_sym
         validator_class = self.name.split("::").last
-        validator_class.sub(/Validator/, '').underscore.to_sym
+        validator_class.sub(/Validator/, "").underscore.to_sym
       end
     end
   end

data/lib/active_storage_validations/size_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_comparison_validator'
+require_relative "base_comparison_validator"
 
 module ActiveStorageValidations
   class SizeValidator < BaseComparisonValidator

data/lib/active_storage_validations/total_size_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_comparison_validator'
+require_relative "base_comparison_validator"
 
 module ActiveStorageValidations
   class TotalSizeValidator < BaseComparisonValidator
@@ -40,7 +40,7 @@ module ActiveStorageValidations
       # 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'
+        raise ArgumentError, "This validator is only available for has_many_attached relations"
       end
     end
 

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = '2.0.1'
+  VERSION = "2.0.3"
 end

data/lib/active_storage_validations.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
 
-require 'active_model'
-require 'active_support/concern'
+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/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/extensors/asv_blob_metadatable"
+require "active_storage_validations/extensors/asv_marcelable"
 
-require 'active_storage_validations/railtie'
-require 'active_storage_validations/engine'
-require 'active_storage_validations/attached_validator'
-require 'active_storage_validations/content_type_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'
+require "active_storage_validations/attached_validator"
+require "active_storage_validations/content_type_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: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 2025-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -244,6 +244,7 @@ files:
 - 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