active_storage_validations 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75309ae07f32e9107683721c2a700dea9a435cdc5801c8488a0bf2df18e6162
-  data.tar.gz: 3f14dc96d9d8fff1fb309460c896d631db5777d663b6d7b00f47d08b5e8dc034
+  metadata.gz: 58ef7bbaa01aafa835921f0ad446b86e5b5c49a73a6f08e42feb97ff9bd3c7fd
+  data.tar.gz: e4f18d0de97ffa2adfe59e2d5d841706a8de3e6e575390aafb5b75dbf82a37a2
 SHA512:
-  metadata.gz: a04233bd7b37c89c45fa9d7fe3ef32be5b50ed40181a2b29fa8711049958d8b2bcacceb7f8e4aa7fd7c9714fb506387c7f26050eeecb623f0ceb3d361b501cf7
-  data.tar.gz: 0e43d6b501c8c8d45f1c99110d7504a8ca124353dbe26819f6c9febe34f1c4710c842f5c42945584a7e64bac10ad1efcc18a97afa5ea4987e04024b2f6cdf8d4
+  metadata.gz: 5b29620eb2a65e73c9f7c1c9d2bf143ba20aed0e460fdd763d415651b80463821f5dea26d2b28834dae7dc90ad035d6bbaa47bc7e89161365bfb154485a12c8b
+  data.tar.gz: ee7ef332175aca338df8d46de13ac0487f1aa4b5a3d7aa220bd14826b0f73f55377a6475c2b2eb9133d06aae456a2d18bdc4fbec07b7caaf9cd9fa3b8f1dcf5b

data/README.md

@@ -1,6 +1,6 @@
 # Active Storage Validations
 
-![MiniTest](https://github.com/igorkasyanchuk/active_storage_validations/workflows/MiniTest/badge.svg)
+[![MiniTest](https://github.com/igorkasyanchuk/active_storage_validations/workflows/MiniTest/badge.svg)](https://github.com/igorkasyanchuk/active_storage_validations/actions)
 [![RailsJazz](https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/my_other.svg?raw=true)](https://www.railsjazz.com)
 [![https://www.patreon.com/igorkasyanchuk](https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/patron.svg?raw=true)](https://www.patreon.com/igorkasyanchuk)
 
@@ -220,6 +220,7 @@ describe User do
 
   it { is_expected.to validate_dimensions_of(:avatar).width(250) }
   it { is_expected.to validate_dimensions_of(:avatar).height(200) }
+  it { is_expected.to validate_dimensions_of(:avatar).width(250).height(200).with_message('Invalid dimensions.') }
   it { is_expected.to validate_dimensions_of(:avatar).width_min(200) }
   it { is_expected.to validate_dimensions_of(:avatar).width_max(500) }
   it { is_expected.to validate_dimensions_of(:avatar).height_min(100) }
@@ -261,6 +262,7 @@ class UserTest < ActiveSupport::TestCase
 
   should validate_dimensions_of(:avatar).width(250)
   should validate_dimensions_of(:avatar).height(200)
+  should validate_dimensions_of(:avatar).width(250).height(200).with_message('Invalid dimensions.')
   should validate_dimensions_of(:avatar).width_min(200)
   should validate_dimensions_of(:avatar).width_max(500)
   should validate_dimensions_of(:avatar).height_min(100)
@@ -339,6 +341,9 @@ You are welcome to contribute.
 - https://github.com/fongfan999
 - https://github.com/cooperka
 - https://github.com/dolarsrg
+- https://github.com/jayshepherd
+- https://github.com/ohbarye
+- https://github.com/...
 
 ## License
 

data/lib/active_storage_validations/attached_validator.rb

@@ -5,7 +5,10 @@ module ActiveStorageValidations
     def validate_each(record, attribute, _value)
       return if record.send(attribute).attached?
 
-      record.errors.add(attribute, :blank)
+      errors_options = {}
+      errors_options[:message] = options[:message] if options[:message].present?
+
+      record.errors.add(attribute, :blank, **errors_options)
     end
   end
 end

data/lib/active_storage_validations/content_type_validator.rb

@@ -21,7 +21,14 @@ module ActiveStorageValidations
 
     def types
       (Array.wrap(options[:with]) + Array.wrap(options[:in])).compact.map do |type|
-        Mime[type] || type
+        if type.is_a?(Regexp)
+          type
+        elsif type.is_a?(String) && type =~ %r{\A\w+/[-+.\w]+\z} # mime-type-ish string
+          type
+        else
+          Mime[type] || raise(ArgumentError, "content_type must be one of Regxep,"\
+          " supported mime types (e.g. :png, 'jpg'), or mime type String ('image/jpeg')")
+        end
       end
     end
 

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -10,6 +10,7 @@ module ActiveStorageValidations
       def initialize(attribute_name)
         @attribute_name = attribute_name
         @width_min = @width_max = @height_min = @height_max = nil
+        @custom_message = nil
       end
 
       def description
@@ -26,6 +27,11 @@ module ActiveStorageValidations
         self
       end
 
+      def with_message(message)
+        @custom_message = message
+        self
+      end
+
       def width(width)
         @width_min = @width_max = width
         self
@@ -133,7 +139,8 @@ module ActiveStorageValidations
         attachment = @subject.public_send(@attribute_name)
         Matchers.mock_metadata(attachment, width, height) do
           @subject.validate
-          @subject.errors.details[@attribute_name].all? { |error| error[:error].to_s.exclude?("dimension_#{check}") }
+          exclude_error_message = @custom_message || "dimension_#{check}"
+          @subject.errors.details[@attribute_name].all? { |error| error[:error].to_s.exclude?(exclude_error_message) }
         end
       end
 

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage