active_storage_validations 0.8.8 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82f321d71985caf479d40c9546bc6b0c216ba97670d200e775be3274cf9a35c
-  data.tar.gz: 3a80b0ad6db919d7968a2162214004240d152648ee2ac8c4c4eafe1119834c1c
+  metadata.gz: 52bbd6249bbadd7549ccd7daf17673e98ccfd757b15ec954b67c5d7ce3395c84
+  data.tar.gz: cf3664efb821cd7fe60b0536e0d394f900af6fb128161ab13d62d373b2018013
 SHA512:
-  metadata.gz: c3d19095f455bb32b649c4ab0bfc7ae50d2d29eae69d5b3a593d6dd556de9ba7c527eb4afe9ec8032638adec23f664d200bcfab75cd726f51be97492266fc1b0
-  data.tar.gz: 6ab99b207ef0399354c56d499d004cd287c22a56fd1648a5c2f948eace0050e00d13d12e3bb2ca38ba730edf2539b3843637383a8d3c8dc6424daa91f764164c
+  metadata.gz: bece2608d56156a83e468ffaf4ed31dead1769882457c1ff8480586ce0335122b475084f24f914d4d8083c5b4f2b891bda7465b25b2d34272ba76631c313167f
+  data.tar.gz: 56a1cbb1bd5bddc4cce887405eecd6d5e27cc9bfcdca97e636ccf43cf98ce29d9077e1b3e7a602dcb229cd24d25125024c4d83beba6f82050edc773b32d21ca4

data/README.md

@@ -1,10 +1,12 @@
 # Active Storage Validations
 
