active_storage_validations 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435de3a42881b172293cf50bc3edb1e5462f4a0f8346543f14936502abe7a041
-  data.tar.gz: 6dc253e3b1dcf5ac55ae13bcd4fe9d9cabe39cdf49e0de25cc0f091bfb5c3d1b
+  metadata.gz: c5908eeb81003dac14877a0427050b3db222977413379a2c55382676272115e4
+  data.tar.gz: 5a49abac59e29c7ba055284fd437a8c1872f9e200c0b7491c613dae8f5152438
 SHA512:
-  metadata.gz: bfd15f884cda85c47ad25c1d7e2ca8423f6d6a9e3e4aadeb415492c3a9830a00b10c611ed0eb0a5866bd12e1c2b61aaa69cfccf3952447c3cd716c07e51780c5
-  data.tar.gz: 91ab2c226d9657f52f6cc5f289fb8697608954d59d34400042e0521b7e60657e5ac5f256b268eef16fd1ffcd83169f61345ba3e7c9e925d1384d427f10a00bad
+  metadata.gz: b46c3457c3042e514e9401eb011d2c9bfd880ff3c42d38595b3e33010b95f57e5310bffbbc6af350aacbb55accf3f60cd33b3f7333ee33fceed105aac4e49d64
+  data.tar.gz: bebee3a79850fa031e4f8cbdd8d16aec5212e3214d17da6f38f72feb4713320f1ba2b351ba331ac155e0aa637632a50781d36749983aa643fa5f9591ba4a86ea

data/README.md

@@ -221,7 +221,8 @@ aspect_ratio_is_not: "must be a %{aspect_ratio} image"
 
 ### Content type
 The `content_type_invalid` key has three variables that you can use:
-- `content_type` containing the content type of the sent file
+- `content_type` containing the exact content type of the sent file
+- `human_content_type` containing a more user-friendly version of the sent file content type (e.g. 'TXT' for 'text/plain')
 - `authorized_types` containing the list of authorized content types
 - `filename` containing the current file name
 
@@ -436,6 +437,7 @@ Then you can use the matchers with the syntax specified in the RSpec section, ju
 
 To run tests in root folder of gem:
 
+* `BUNDLE_GEMFILE=gemfiles/rails_6_1_4.gemfile bundle exec rake test` to run for Rails 7.0
 * `BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rake test` to run for Rails 7.0
 * `BUNDLE_GEMFILE=gemfiles/rails_7_1.gemfile bundle exec rake test` to run for Rails 7.1
 * `BUNDLE_GEMFILE=gemfiles/rails_7_2.gemfile bundle exec rake test` to run for Rails 7.2
