active_storage_validations 2.0.1 → 2.0.3

data/lib/active_storage_validations/matchers/attached_validator_matcher.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/base_comparison_validator_matcher.rb

@@ -3,13 +3,13 @@
 # Big thank you to the paperclip validation matchers:
 # https://github.com/thoughtbot/paperclip/blob/v6.1.0/lib/paperclip/matchers/validate_attachment_size_matcher.rb
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_allow_blankable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_allow_blankable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -3,13 +3,13 @@
 # Big thank you to the paperclip validation matchers:
 # https://github.com/thoughtbot/paperclip/blob/v6.1.0/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_allow_blankable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_allow_blankable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers
@@ -40,18 +40,20 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate the content types of :#{@attribute_name}"]
+        message = [ "is expected to validate the content types of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end
 
       def allowing(*content_types)
-        @allowed_content_types = content_types.map { |content_type| normalize_content_type(content_type) }.flatten
+        types = content_types.flatten
+        @allowed_content_types = types.map { |content_type| normalize_content_type(content_type) }.flatten
         self
       end
 
       def rejecting(*content_types)
-        @rejected_content_types = content_types.map { |content_type| normalize_content_type(content_type) }.flatten
+        types = content_types.flatten
+        @rejected_content_types = types.map { |content_type| normalize_content_type(content_type) }.flatten
         self
       end
 
@@ -122,14 +124,14 @@ module ActiveStorageValidations
       end
 
       def attach_invalid_content_type_file
-        @subject.public_send(@attribute_name).attach(attachment_for('fake/fake'))
+        @subject.public_send(@attribute_name).attach(attachment_for("fake/fake"))
       end
 
       def attachment_for(content_type)
-        suffix = Marcel::TYPE_EXTS[content_type.to_s]&.first || 'fake'
+        suffix = Marcel::TYPE_EXTS[content_type.to_s]&.first || "fake"
 
         {
-          io: Tempfile.new('.'),
+          io: Tempfile.new("."),
           filename: "test.#{suffix}",
           content_type: content_type
         }

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_allow_blankable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_allow_blankable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers
@@ -37,7 +37,7 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate dimensions of :#{@attribute_name}"]
+        message = [ "is expected to validate dimensions of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end

data/lib/active_storage_validations/matchers/duration_validator_matcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_comparison_validator_matcher'
+require_relative "base_comparison_validator_matcher"
 
 module ActiveStorageValidations
   module Matchers
@@ -14,7 +14,7 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate file duration of :#{@attribute_name}"]
+        message = [ "is expected to validate file duration of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end

data/lib/active_storage_validations/matchers/limit_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_allow_blankable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_allow_blankable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers
@@ -37,7 +37,7 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate limit file of :#{@attribute_name}"]
+        message = [ "is expected to validate limit file of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end

data/lib/active_storage_validations/matchers/processable_file_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_allow_blankable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_contextable'
-require_relative 'shared/asv_messageable'
-require_relative 'shared/asv_rspecable'
-require_relative 'shared/asv_validatable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_allow_blankable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_contextable"
+require_relative "shared/asv_messageable"
+require_relative "shared/asv_rspecable"
+require_relative "shared/asv_validatable"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/shared/asv_active_storageable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/shared/asv_allow_blankable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/shared/asv_attachable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers
@@ -38,29 +38,29 @@ module ActiveStorageValidations
       def dummy_file
         {
           io: io,
-          filename: 'test.png',
-          content_type: 'image/png'
+          filename: "test.png",
+          content_type: "image/png"
         }
       end
 
       def processable_image
         {
           io: StringIO.new(image_data),
-          filename: 'processable_image.png',
-          content_type: 'image/png'
+          filename: "processable_image.png",
+          content_type: "image/png"
         }
       end
 
       def not_processable_image
         {
-          io: Tempfile.new('.'),
-          filename: 'not_processable_image.txt',
-          content_type: 'text/plain'
+          io: Tempfile.new("."),
+          filename: "not_processable_image.txt",
+          content_type: "text/plain"
         }
       end
 
       def io
-        @io ||= Tempfile.new('Hello world!')
+        @io ||= Tempfile.new("Hello world!")
       end
 
       def image_data

data/lib/active_storage_validations/matchers/shared/asv_contextable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers
@@ -21,8 +21,8 @@ module ActiveStorageValidations
       def is_context_valid?
         return true if !@context && attribute_validators.none? { |validator| validator.options[:on] }
 
-        raise ArgumentError, "This validator matcher needs the #on option to work since its validator has one" if !@context && attribute_validators.all? { |validator| validator.options[:on] }
-        raise ArgumentError, "This validator matcher option only allows a symbol or an array" if !(@context.is_a?(Symbol) || @context.is_a?(Array))
+        ensure_context_present!
+        ensure_context_valid!
 
         if @context.is_a?(Array)
           (validator_contexts & @context.map(&:to_s)) == validator_contexts || raise_context_not_listed_error
@@ -31,6 +31,14 @@ module ActiveStorageValidations
         end
       end
 
+      def ensure_context_present!
+        raise ArgumentError, "This validator matcher needs the #on option to work since its validator has one" if !@context && attribute_validators.all? { |validator| validator.options[:on] }
+      end
+
+      def ensure_context_valid!
+        raise ArgumentError, "This validator matcher option only allows a symbol or an array" if !(@context.is_a?(Symbol) || @context.is_a?(Array))
+      end
+
       def validator_contexts
         attribute_validators.map do |validator|
           case validator.options[:on]

data/lib/active_storage_validations/matchers/shared/asv_messageable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/shared/asv_rspecable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers
@@ -20,7 +20,7 @@ module ActiveStorageValidations
       end
 
       def failure_message_when_negated
-        failure_message.sub(/is expected to validate/, 'is expected not to validate')
+        failure_message.sub(/is expected to validate/, "is expected not to validate")
       end
     end
   end

data/lib/active_storage_validations/matchers/shared/asv_validatable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 
 module ActiveStorageValidations
   module Matchers
@@ -33,7 +33,7 @@ module ActiveStorageValidations
       end
 
       def validator_class
-        self.class.name.gsub(/::Matchers|Matcher/, '').constantize
+        self.class.name.gsub(/::Matchers|Matcher/, "").constantize
       end
 
       def attribute_validator

data/lib/active_storage_validations/matchers/size_validator_matcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_comparison_validator_matcher'
+require_relative "base_comparison_validator_matcher"
 
 module ActiveStorageValidations
   module Matchers
@@ -14,7 +14,7 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate file size of :#{@attribute_name}"]
+        message = [ "is expected to validate file size of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end

data/lib/active_storage_validations/matchers/total_size_validator_matcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_comparison_validator_matcher'
+require_relative "base_comparison_validator_matcher"
 
 module ActiveStorageValidations
   module Matchers
@@ -14,7 +14,7 @@ module ActiveStorageValidations
       end
 
       def failure_message
-        message = ["is expected to validate total file size of :#{@attribute_name}"]
+        message = [ "is expected to validate total file size of :#{@attribute_name}" ]
         build_failure_message(message)
         message.join("\n")
       end
@@ -23,7 +23,7 @@ module ActiveStorageValidations
 
       def attach_file
         # has_many_attached relation
-        @subject.public_send(@attribute_name).attach([dummy_blob])
+        @subject.public_send(@attribute_name).attach([ dummy_blob ])
         @subject.public_send(@attribute_name)
       end
 

data/lib/active_storage_validations/matchers.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_storage_validations/matchers/aspect_ratio_validator_matcher'
-require 'active_storage_validations/matchers/attached_validator_matcher'
-require 'active_storage_validations/matchers/processable_file_validator_matcher'
-require 'active_storage_validations/matchers/limit_validator_matcher'
-require 'active_storage_validations/matchers/content_type_validator_matcher'
-require 'active_storage_validations/matchers/dimension_validator_matcher'
-require 'active_storage_validations/matchers/duration_validator_matcher'
-require 'active_storage_validations/matchers/size_validator_matcher'
-require 'active_storage_validations/matchers/total_size_validator_matcher'
+require "active_storage_validations/matchers/aspect_ratio_validator_matcher"
+require "active_storage_validations/matchers/attached_validator_matcher"
+require "active_storage_validations/matchers/processable_file_validator_matcher"
+require "active_storage_validations/matchers/limit_validator_matcher"
+require "active_storage_validations/matchers/content_type_validator_matcher"
+require "active_storage_validations/matchers/dimension_validator_matcher"
+require "active_storage_validations/matchers/duration_validator_matcher"
+require "active_storage_validations/matchers/size_validator_matcher"
+require "active_storage_validations/matchers/total_size_validator_matcher"
 
 module ActiveStorageValidations
   module Matchers
@@ -22,7 +22,7 @@ module ActiveStorageValidations
         RSpec::Mocks.allow_message(object, method) { result }
         yield
       else
-        raise 'Need either Minitest::Mock or RSpec::Mocks to run this validator matcher'
+        raise "Need either Minitest::Mock or RSpec::Mocks to run this validator matcher"
       end
     end
 

data/lib/active_storage_validations/processable_file_validator.rb

@@ -1,37 +1,37 @@
-# frozen_string_literal: true
-
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_analyzable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_errorable'
-require_relative 'shared/asv_symbolizable'
-
-module ActiveStorageValidations
-  class ProcessableFileValidator < ActiveModel::EachValidator # :nodoc
-    include ASVActiveStorageable
-    include ASVAnalyzable
-    include ASVAttachable
-    include ASVErrorable
-    include ASVSymbolizable
-
-    ERROR_TYPES = %i[
-      file_not_processable
-    ].freeze
-    METADATA_KEYS = %i[].freeze
-
-    def validate_each(record, attribute, _value)
-      return if no_attachments?(record, attribute)
-
-      validate_changed_files_from_metadata(record, attribute, METADATA_KEYS)
-    end
-
-    private
-
-    def is_valid?(record, attribute, attachable, metadata)
-      return if !metadata.empty?
-
-      errors_options = initialize_error_options(options, attachable)
-      add_error(record, attribute, ERROR_TYPES.first , **errors_options)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_analyzable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_errorable"
+require_relative "shared/asv_symbolizable"
+
+module ActiveStorageValidations
+  class ProcessableFileValidator < ActiveModel::EachValidator # :nodoc
+    include ASVActiveStorageable
+    include ASVAnalyzable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVSymbolizable
+
+    ERROR_TYPES = %i[
+      file_not_processable
+    ].freeze
+    METADATA_KEYS = %i[].freeze
+
+    def validate_each(record, attribute, _value)
+      return if no_attachments?(record, attribute)
+
+      validate_changed_files_from_metadata(record, attribute, METADATA_KEYS)
+    end
+
+    private
+
+    def is_valid?(record, attribute, attachable, metadata)
+      return if !metadata.empty?
+
+      errors_options = initialize_error_options(options, attachable)
+      add_error(record, attribute, ERROR_TYPES.first, **errors_options)
+    end
+  end
+end

data/lib/active_storage_validations/railtie.rb

@@ -2,7 +2,13 @@
 
 module ActiveStorageValidations
   class Railtie < ::Rails::Railtie
-    initializer 'active_storage_validations.extend_active_storage_blob' do
+    initializer "active_storage_validations.configure", after: :load_config_initializers do
+      ActiveSupport.on_load(:active_record) do
+        send :include, ActiveStorageValidations
+      end
+    end
+
+    initializer "active_storage_validations.extend_active_storage_blob" do
       ActiveSupport.on_load(:active_storage_blob) do
         include(ActiveStorageValidations::ASVBlobMetadatable)
       end