-If you are using `active_storage` gem and you want to add simple validations for it, like presence or content_type you need to write a custom valiation method.
+[![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)
 
-This gems doing it for you. Just use `attached: true` or `content_type: 'image/png'` validation.
+If you are using `active_storage` gem and you want to add simple validations for it, like presence or content_type you need to write a custom validation method.
 
-[![Build Status](https://travis-ci.org/igorkasyanchuk/active_storage_validations.svg?branch=master)](https://travis-ci.org/igorkasyanchuk/active_storage_validations)
+This gems doing it for you. Just use `attached: true` or `content_type: 'image/png'` validation.
 
 ## What it can do
 
@@ -56,14 +58,15 @@ end
 
 ### More examples
 
-- Content type validation using symbols. In order to infer the correct mime type from the symbol, the types must be registered with `Mime::Type`.
+- Content type validation using symbols. In order to infer the correct mime type from the symbol, the types must be registered with `Marcel::EXTENSIONS` (`MimeMagic::EXTENSIONS` for Rails <= 6.1.3).
 
 ```ruby
 class User < ApplicationRecord
   has_one_attached :avatar
   has_many_attached :photos
 
-  validates :avatar, attached: true, content_type: :png # Mime[:png].to_s => 'image/png'
+  validates :avatar, attached: true, content_type: :png # Marcel::Magic.by_extension(:png).to_s => 'image/png'
+                                                        # Rails <= 6.1.3; MimeMagic.by_extension(:png).to_s => 'image/png'
   # or
   validates :photos, attached: true, content_type: [:png, :jpg, :jpeg]
   # or
@@ -218,6 +221,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) }
@@ -259,6 +263,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)
@@ -287,8 +292,21 @@ To run tests in root folder of gem:
 
 * `BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test` to run for Rails 5.2
 * `BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test` to run for Rails 6.0
+* `BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle exec rake test` to run for Rails 6.1
+* `BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle exec rake test` to run for Rails main branch
 
-To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migrate`).
+Snippet to run in console:
+
+```
+BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle exec rake test
+```
 
 ## Known issues
 
@@ -329,7 +347,25 @@ You are welcome to contribute.
 - https://github.com/willnet
 - https://github.com/mohanklein
 - https://github.com/High5Apps
+- https://github.com/mschnitzer
+- https://github.com/sinankeskin
+- https://github.com/alejandrodevs
+- https://github.com/molfar
+- https://github.com/connorshea
+- https://github.com/yshmarov
+- https://github.com/fongfan999
+- https://github.com/cooperka
+- https://github.com/dolarsrg
+- https://github.com/jayshepherd
+- https://github.com/ohbarye
+- https://github.com/randsina
+- https://github.com/vietqhoang
+- https://github.com/kemenaran
+- https://github.com/jrmhaig
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+[<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
+/>](https://www.railsjazz.com/)

data/config/locales/de.yml

@@ -2,16 +2,21 @@ de:
   errors:
     messages:
       content_type_invalid: "hat einen ungültigen Dateityp"
-      file_size_out_of_range: "Dateigröße von %{file_size} ist außerhalb des erlaubten Bereichs"
+      file_size_out_of_range: "Dateigröße %{file_size} liegt nicht im erlaubten Bereich"
       limit_out_of_range: "Anzahl ist außerhalb des gültigen Bereichs"
-      image_metadata_missing: "ist nicht ein gültigen Bild"
+      image_metadata_missing: "ist kein gültiges Bild"
       dimension_min_inclusion: "muss größer oder gleich %{width} x %{height} Pixel sein"
       dimension_max_inclusion: "muss kleiner oder gleich %{width} x %{height} Pixel sein"
-      dimension_width_inclusion: "Breite ist nicht zwischen %{min} und %{max} Pixel enthalten"
-      dimension_height_inclusion: "Höhe ist nicht zwischen %{min} und %{max} Pixel enthalten"
-      dimension_width_greater_than_or_equal_to: "Breite muss größer oder gleich %{length} Pixel sein"
-      dimension_height_greater_than_or_equal_to: "Höhe muss größer oder gleich %{length} Pixel sein"
+      dimension_width_inclusion: "Bildbreite muss zwischen %{min} und %{max} Pixel liegen"
+      dimension_height_inclusion: "Bildhöhe muss zwischen %{min} und %{max} Pixel liegen"
+      dimension_width_greater_than_or_equal_to: "Bildbreite muss größer oder gleich %{length} Pixel sein"
+      dimension_height_greater_than_or_equal_to: "Bildhöhe muss größer oder gleich %{length} Pixel sein"
       dimension_width_less_than_or_equal_to: "Breite muss kleiner oder gleich %{length} Pixel sein"
       dimension_height_less_than_or_equal_to: "Höhe muss kleiner oder gleich %{length} Pixel sein"
-      dimension_width_equal_to: "Breite muss genau %{length} Pixel sein"
-      dimension_height_equal_to: "Höhe muss genau %{length} Pixel sein"
+      dimension_width_equal_to: "Bildbreite muss genau %{length} Pixel sein"
+      dimension_height_equal_to: "Bildhöhe muss genau %{length} Pixel sein"
+      aspect_ratio_not_square: "muss quadratisch sein"
+      aspect_ratio_not_portrait: "muss Hochformat sein"
+      aspect_ratio_not_landscape: "muss Querformat sein"
+      aspect_ratio_is_not: "muss ein Bildseitenverhältnis von %{aspect_ratio} haben"
+      aspect_ratio_unknown: "hat ein unbekanntes Bildseitenverhältnis"

data/config/locales/es.yml

@@ -0,0 +1,22 @@
+es:
+  errors:
+    messages:
+      content_type_invalid: "tiene un tipo de contenido inválido"
+      file_size_out_of_range: "tamaño %{file_size} no está entre el rango requerido"
+      limit_out_of_range: "el número total está fuera de rango"
+      image_metadata_missing: "no es una imagen válida"
+      dimension_min_inclusion: "debe ser mayor o igual a %{width} x %{height} pixel"
+      dimension_max_inclusion: "debe ser menor o igual a %{width} x %{height} pixel"
+      dimension_width_inclusion: "el ancho no se incluye entre %{min} y %{max} pixel"
+      dimension_height_inclusion: "la altura no se incluye entre %{min} y %{max} pixel"
+      dimension_width_greater_than_or_equal_to: "el ancho debe ser mayor o igual a %{length} pixel"
+      dimension_height_greater_than_or_equal_to: "la altura debe ser mayor o igual a %{length} pixel"
+      dimension_width_less_than_or_equal_to: "el ancho debe ser menor o igual a %{length} pixel"
+      dimension_height_less_than_or_equal_to: "la altura debe ser menor o igual a %{length} pixel"
+      dimension_width_equal_to: "el ancho debe ser igual a %{length} pixel"
+      dimension_height_equal_to: "la altura debe ser igual a %{length} pixel"
+      aspect_ratio_not_square: "debe ser una imagen cuadrada"
+      aspect_ratio_not_portrait: "debe ser una imagen vertical"
+      aspect_ratio_not_landscape: "debe ser una imagen apaisada"
+      aspect_ratio_is_not: "debe tener una relación de aspecto de %{aspect_ratio}"
+      aspect_ratio_unknown: "tiene una relación de aspecto desconocida"

data/config/locales/it.yml

@@ -0,0 +1,22 @@
+it:
+  errors:
+    messages:
+      content_type_invalid: "ha un tipo di contenuto non valido"
+      file_size_out_of_range: "la dimensione del file %{file_size} non è compresa nell’intervallo consentito"
+      limit_out_of_range: "il valore è al di fuori dell’intervallo consentito"
+      image_metadata_missing: "non è un'immagine valida"
+      dimension_min_inclusion: "deve essere maggiore o uguale a %{width} x %{height} pixel"
+      dimension_max_inclusion: "deve essere minore o uguale a %{width} x %{height} pixel"
+      dimension_width_inclusion: "la larghezza deve essere compresa tra %{min} e %{max} pixel"
+      dimension_height_inclusion: "l’altezza deve essere compresa tra %{min} e %{max} pixel"
+      dimension_width_greater_than_or_equal_to: "la larghezza deve essere maggiore o uguale a %{length} pixel"
+      dimension_height_greater_than_or_equal_to: "l’altezza deve essere maggiore o uguale a %{length} pixel"
+      dimension_width_less_than_or_equal_to: "la larghezza deve essere minore o uguale a %{length} pixel"
+      dimension_height_less_than_or_equal_to: "l’altezza deve essere minore o uguale a %{length} pixel"
+      dimension_width_equal_to: "la larghezza deve essere pari a %{length} pixel"
+      dimension_height_equal_to: "l’altezza deve essere pari a %{length} pixel"
+      aspect_ratio_not_square: "deve essere un’immagine quadrata"
+      aspect_ratio_not_portrait: "l’orientamento dell’immagine deve essere verticale"
+      aspect_ratio_not_landscape: "l’orientamento dell’immagine deve essere orizzontale"
+      aspect_ratio_is_not: "deve avere un rapporto altezza / larghezza di %{aspect_ratio}"
+      aspect_ratio_unknown: "ha un rapporto altezza / larghezza sconosciuto"

data/config/locales/nl.yml

@@ -0,0 +1,22 @@
+nl:
+  errors:
+    messages:
+      content_type_invalid: "heeft een ongeldig inhoudstype"
+      file_size_out_of_range: "bestandsgrootte %{file_size} valt niet tussen het vereiste bereik"
+      limit_out_of_range: "totaal aantal valt buiten het vereiste bereik"
+      image_metadata_missing: "is geen geldige afbeelding"
+      dimension_min_inclusion: "moet groter of gelijk zijn aan %{width} x %{height} pixels"
+      dimension_max_inclusion: "moet kleiner of gelijk zijn aan %{width} x %{height} pixels"
+      dimension_width_inclusion: "breedte niet tussen de %{min} en %{max} pixels"
+      dimension_height_inclusion: "hoogte niet tussen de %{min} en %{max} pixels"
+      dimension_width_greater_than_or_equal_to: "breedte moet groter of gelijk zijn aan %{length} pixels"
+      dimension_height_greater_than_or_equal_to: "hoogte moet groter of gelijk zijn aan %{length} pixels"
+      dimension_width_less_than_or_equal_to: "breedte moet kleiner of gelijk zijn aan %{length} pixels"
+      dimension_height_less_than_or_equal_to: "hoogte moet kleiner of gelijk zijn aan %{length} pixels"
+      dimension_width_equal_to: "breedte moet gelijk zijn aan %{length} pixels"
+      dimension_height_equal_to: "hoogte moet gelijk zijn aan %{length} pixels"
+      aspect_ratio_not_square: "moet een vierkante afbeelding zijn"
+      aspect_ratio_not_portrait: "moet een staande afbeelding zijn"
+      aspect_ratio_not_landscape: "moet een liggende afbeelding zijn"
+      aspect_ratio_is_not: "moet een beeldverhouding hebben van %{aspect_ratio}"
+      aspect_ratio_unknown: "heeft een onbekende beeldverhouding"

data/config/locales/pl.yml

@@ -0,0 +1,22 @@
+pl:
+  errors:
+    messages:
+      content_type_invalid: "jest nieprawidłowego typu"
+      file_size_out_of_range: "rozmiar %{file_size} nie zawiera się w dopuszczalnym zakresie"
+      limit_out_of_range: "ilość przekracza dopuszczalny zakres"
+      image_metadata_missing: "nie jest prawidłowym obrazem"
+      dimension_min_inclusion: "musi być równe lub większe od %{width} x %{height} pixeli"
+      dimension_max_inclusion: "musi być równe lub mniejsze od %{width} x %{height} pixeli"
+      dimension_width_inclusion: "szerokość musi wynosić od %{min} do %{max} pixeli"
+      dimension_height_inclusion: "wysokość musi wynosić od %{min} do %{max} pixeli"
+      dimension_width_greater_than_or_equal_to: "szerokość musi mieć co najmniej %{length} pixeli"
+      dimension_height_greater_than_or_equal_to: "wysokość musi mieć co najmniej %{length} pixeli"
+      dimension_width_less_than_or_equal_to: "szerokość musi mieć co najwyżej %{length} pixeli"
+      dimension_height_less_than_or_equal_to: "wysokość musi mieć co najwyżej %{length} pixeli"
+      dimension_width_equal_to: "szerokość musi wynosić %{length} pixeli"
+      dimension_height_equal_to: "wysokość musi wynosić %{length} pixeli"
+      aspect_ratio_not_square: "musi mieć proporcje kwadratu"
+      aspect_ratio_not_portrait: "musi mieć proporcje portretu"
+      aspect_ratio_not_landscape: "musi mieć proporcje pejzażu"
+      aspect_ratio_is_not: "musi mieć proporcje %{aspect_ratio}"
+      aspect_ratio_unknown: "ma nieokreślone proporcje"

data/config/locales/tr.yml

@@ -0,0 +1,22 @@
+tr:
+  errors:
+    messages:
+      content_type_invalid: "geçersiz dosya tipine sahip"
+      file_size_out_of_range: "dosya boyutu %{file_size} gerekli aralık dışında"
+      limit_out_of_range: "toplam miktar aralık dışında"
+      image_metadata_missing: "geçerli bir imaj değil"
+      dimension_min_inclusion: "%{width} x %{height} piksele eşit ya da büyük olmalı"
+      dimension_max_inclusion: "%{width} x %{height} piksele eşit ya da küçük olmalı"
+      dimension_width_inclusion: "en %{min} ve %{max} piksel aralığı dışında"
+      dimension_height_inclusion: "boy %{min} ve %{max} piksel aralığı dışında"
+      dimension_width_greater_than_or_equal_to: "en %{length} piksele eşit ya da büyük olmalı"
+      dimension_height_greater_than_or_equal_to: "boy %{length} piksele eşit ya da büyük olmalı"
+      dimension_width_less_than_or_equal_to: "en %{length} piksele eşit ya da küçük olmalı"
+      dimension_height_less_than_or_equal_to: "boy %{length} piksele eşit ya da küçük olmalı"
+      dimension_width_equal_to: "en %{length} piksele eşit olmalı"
+      dimension_height_equal_to: "boy %{length} piksele eşit olmalı"
+      aspect_ratio_not_square: "kare bir imaj olmalı"
+      aspect_ratio_not_portrait: "dikey bir imaj olmalı"
+      aspect_ratio_not_landscape: "yatay bir imaj olmalı"
+      aspect_ratio_is_not: "%{aspect_ratio} en boy oranına sahip olmalı"
+      aspect_ratio_unknown: "bilinmeyen en boy oranı"

data/config/locales/uk.yml

@@ -1,22 +1,22 @@
 uk:
   errors:
     messages:
-    content_type_invalid: "має неприпустимий тип вмісту"
-    file_size_out_of_range: "розмір %{file_size} більше необхідного"
-    limit_out_of_range: "кількість файлів більше необхідного"
-    image_metadata_missing: "не є допустимим зображенням"
-    dimension_min_inclusion: "мусить бути більше або дорівнювати %{width} x %{height} пікселям"
-    dimension_max_inclusion: "мусить бути менше або дорівнювати %{width} x %{height} пікселям"
-    dimension_width_inclusion: "ширина не включена між %{min} і %{max} пікселям"
-    dimension_height_inclusion: "висота не включена між %{min} і %{max} пікселям"
-    dimension_width_greater_than_or_equal_to: "ширина мусить бути більше або дорівнювати %{length} пікселям"
-    dimension_height_greater_than_or_equal_to: "висота мусить бути більше або дорівнювати %{length} пікселям"
-    dimension_width_less_than_or_equal_to: "ширина мусить бути менше або дорівнювати %{length} пікселям"
-    dimension_height_less_than_or_equal_to: "висота мусить бути менше або дорівнювати %{length} пікселям"
-    dimension_width_equal_to: "ширина мусить дорівнювати %{length} пікселям"
-    dimension_height_equal_to: "висота мусить дорівнювати %{length} пікселям"
-    aspect_ratio_not_square: "мусить бути квадратне зображення"
-    aspect_ratio_not_portrait: "мусить бути портретне зображення"
-    aspect_ratio_not_landscape: "мусить бути пейзажне зображення"
-    aspect_ratio_is_not: "мусить мати співвідношення сторін %{aspect_ratio}"
-    aspect_ratio_unknown: "має невідоме співвідношення сторін"
+      content_type_invalid: "має неприпустимий тип вмісту"
+      file_size_out_of_range: "розмір %{file_size} більше необхідного"
+      limit_out_of_range: "кількість файлів більше необхідного"
+      image_metadata_missing: "не є допустимим зображенням"
+      dimension_min_inclusion: "мусить бути більше або дорівнювати %{width} x %{height} пікселям"
+      dimension_max_inclusion: "мусить бути менше або дорівнювати %{width} x %{height} пікселям"
+      dimension_width_inclusion: "ширина не включена між %{min} і %{max} пікселям"
+      dimension_height_inclusion: "висота не включена між %{min} і %{max} пікселям"
+      dimension_width_greater_than_or_equal_to: "ширина мусить бути більше або дорівнювати %{length} пікселям"
+      dimension_height_greater_than_or_equal_to: "висота мусить бути більше або дорівнювати %{length} пікселям"
+      dimension_width_less_than_or_equal_to: "ширина мусить бути менше або дорівнювати %{length} пікселям"
+      dimension_height_less_than_or_equal_to: "висота мусить бути менше або дорівнювати %{length} пікселям"
+      dimension_width_equal_to: "ширина мусить дорівнювати %{length} пікселям"
+      dimension_height_equal_to: "висота мусить дорівнювати %{length} пікселям"
+      aspect_ratio_not_square: "мусить бути квадратне зображення"
+      aspect_ratio_not_portrait: "мусить бути портретне зображення"
+      aspect_ratio_not_landscape: "мусить бути пейзажне зображення"
+      aspect_ratio_is_not: "мусить мати співвідношення сторін %{aspect_ratio}"
+      aspect_ratio_unknown: "має невідоме співвідношення сторін"

data/config/locales/vi.yml

@@ -0,0 +1,22 @@
+vi:
+  errors:
+    messages:
+      content_type_invalid: "tệp không hợp lệ"
+      file_size_out_of_range: "kích thước %{file_size} vượt giới hạn"
+      limit_out_of_range: "tổng số tệp vượt giới hạn"
+      image_metadata_missing: "không phải là ảnh"
+      dimension_min_inclusion: "phải lớn hơn hoặc bằng %{width} x %{height} pixel"
+      dimension_max_inclusion: "phải nhỏ hơn hoặc bằng %{width} x %{height} pixel"
+      dimension_width_inclusion: "chiều rộng không nằm trong %{min} và %{max} pixel"
+      dimension_height_inclusion: "chiều cao không nằm trong %{min} và %{max} pixel"
+      dimension_width_greater_than_or_equal_to: "chiều rộng phải lớn hơn hoặc bằng %{length} pixel"
+      dimension_height_greater_than_or_equal_to: "chiều cao phải lớn hơn hoặc bằng %{length} pixel"
+      dimension_width_less_than_or_equal_to: "chiều rộng phải nhỏ hơn hoặc bằng %{length} pixel"
+      dimension_height_less_than_or_equal_to: "chiều cao phải nhỏ hơn hoặc bằng %{length} pixel"
+      dimension_width_equal_to: "chiều rộng phải bằng %{length} pixel"
+      dimension_height_equal_to: "chiều cao phải bằng %{length} pixel"
+      aspect_ratio_not_square: "phải là ảnh hình vuông"
+      aspect_ratio_not_portrait: "phải là ảnh đứng"
+      aspect_ratio_not_landscape: "phải là ảnh ngang"
+      aspect_ratio_is_not: "phải có tỉ lệ ảnh %{aspect_ratio}"
+      aspect_ratio_unknown: "tỉ lệ ảnh không xác định"

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -18,7 +18,7 @@ module ActiveStorageValidations
       raise ArgumentError, 'You must pass "aspect_ratio: :OPTION" option to the validator'
     end
 
-    if Rails::VERSION::MAJOR >= 6
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
 

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

@@ -14,14 +14,20 @@ module ActiveStorageValidations
         next if is_valid?(file)
 
         errors_options[:content_type] = content_type(file)
-        record.errors.add(attribute, :content_type_invalid, errors_options)
+        record.errors.add(attribute, :content_type_invalid, **errors_options)
         break
       end
     end
 
     def types
-      (Array.wrap(options[:with]) + Array.wrap(options[:in])).compact.map do |type|
-        Mime[type] || type
+      return @types if defined? @types
+
+      @types = (Array.wrap(options[:with]) + Array.wrap(options[:in])).compact.map do |type|
+        if type.is_a?(Regexp)
+          type
+        else
+          Marcel::MimeType.for(declared_type: type.to_s, extension: type.to_s)
+        end
       end
     end
 
@@ -36,10 +42,9 @@ module ActiveStorageValidations
     end
 
     def is_valid?(file)
-      if options[:with].is_a?(Regexp)
-        options[:with].match?(content_type(file).to_s)
-      else
-        content_type(file).in?(types)
+      file_type = content_type(file)
+      types.any? do |type|
+        type == file_type || (type.is_a?(Regexp) && type.match?(file_type.to_s))
       end
     end
   end

data/lib/active_storage_validations/dimension_validator.rb

@@ -34,7 +34,7 @@ module ActiveStorageValidations
     end
 
 
-    if Rails::VERSION::MAJOR >= 6
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
 
@@ -52,7 +52,7 @@ module ActiveStorageValidations
       # Rails 5
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
-  
+
         files = Array.wrap(record.send(attribute))
         files.each do |file|
           # Analyze file first if not analyzed to get all required metadata.
@@ -110,7 +110,7 @@ module ActiveStorageValidations
           else
             if file_metadata[length] != options[length]
               add_error(record, attribute, options[:message].presence || :"dimension_#{length}_equal_to", length: options[length])
-              return false            
+              return false
             end
           end
         end
@@ -119,11 +119,11 @@ module ActiveStorageValidations
       true # valid file
     end
 
-    def add_error(record, attribute, type, *attrs)
+    def add_error(record, attribute, type, **attrs)
       key = options[:message].presence || type
       return if record.errors.added?(attribute, key)
-      record.errors.add(attribute, key, *attrs)
-    end    
+      record.errors.add(attribute, key, **attrs)
+    end
 
   end
 end

data/lib/active_storage_validations/limit_validator.rb

@@ -17,7 +17,7 @@ module ActiveStorageValidations
       errors_options = { min: options[:min], max: options[:max] }
 
       return true if files_count_valid?(files.count)
-      record.errors.add(attribute, options[:message].presence || :limit_out_of_range, errors_options)
+      record.errors.add(attribute, options[:message].presence || :limit_out_of_range, **errors_options)
     end
 
     def files_count_valid?(count)

data/lib/active_storage_validations/matchers/attached_validator_matcher.rb

@@ -16,9 +16,8 @@ module ActiveStorageValidations
       end
 
       def matches?(subject)
-        @subject = subject.is_a?(Class) ? subject : subject.class
-
-        invalid_when_not_attached && valid_when_attached
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        responds_to_methods && valid_when_attached && invalid_when_not_attached
       end
 
       def failure_message
@@ -31,17 +30,25 @@ module ActiveStorageValidations
 
       private
 
+      def responds_to_methods
+        @subject.respond_to?(@attribute_name) &&
+          @subject.public_send(@attribute_name).respond_to?(:attach) &&
+          @subject.public_send(@attribute_name).respond_to?(:detach)
+      end
+
       def valid_when_attached
-        instance = @subject.new
-        instance.public_send(@attribute_name).attach(attachable)
-        instance.validate
-        instance.errors.details[@attribute_name].exclude?(error: :blank)
+        @subject.public_send(@attribute_name).attach(attachable) unless @subject.public_send(@attribute_name).attached?
+        @subject.validate
+        @subject.errors.details[@attribute_name].exclude?(error: :blank)
       end
 
       def invalid_when_not_attached
-        instance = @subject.new
-        instance.validate
-        instance.errors.details[@attribute_name].include?(error: :blank)
+        @subject.public_send(@attribute_name).detach
+        # Unset the direct relation since `detach` on an unpersisted record does not set `attached?` to false.
+        @subject.public_send("#{@attribute_name}=", nil)
+
+        @subject.validate
+        @subject.errors.details[@attribute_name].include?(error: :blank)
       end
 
       def attachable

data/lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -29,7 +29,7 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        allowed_types_allowed? && rejected_types_rejected?
+        responds_to_methods && allowed_types_allowed? && rejected_types_rejected?
       end
 
       def failure_message
@@ -46,12 +46,18 @@ module ActiveStorageValidations
 
       protected
 
+      def responds_to_methods
+        @subject.respond_to?(@attribute_name) &&
+          @subject.public_send(@attribute_name).respond_to?(:attach) &&
+          @subject.public_send(@attribute_name).respond_to?(:detach)
+      end
+
       def allowed_types
         @allowed_types || []
       end
 
       def rejected_types
-        @rejected_types || (Mime::LOOKUP.keys - allowed_types)
+        @rejected_types || (Marcel::TYPES.keys - allowed_types)
       end
 
       def allowed_types_allowed?

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
@@ -58,7 +64,8 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        width_smaller_than_min? && width_larger_than_min? && width_smaller_than_max? && width_larger_than_max? && width_equals? &&
+        responds_to_methods &&
+          width_smaller_than_min? && width_larger_than_min? && width_smaller_than_max? && width_larger_than_max? && width_equals? &&
           height_smaller_than_min? && height_larger_than_min? && height_smaller_than_max? && height_larger_than_max? && height_equals?
       end
 
@@ -72,6 +79,12 @@ module ActiveStorageValidations
 
       protected
 
+      def responds_to_methods
+        @subject.respond_to?(@attribute_name) &&
+          @subject.public_send(@attribute_name).respond_to?(:attach) &&
+          @subject.public_send(@attribute_name).respond_to?(:detach)
+      end
+
       def valid_width
         ((@width_min || 0) + (@width_max || 2000)) / 2
       end
@@ -126,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/matchers/size_validator_matcher.rb

@@ -45,7 +45,7 @@ module ActiveStorageValidations
 
       def matches?(subject)
         @subject = subject.is_a?(Class) ? subject.new : subject
-        lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
+        responds_to_methods && lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
       end
 
       def failure_message
@@ -58,6 +58,12 @@ module ActiveStorageValidations
 
       protected
 
+      def responds_to_methods
+        @subject.respond_to?(@attribute_name) &&
+          @subject.public_send(@attribute_name).respond_to?(:attach) &&
+          @subject.public_send(@attribute_name).respond_to?(:detach)
+      end
+
       def lower_than_low?
         @low.nil? || !passes_validation_with_size(@low - 1)
       end

data/lib/active_storage_validations/matchers.rb

@@ -22,7 +22,7 @@ module ActiveStorageValidations
     end
 
     def self.mock_metadata(attachment, width, height)
-      if Rails::VERSION::MAJOR >= 6
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
         # Mock the Metadata class for rails 6
         mock = OpenStruct.new(metadata: { width: width, height: height })
         stub_method(ActiveStorageValidations::Metadata, :new, mock) do

data/lib/active_storage_validations/metadata.rb

@@ -21,7 +21,16 @@ module ActiveStorageValidations
     def read_image
       is_string = file.is_a?(String)
       if is_string || file.is_a?(ActiveStorage::Blob)
-        blob = is_string ? ActiveStorage::Blob.find_signed(file) : file
+        blob =
+          if is_string
+            if Rails.gem_version < Gem::Version.new('6.1.0')
+              ActiveStorage::Blob.find_signed(file)
+            else
+              ActiveStorage::Blob.find_signed!(file)
+            end
+          else
+            file
+          end
 
         tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
         tempfile.binmode

data/lib/active_storage_validations/size_validator.rb

@@ -25,7 +25,10 @@ module ActiveStorageValidations
         next if content_size_valid?(file.blob.byte_size)
 
         errors_options[:file_size] = number_to_human_size(file.blob.byte_size)
-        record.errors.add(attribute, :file_size_out_of_range, errors_options)
+        errors_options[:min_size] = number_to_human_size(min_size)
+        errors_options[:max_size] = number_to_human_size(max_size)
+
+        record.errors.add(attribute, :file_size_out_of_range, **errors_options)
         break
       end
     end
@@ -43,5 +46,13 @@ module ActiveStorageValidations
         file_size >= options[:greater_than_or_equal_to]
       end
     end
+
+    def min_size
+      options[:between]&.min || options[:greater_than] || options[:greater_than_or_equal_to]
+    end
+
+    def max_size
+      options[:between]&.max || options[:less_than] || options[:less_than_or_equal_to]
+    end
   end
 end

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.6
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,35 +25,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.5
-  type: :development
+        version: 5.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.5
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,11 +148,17 @@ files:
 - Rakefile
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/nl.yml
+- config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/tr.yml
 - config/locales/uk.yml
+- config/locales/vi.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
@@ -147,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage