active_storage_validations 0.8.7 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee7d6623af014086158c960b7ef7408f4cf7527536f57539765351357160189
-  data.tar.gz: 6819ee596bd09560ca801fade1006bfbe4bf03b820b7ca1b0f84eafe0bb47ac1
+  metadata.gz: 6e8b30d036f53b6e00b209c9fe9a34339ff23aa35b789da9585df7fee6c8dfad
+  data.tar.gz: 0655072452aa29e24bcea5abb01e6b72bf6ddee6f2646d92eb8b13dbaeff128f
 SHA512:
-  metadata.gz: c1a79fa7e8825320b308f8a689b3b09763072ec8093c5fc1f43e4686dad3dd05b4d345ce8d62149b23865b5c215b90dcdd68b292ea4ccef26456e752a35aad5a
-  data.tar.gz: 69517cf6f0d5a5c64c39416945f06bb31ccb6c5b1c0288d883005184c96e353d44a3f9479767783bd9aae856ee2157a6ffdde48ebdb6abbf23a5f4972fd8f3b0
+  metadata.gz: 8df0893d2048e22d55660f590a747d55b2fff2595bae0f7da8b9151079d2c87e7d09a5e3059529a9fd9ef1231e44b4e9c610d3d22c9da5bfc8e49eb3aa0d25ca
+  data.tar.gz: a55c3ba3ff97b5478061fc8a8307127231dbbbb64f49fdcaccea85e6c896e48e777b30e09c97d44b9d84d61b8b5c4ef6abdb843171120b1ae739b38ebf916fb2

data/README.md

@@ -1,11 +1,9 @@
 # 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.
+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.
 
 This gems doing it for you. Just use `attached: true` or `content_type: 'image/png'` validation.
 
-[![Build Status](https://travis-ci.org/igorkasyanchuk/active_storage_validations.svg?branch=master)](https://travis-ci.org/igorkasyanchuk/active_storage_validations)
-
 ## What it can do
 
 * validates if file(s) attached
@@ -117,7 +115,7 @@ end
 
 ## Internationalization (I18n)
 
-Active Storage Validations use I18n for errors messages. For this add there keys in your translation file:
+Active Storage Validations uses I18n for error messages. For this, add these keys in your translation file:
 
 ```yml
 en:
@@ -137,19 +135,18 @@ en:
       dimension_height_less_than_or_equal_to: "height must be less than or equal to %{length} pixel."
       dimension_width_equal_to: "width must be equal to %{length} pixel."
       dimension_height_equal_to: "height must be equal to %{length} pixel."
-      aspect_ratio_not_square: "doesn't a square image"
-      aspect_ratio_not_portrait: "doesn't contain a portrait image"
-      aspect_ratio_not_landscape: "doesn't contain a landscape image"
-      aspect_ratio_is_not: "doesn't contain aspect ratio of %{aspect_ratio}"
+      aspect_ratio_not_square: "must be a square image"
+      aspect_ratio_not_portrait: "must be a portrait image"
+      aspect_ratio_not_landscape: "must be a landscape image"
+      aspect_ratio_is_not: "must have an aspect ratio of %{aspect_ratio}"
       aspect_ratio_unknown: "has an unknown aspect ratio"
-
 ```
 
-In some cases Active Storage Validations provides variables to help you customize messages:
+In some cases, Active Storage Validations provides variables to help you customize messages:
 
-The "content_type_invalid" key has two variables that you can use, a variable named "content_type" containing the content type of the send file and a variable named "authorized_type" containing the list of authorized content types.
+The "content_type_invalid" key has two variables that you can use, a variable named "content_type" containing the content type of the send file and a variable named "authorized_types" containing the list of authorized content types.
 
-It's variables are not used by default to leave the choice to the user.
+The variables are not used by default to leave the choice to the user.
 
 For example :
 
@@ -194,7 +191,7 @@ Provides RSpec-compatible and Minitest-compatible matchers for testing the valid
 
 ### RSpec
 
-In spec_helper.rb, you'll need to require the matchers:
+In `spec_helper.rb`, you'll need to require the matchers:
 
 ```ruby
 require 'active_storage_validations/matchers'
@@ -209,7 +206,7 @@ end
 ```
 
 Example (Note that the options are chainable):
-    
+
 ```ruby
 describe User do
   it { is_expected.to validate_attached_of(:avatar) }
@@ -243,7 +240,7 @@ require 'active_storage_validations/matchers'
 
 And _extend_ the module:
 
-```bash
+```ruby
 class ActiveSupport::TestCase
   extend ActiveStorageValidations::Matchers
 end
@@ -281,27 +278,26 @@ end
 * verify how it works with direct upload
 * better error message when content_size is invalid
 * add more translations
-* add aspect ratio validation
 
 ## Tests & Contributing
 
 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
-
-To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migrate`).
+* `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
 
 ## Known issues
 
 - There is an issue in Rails which it possible to get if you have added a validation and generating for example an image preview of attachments. It can be fixed with this:
 
-```
+```erb
   <% if @user.avatar.attached? && @user.avatar.attachment.blob.present? && @user.avatar.attachment.blob.persisted? %>
     <%= image_tag @user.avatar %>
   <% end %>
 ```
-This is Rails issue. And according to commits it will be fixed in Rails 6.
+
+This is a Rails issue, and is fixed in Rails 6.
 
 ## Contributing
 You are welcome to contribute.
@@ -327,6 +323,15 @@ You are welcome to contribute.
 - https://github.com/giovannibonetti
 - https://github.com/dlepage
 - https://github.com/StefSchenkelaars
+- 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
 
 ## License
 

data/config/locales/de.yml

@@ -2,16 +2,16 @@ 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"

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 de retrato"
+      aspect_ratio_not_landscape: "debe ser una imagen de paisaje"
+      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/ja.yml

@@ -0,0 +1,22 @@
+ja:
+  errors:
+    messages:
+      content_type_invalid: "のContent Typeが不正です"
+      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/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/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/lib/active_storage_validations/content_type_validator.rb

@@ -14,7 +14,7 @@ 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

data/lib/active_storage_validations/dimension_validator.rb

@@ -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,6 +46,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 allowed_types
         @allowed_types || []
       end

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -58,7 +58,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 +73,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

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/metadata.rb

@@ -19,11 +19,22 @@ module ActiveStorageValidations
     private
 
     def read_image
-      if file.is_a?(String)
-        blob = ActiveStorage::Blob.find_signed(file)
+      is_string = file.is_a?(String)
+      if is_string || file.is_a?(ActiveStorage::Blob)
+        if is_string
+          # If Rails 5.2 or 6.0, use `find_signed`
+          if Rails::VERSION::MAJOR < 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 0)
+            blob = ActiveStorage::Blob.find_signed(file)
+          # If Rails 6.1 or higher, use `find_signed!`
+          elsif Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
+            blob = ActiveStorage::Blob.find_signed!(file)
+          end
+        else
+          blob = file
+        end
 
         tempfile = Tempfile.new(["ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter])
-        tempfile.binmode 
+        tempfile.binmode
 
         blob.download do |chunk|
           tempfile.write(chunk)

data/lib/active_storage_validations/size_validator.rb

@@ -25,7 +25,7 @@ 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)
+        record.errors.add(attribute, :file_size_out_of_range, **errors_options)
         break
       end
     end

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.5
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.5
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  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: '0'
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,9 +106,13 @@ files:
 - Rakefile
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/ja.yml
+- config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/tr.yml
 - config/locales/uk.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
@@ -146,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage