active_storage_validations 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435de3a42881b172293cf50bc3edb1e5462f4a0f8346543f14936502abe7a041
-  data.tar.gz: 6dc253e3b1dcf5ac55ae13bcd4fe9d9cabe39cdf49e0de25cc0f091bfb5c3d1b
+  metadata.gz: 6e1145fabe1ee64e7f7033a38c5b1de1114b364e5e2d9eb010628afde0a3e0b3
+  data.tar.gz: 497b550e5d98bf96e4398969de34022b8e8f828003a620261909a6d39e349aff
 SHA512:
-  metadata.gz: bfd15f884cda85c47ad25c1d7e2ca8423f6d6a9e3e4aadeb415492c3a9830a00b10c611ed0eb0a5866bd12e1c2b61aaa69cfccf3952447c3cd716c07e51780c5
-  data.tar.gz: 91ab2c226d9657f52f6cc5f289fb8697608954d59d34400042e0521b7e60657e5ac5f256b268eef16fd1ffcd83169f61345ba3e7c9e925d1384d427f10a00bad
+  metadata.gz: b671b5b33834ff904de1dea6dca51bfd741eaf2e10d931896a6fc4ff9ff83fc213f1581d59c562a806640cdc7a10537fa5ddb240051152ff38b5933ea7c7dc33
+  data.tar.gz: 381da6fbfb0fa544357bc492cfc9535992097ed7118846bae62f1b1953e5058f7b1bbc389ebd0dd8543fb035edaba55cee34a8c73a1b4fa84fc2ffc3e8bf9654

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,10 +1,10 @@
 # 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/active_storageable'
+require_relative 'shared/attachable'
+require_relative 'shared/errorable'
+require_relative 'shared/optionable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class AspectRatioValidator < ActiveModel::EachValidator # :nodoc

data/lib/active_storage_validations/attached_validator.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/active_storageable.rb'
-require_relative 'concerns/errorable.rb'
-require_relative 'concerns/symbolizable.rb'
+require_relative 'shared/active_storageable'
+require_relative 'shared/errorable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class AttachedValidator < ActiveModel::EachValidator # :nodoc:

data/lib/active_storage_validations/base_size_validator.rb

@@ -1,9 +1,9 @@
 # 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/active_storageable'
+require_relative 'shared/errorable'
+require_relative 'shared/optionable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class BaseSizeValidator < ActiveModel::EachValidator # :nodoc:

data/lib/active_storage_validations/content_type_spoof_detector.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/attachable'
-require_relative 'concerns/loggable'
+require_relative 'shared/attachable'
+require_relative 'shared/loggable'
 require 'open3'
 
 module ActiveStorageValidations

data/lib/active_storage_validations/content_type_validator.rb

@@ -1,11 +1,11 @@
 # 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/active_storageable'
+require_relative 'shared/attachable'
+require_relative 'shared/errorable'
+require_relative 'shared/optionable'
+require_relative 'shared/symbolizable'
+require_relative 'content_type_spoof_detector'
 
 module ActiveStorageValidations
   class ContentTypeValidator < ActiveModel::EachValidator # :nodoc:
@@ -63,7 +63,7 @@ module ActiveStorageValidations
     end
 
     def extension_matches_content_type?(record, attribute, attachable)
-      extension = @attachable_filename.split('.').second
+      extension = @attachable_filename.split('.').last
 
       possible_extensions = Marcel::TYPE_EXTS[@attachable_content_type]
       return true if possible_extensions && extension.in?(possible_extensions)
@@ -111,15 +111,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,10 +1,10 @@
 # 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/active_storageable'
+require_relative 'shared/attachable'
+require_relative 'shared/errorable'
+require_relative 'shared/optionable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class DimensionValidator < ActiveModel::EachValidator # :nodoc

data/lib/active_storage_validations/limit_validator.rb

@@ -1,9 +1,9 @@
 # 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/active_storageable'
+require_relative 'shared/errorable'
+require_relative 'shared/optionable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class LimitValidator < ActiveModel::EachValidator # :nodoc:

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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers

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/active_storageable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/matchers/base_size_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 '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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/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 '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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers
@@ -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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers

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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers

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/active_storageable'
+require_relative 'shared/allow_blankable'
+require_relative 'shared/attachable'
+require_relative 'shared/contextable'
+require_relative 'shared/messageable'
+require_relative 'shared/rspecable'
+require_relative 'shared/validatable'
 
 module ActiveStorageValidations
   module Matchers

data/lib/active_storage_validations/metadata.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'concerns/loggable'
+require_relative 'shared/loggable'
 
 module ActiveStorageValidations
   class Metadata

data/lib/active_storage_validations/processable_image_validator.rb

@@ -1,9 +1,9 @@
 # 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/active_storageable'
+require_relative 'shared/attachable'
+require_relative 'shared/errorable'
+require_relative 'shared/symbolizable'
 
 module ActiveStorageValidations
   class ProcessableImageValidator < ActiveModel::EachValidator # :nodoc

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.2'
 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.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-11 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/active_storageable.rb
+- lib/active_storage_validations/matchers/shared/allow_blankable.rb
+- lib/active_storage_validations/matchers/shared/attachable.rb
+- lib/active_storage_validations/matchers/shared/contextable.rb
+- lib/active_storage_validations/matchers/shared/messageable.rb
+- lib/active_storage_validations/matchers/shared/rspecable.rb
+- lib/active_storage_validations/matchers/shared/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/active_storageable.rb
+- lib/active_storage_validations/shared/attachable.rb
+- lib/active_storage_validations/shared/errorable.rb
+- lib/active_storage_validations/shared/loggable.rb
+- lib/active_storage_validations/shared/optionable.rb
+- lib/active_storage_validations/shared/symbolizable.rb
 - lib/active_storage_validations/size_validator.rb
 - lib/active_storage_validations/total_size_validator.rb
 - lib/active_storage_validations/version.rb