@@ -444,10 +446,12 @@ To run tests in root folder of gem:
 Snippet to run in console:
 
 ```bash
+BUNDLE_GEMFILE=gemfiles/rails_6_1_4.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_7_1.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_7_2.gemfile bundle
 BUNDLE_GEMFILE=gemfiles/rails_8_0.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_6_1_4.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_7_1.gemfile bundle exec rake test
 BUNDLE_GEMFILE=gemfiles/rails_7_2.gemfile bundle exec rake test

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/optionable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
-    include ActiveStorageable
-    include Attachable
-    include Errorable
-    include Optionable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
 
     AVAILABLE_CHECKS = %i[with].freeze
     NAMED_ASPECT_RATIOS = %i[square portrait landscape].freeze

data/lib/active_storage_validations/attached_validator.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class AttachedValidator < ActiveModel::EachValidator # :nodoc:
-    include ActiveStorageable
-    include Errorable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVErrorable
+    include ASVSymbolizable
 
     ERROR_TYPES = %i[blank].freeze
 

data/lib/active_storage_validations/base_size_validator.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/optionable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class BaseSizeValidator < ActiveModel::EachValidator # :nodoc:
-    include ActiveStorageable
-    include Errorable
-    include Optionable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
 
     delegate :number_to_human_size, to: ActiveSupport::NumberHelper
 

data/lib/active_storage_validations/content_type_spoof_detector.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/attachable'
-require_relative 'concerns/loggable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_loggable'
 require 'open3'
 
 module ActiveStorageValidations
   class ContentTypeSpoofDetector
     class FileCommandLineToolNotInstalledError < StandardError; end
 
-    include Attachable
-    include Loggable
+    include ASVAttachable
+    include ASVLoggable
 
     def initialize(record, attribute, attachable)
       @record = record

data/lib/active_storage_validations/content_type_validator.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/optionable.rb'
-require_relative 'concerns/symbolizable.rb'
-require_relative 'content_type_spoof_detector.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
+require_relative 'content_type_spoof_detector'
 
 module ActiveStorageValidations
   class ContentTypeValidator < ActiveModel::EachValidator # :nodoc:
-    include ActiveStorageable
-    include Attachable
-    include Errorable
-    include Optionable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
 
     AVAILABLE_CHECKS = %i[with in].freeze
     ERROR_TYPES = %i[
@@ -63,10 +63,11 @@ module ActiveStorageValidations
     end
 
     def extension_matches_content_type?(record, attribute, attachable)
-      extension = @attachable_filename.split('.').second
+      return true if !@attachable_filename || !@attachable_content_type
 
+      extension = @attachable_filename.split('.').last
       possible_extensions = Marcel::TYPE_EXTS[@attachable_content_type]
-      return true if possible_extensions && extension.in?(possible_extensions)
+      return true if possible_extensions && extension.downcase.in?(possible_extensions)
 
       errors_options = initialize_and_populate_error_options(options, attachable)
       add_error(record, attribute, ERROR_TYPES.first, **errors_options)
@@ -111,15 +112,23 @@ module ActiveStorageValidations
     def initialize_and_populate_error_options(options, attachable)
       errors_options = initialize_error_options(options, attachable)
       errors_options[:content_type] = @attachable_content_type
-      errors_options[:authorized_types] = authorized_content_types_to_human_format
+      errors_options[:human_content_type] = content_type_to_human_format(@attachable_content_type)
+      errors_options[:authorized_types] = content_type_to_human_format(@authorized_content_types)
       errors_options
     end
 
-    def authorized_content_types_to_human_format
-      @authorized_content_types
-        .map do |authorized_content_type|
-          authorized_content_type.is_a?(Regexp) ? authorized_content_type.source : authorized_content_type.to_s.split('/').last.upcase
+    def content_type_to_human_format(content_type)
+      Array(content_type)
+        .map do |content_type|
+          case content_type
+          when String, Symbol
+            content_type.to_s.match?(/\//) ? Marcel::TYPE_EXTS[content_type.to_s]&.first&.upcase : content_type.upcase
+          when Regexp
+            content_type.source
+          end
         end
+        .flatten
+        .compact
         .join(', ')
     end
 

data/lib/active_storage_validations/dimension_validator.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/optionable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class DimensionValidator < ActiveModel::EachValidator # :nodoc
-    include ActiveStorageable
-    include Attachable
-    include Errorable
-    include Optionable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
 
     AVAILABLE_CHECKS = %i[width height min max].freeze
     ERROR_TYPES = %i[

data/lib/active_storage_validations/limit_validator.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/optionable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_optionable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class LimitValidator < ActiveModel::EachValidator # :nodoc:
-    include ActiveStorageable
-    include Errorable
-    include Optionable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVErrorable
+    include ASVOptionable
+    include ASVSymbolizable
 
     AVAILABLE_CHECKS = %i[max min].freeze
     ERROR_TYPES = %i[

data/lib/active_storage_validations/marcel_extensor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Marcel::MimeType.extend "application/x-rar-compressed", parents: %(application/x-rar)
 Marcel::MimeType.extend "audio/x-hx-aac-adts", parents: %(audio/x-aac)
 Marcel::MimeType.extend "audio/x-m4a", parents: %(audio/mp4)

data/lib/active_storage_validations/matchers/aspect_ratio_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/allow_blankable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.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'
 
 module ActiveStorageValidations
   module Matchers
@@ -15,13 +15,13 @@ module ActiveStorageValidations
     end
 
     class AspectRatioValidatorMatcher
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable

data/lib/active_storage_validations/matchers/attached_validator_matcher.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.rb'
+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
@@ -14,12 +14,12 @@ module ActiveStorageValidations
     end
 
     class AttachedValidatorMatcher
-      include ActiveStorageable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_contextable

data/lib/active_storage_validations/matchers/base_size_validator_matcher.rb

@@ -3,26 +3,26 @@
 # 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 'concerns/active_storageable.rb'
-require_relative 'concerns/allow_blankable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.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'
 
 module ActiveStorageValidations
   module Matchers
     class BaseSizeValidatorMatcher
       # BaseSizeValidatorMatcher is an abstract class and shouldn't be instantiated directly.
 
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable

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 'concerns/active_storageable.rb'
-require_relative 'concerns/allow_blankable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.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'
 
 module ActiveStorageValidations
   module Matchers
@@ -18,13 +18,13 @@ module ActiveStorageValidations
     end
 
     class ContentTypeValidatorMatcher
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable
@@ -32,7 +32,7 @@ module ActiveStorageValidations
         initialize_messageable
         initialize_rspecable
         @attribute_name = attribute_name
-        @allowed_types = @rejected_types = []
+        @allowed_content_types = @rejected_content_types = []
       end
 
       def description
@@ -45,13 +45,13 @@ module ActiveStorageValidations
         message.join("\n")
       end
 
-      def allowing(*types)
-        @allowed_types = types.flatten
+      def allowing(*content_types)
+        @allowed_content_types = content_types.flatten
         self
       end
 
-      def rejecting(*types)
-        @rejected_types = types.flatten
+      def rejecting(*content_types)
+        @rejected_content_types = content_types.flatten
         self
       end
 
@@ -62,21 +62,21 @@ module ActiveStorageValidations
           is_context_valid? &&
           is_allowing_blank? &&
           is_custom_message_valid? &&
-          all_allowed_types_allowed? &&
-          all_rejected_types_rejected?
+          all_allowed_content_types_allowed? &&
+          all_rejected_content_types_rejected?
       end
 
       protected
 
       def build_failure_message(message)
-        if @allowed_types_not_allowed.present?
-          message << "  the following content type#{'s' if @allowed_types.count > 1} should be allowed: :#{@allowed_types.join(", :")}"
-          message << "  but #{pluralize(@allowed_types_not_allowed)} rejected"
+        if @allowed_content_types_not_allowed.present?
+          message << "  the following content type#{'s' if @allowed_content_types.count > 1} should be allowed: :#{@allowed_content_types.join(", :")}"
+          message << "  but #{pluralize(@allowed_content_types_not_allowed)} rejected"
         end
 
-        if @rejected_types_not_rejected.present?
-          message << "  the following content type#{'s' if @rejected_types.count > 1} should be rejected: :#{@rejected_types.join(", :")}"
-          message << "  but #{pluralize(@rejected_types_not_rejected)} accepted"
+        if @rejected_content_types_not_rejected.present?
+          message << "  the following content type#{'s' if @rejected_content_types.count > 1} should be rejected: :#{@rejected_content_types.join(", :")}"
+          message << "  but #{pluralize(@rejected_content_types_not_rejected)} accepted"
         end
       end
 
@@ -88,25 +88,25 @@ module ActiveStorageValidations
         end
       end
 
-      def all_allowed_types_allowed?
-        @allowed_types_not_allowed ||= @allowed_types.reject { |type| type_allowed?(type) }
-        @allowed_types_not_allowed.empty?
+      def all_allowed_content_types_allowed?
+        @allowed_content_types_not_allowed ||= @allowed_content_types.reject { |type| type_allowed?(type) }
+        @allowed_content_types_not_allowed.empty?
       end
 
-      def all_rejected_types_rejected?
-        @rejected_types_not_rejected ||= @rejected_types.select { |type| type_allowed?(type) }
-        @rejected_types_not_rejected.empty?
+      def all_rejected_content_types_rejected?
+        @rejected_content_types_not_rejected ||= @rejected_content_types.select { |type| type_allowed?(type) }
+        @rejected_content_types_not_rejected.empty?
       end
 
-      def type_allowed?(type)
-        attach_file_of_type(type)
+      def type_allowed?(content_type)
+        attach_file_with_content_type(content_type)
         validate
         detach_file
         is_valid?
       end
 
-      def attach_file_of_type(type)
-        @subject.public_send(@attribute_name).attach(attachment_for(type))
+      def attach_file_with_content_type(content_type)
+        @subject.public_send(@attribute_name).attach(attachment_for(content_type))
       end
 
       def is_custom_message_valid?
@@ -121,13 +121,13 @@ module ActiveStorageValidations
         @subject.public_send(@attribute_name).attach(attachment_for('fake/fake'))
       end
 
-      def attachment_for(type)
-        suffix = type.to_s.split('/').last
+      def attachment_for(content_type)
+        suffix = Marcel::TYPE_EXTS[content_type.to_s]&.first || 'fake'
 
         {
           io: Tempfile.new('.'),
           filename: "test.#{suffix}",
-          content_type: type
+          content_type: content_type
         }
       end
 

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/allow_blankable.rb'
-require_relative 'concerns/attachable'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.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'
 
 module ActiveStorageValidations
   module Matchers
@@ -15,13 +15,13 @@ module ActiveStorageValidations
     end
 
     class DimensionValidatorMatcher
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable

data/lib/active_storage_validations/matchers/limit_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable'
-require_relative 'concerns/allow_blankable'
-require_relative 'concerns/attachable'
-require_relative 'concerns/contextable'
-require_relative 'concerns/messageable'
-require_relative 'concerns/rspecable'
-require_relative 'concerns/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
@@ -15,13 +15,13 @@ module ActiveStorageValidations
     end
 
     class LimitValidatorMatcher
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable

data/lib/active_storage_validations/matchers/processable_image_validator_matcher.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/allow_blankable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/contextable.rb'
-require_relative 'concerns/messageable.rb'
-require_relative 'concerns/rspecable.rb'
-require_relative 'concerns/validatable.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'
 
 module ActiveStorageValidations
   module Matchers
@@ -15,13 +15,13 @@ module ActiveStorageValidations
     end
 
     class ProcessableImageValidatorMatcher
-      include ActiveStorageable
-      include AllowBlankable
-      include Attachable
-      include Contextable
-      include Messageable
-      include Rspecable
-      include Validatable
+      include ASVActiveStorageable
+      include ASVAllowBlankable
+      include ASVAttachable
+      include ASVContextable
+      include ASVMessageable
+      include ASVRspecable
+      include ASVValidatable
 
       def initialize(attribute_name)
         initialize_allow_blankable

data/lib/active_storage_validations/matchers/{concerns/active_storageable.rb → shared/asv_active_storageable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module ActiveStorageable
+    module ASVActiveStorageable
       extend ActiveSupport::Concern
 
       private

data/lib/active_storage_validations/matchers/{concerns/allow_blankable.rb → shared/asv_allow_blankable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module AllowBlankable
+    module ASVAllowBlankable
       extend ActiveSupport::Concern
 
       def initialize_allow_blankable

data/lib/active_storage_validations/matchers/{concerns/attachable.rb → shared/asv_attachable.rb}

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
 module ActiveStorageValidations
   module Matchers
-    module Attachable
+    module ASVAttachable
+      extend ActiveSupport::Concern
+
       private
 
       def attach_file(file = dummy_file)

data/lib/active_storage_validations/matchers/{concerns/contextable.rb → shared/asv_contextable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module Contextable
+    module ASVContextable
       extend ActiveSupport::Concern
 
       def initialize_contextable

data/lib/active_storage_validations/matchers/{concerns/messageable.rb → shared/asv_messageable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module Messageable
+    module ASVMessageable
       extend ActiveSupport::Concern
 
       def initialize_messageable

data/lib/active_storage_validations/matchers/{concerns/rspecable.rb → shared/asv_rspecable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module Rspecable
+    module ASVRspecable
       extend ActiveSupport::Concern
 
       def initialize_rspecable

data/lib/active_storage_validations/matchers/{concerns/validatable.rb → shared/asv_validatable.rb}

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require 'active_support/concern'
 
 module ActiveStorageValidations
   module Matchers
-    module Validatable
+    module ASVValidatable
       extend ActiveSupport::Concern
 
       private

data/lib/active_storage_validations/metadata.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/loggable'
+require_relative 'shared/asv_loggable'
 
 module ActiveStorageValidations
   class Metadata
-    include Loggable
+    include ASVLoggable
 
     class InvalidImageError < StandardError; end
 

data/lib/active_storage_validations/processable_image_validator.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/attachable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/asv_active_storageable'
+require_relative 'shared/asv_attachable'
+require_relative 'shared/asv_errorable'
+require_relative 'shared/asv_symbolizable'
 
 module ActiveStorageValidations
   class ProcessableImageValidator < ActiveModel::EachValidator # :nodoc
-    include ActiveStorageable
-    include Attachable
-    include Errorable
-    include Symbolizable
+    include ASVActiveStorageable
+    include ASVAttachable
+    include ASVErrorable
+    include ASVSymbolizable
 
     ERROR_TYPES = %i[
       image_not_processable

data/lib/active_storage_validations/{concerns/active_storageable.rb → shared/asv_active_storageable.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  # ActiveStorageValidations::ActiveStorageable
+  # ActiveStorageValidations::ASVActiveStorageable
   #
   # Validator helper methods to make our code more explicit.
-  module ActiveStorageable
+  module ASVActiveStorageable
     extend ActiveSupport::Concern
 
     private

data/lib/active_storage_validations/{concerns/attachable.rb → shared/asv_attachable.rb}

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require_relative "../metadata"
 
 module ActiveStorageValidations
-  # ActiveStorageValidations::Attachable
+  # ActiveStorageValidations::ASVAttachable
   #
   # Validator methods for analyzing attachable.
   #
   # An attachable is a file representation such as ActiveStorage::Blob,
   # ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile, Hash, String,
   # File or Pathname
-  module Attachable
+  module ASVAttachable
     extend ActiveSupport::Concern
 
     private

data/lib/active_storage_validations/{concerns/errorable.rb → shared/asv_errorable.rb}

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  module Errorable
+  module ASVErrorable
     extend ActiveSupport::Concern
 
     def initialize_error_options(options, file = nil)

data/lib/active_storage_validations/{concerns/loggable.rb → shared/asv_loggable.rb}

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  module Loggable
+  module ASVLoggable
     extend ActiveSupport::Concern
 
     def logger

data/lib/active_storage_validations/{concerns/optionable.rb → shared/asv_optionable.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  # ActiveStorageValidations::Optionable
+  # ActiveStorageValidations::ASVOptionable
   #
   # Helper method to flatten the validator options.
-  module Optionable
+  module ASVOptionable
     extend ActiveSupport::Concern
 
     private

data/lib/active_storage_validations/{concerns/symbolizable.rb → shared/asv_symbolizable.rb}

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  module Symbolizable
+  module ASVSymbolizable
     extend ActiveSupport::Concern
 
     class_methods do

data/lib/active_storage_validations/size_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_size_validator.rb'
+require_relative 'base_size_validator'
 
 module ActiveStorageValidations
   class SizeValidator < BaseSizeValidator

data/lib/active_storage_validations/total_size_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_size_validator.rb'
+require_relative 'base_size_validator'
 
 module ActiveStorageValidations
   class TotalSizeValidator < BaseSizeValidator

data/lib/active_storage_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -262,12 +262,6 @@ files:
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
 - lib/active_storage_validations/base_size_validator.rb
-- lib/active_storage_validations/concerns/active_storageable.rb
-- lib/active_storage_validations/concerns/attachable.rb
-- lib/active_storage_validations/concerns/errorable.rb
-- lib/active_storage_validations/concerns/loggable.rb
-- lib/active_storage_validations/concerns/optionable.rb
-- lib/active_storage_validations/concerns/symbolizable.rb
 - lib/active_storage_validations/content_type_spoof_detector.rb
 - lib/active_storage_validations/content_type_validator.rb
 - lib/active_storage_validations/dimension_validator.rb
@@ -278,22 +272,28 @@ files:
 - 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_size_validator_matcher.rb
-- lib/active_storage_validations/matchers/concerns/active_storageable.rb
-- lib/active_storage_validations/matchers/concerns/allow_blankable.rb
-- lib/active_storage_validations/matchers/concerns/attachable.rb
-- lib/active_storage_validations/matchers/concerns/contextable.rb
-- lib/active_storage_validations/matchers/concerns/messageable.rb
-- lib/active_storage_validations/matchers/concerns/rspecable.rb
-- lib/active_storage_validations/matchers/concerns/validatable.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/limit_validator_matcher.rb
 - lib/active_storage_validations/matchers/processable_image_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/matchers/total_size_validator_matcher.rb
 - lib/active_storage_validations/metadata.rb
 - lib/active_storage_validations/processable_image_validator.rb
 - lib/active_storage_validations/railtie.rb
+- lib/active_storage_validations/shared/asv_active_storageable.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