active_storage_validations 0.8.6 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354dd29a7d41df8c36694ecb4424869a5a6c0c7add98a32186995199c036ae23
-  data.tar.gz: db75c2027d7e9fe55150223007b414957c67bdf1d3ccd5a58fcbb38daf836e1a
+  metadata.gz: 0475512c246a633adcc226c575f66826ffa09df688fda330f2b862d7229a3e3a
+  data.tar.gz: c52cbf3aa8527ddfc7e17f8619d63f1f3b008360e969f054a129d8e0f6af2e51
 SHA512:
-  metadata.gz: c919243c4a4791c4615d5b3112c896462ab34125ed3b4974a0ad1d29bf53b8521a95dc5c34636ad11025f607247794f2c29772217f2fc130771493330b569bd1
-  data.tar.gz: 9ecc389a981df18f6663e0ae112df499e9bf56e5f0f99a7a086c3cf59368625bc530e4f0c5add8d25f1e783ab8727aaa34bdf0ec3ca197be7035e3931a93fd44
+  metadata.gz: f472fa75d9d021f8ab55bff5dd900d738449884f9bf6ee72d953bb34c988acf01904c29dca7586f5d82ad192b9914bfd9e6f365d413615ef1b3aa18b9635cbb1
+  data.tar.gz: 8f1b3da90613ff72ab85aaa6faf6fe7403b132e1806c2e4f60156cf95d9f9dfd1dac20d950c7eb0cda64229427deb51d1ce2e4b1742020040c78853c8cdc1bba

data/README.md

@@ -1,6 +1,6 @@
 # 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.
 
@@ -117,7 +117,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 +137,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 :
 
@@ -189,20 +188,106 @@ Very simple example of validation with file attached, content type check and cus
 
 [![Sample](https://raw.githubusercontent.com/igorkasyanchuk/active_storage_validations/master/docs/preview.png)](https://raw.githubusercontent.com/igorkasyanchuk/active_storage_validations/master/docs/preview.png)
 
+## Test matchers
+Provides RSpec-compatible and Minitest-compatible matchers for testing the validators.
+
+### RSpec
+
+In `spec_helper.rb`, you'll need to require the matchers:
+
+```ruby
+require 'active_storage_validations/matchers'
+```
+
+And _include_ the module:
+
+```ruby
+RSpec.configure do |config|
+  config.include ActiveStorageValidations::Matchers
+end
+```
+
+Example (Note that the options are chainable):
+
+```ruby
+describe User do
+  it { is_expected.to validate_attached_of(:avatar) }
+
+  it { is_expected.to validate_content_type_of(:avatar).allowing('image/png', 'image/gif') }
+  it { is_expected.to validate_content_type_of(:avatar).rejecting('text/plain', 'text/xml') }
+
+  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_min(200) }
+  it { is_expected.to validate_dimensions_of(:avatar).width_max(500) }
+  it { is_expected.to validate_dimensions_of(:avatar).height_min(100) }
+  it { is_expected.to validate_dimensions_of(:avatar).height_max(300) }
+  it { is_expected.to validate_dimensions_of(:avatar).width_between(200..500) }
+  it { is_expected.to validate_dimensions_of(:avatar).height_between(100..300) }
+
+  it { is_expected.to validate_size_of(:avatar).less_than(50.kilobytes) }
+  it { is_expected.to validate_size_of(:avatar).less_than_or_equal_to(50.kilobytes) }
+  it { is_expected.to validate_size_of(:avatar).greater_than(1.kilobyte) }
+  it { is_expected.to validate_size_of(:avatar).greater_than_or_equal_to(1.kilobyte) }
+  it { is_expected.to validate_size_of(:avatar).between(100..500.kilobytes) }
+end
+```
+
+### Minitest
+To use the following syntax, make sure you have the [shoulda-context](https://github.com/thoughtbot/shoulda-context) gem up and running. To make use of the matchers you need to require the matchers:
+
+```ruby
+require 'active_storage_validations/matchers'
+```
+
+And _extend_ the module:
+
+```ruby
+class ActiveSupport::TestCase
+  extend ActiveStorageValidations::Matchers
+end
+```
+
+Example (Note that the options are chainable):
+
+```ruby
+class UserTest < ActiveSupport::TestCase
+  should validate_attached_of(:avatar)
+
+  should validate_content_type_of(:avatar).allowing('image/png', 'image/gif')
+  should validate_content_type_of(:avatar).rejecting('text/plain', 'text/xml')
+
+  should validate_dimensions_of(:avatar).width(250)
+  should validate_dimensions_of(:avatar).height(200)
+  should validate_dimensions_of(:avatar).width_min(200)
+  should validate_dimensions_of(:avatar).width_max(500)
+  should validate_dimensions_of(:avatar).height_min(100)
+  should validate_dimensions_of(:avatar).height_max(300)
+  should validate_dimensions_of(:avatar).width_between(200..500)
+  should validate_dimensions_of(:avatar).height_between(100..300)
+
+  should validate_size_of(:avatar).less_than(50.kilobytes)
+  should validate_size_of(:avatar).less_than_or_equal_to(50.kilobytes)
+  should validate_size_of(:avatar).greater_than(1.kilobyte)
+  should validate_size_of(:avatar).greater_than_or_equal_to(1.kilobyte)
+  should validate_size_of(:avatar).between(100..500.kilobytes)
+end
+```
+
 ## Todo
 
 * verify with remote storages (s3, etc)
 * 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
+* `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 (TESTS ARE NOT READY, migration in DB is needed for specs)
 
 To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migrate`).
 
@@ -210,12 +295,13 @@ To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migr
 
 - 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.
@@ -240,6 +326,16 @@ You are welcome to contribute.
 - https://github.com/UICJohn
 - 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

@@ -123,7 +123,7 @@ module ActiveStorageValidations
       key = options[:message].presence || type
       return if record.errors.added?(attribute, key)
       record.errors.add(attribute, key, *attrs)
-    end    
+    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.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'active_storage_validations/matchers/attached_validator_matcher'
+require 'active_storage_validations/matchers/content_type_validator_matcher'
+require 'active_storage_validations/matchers/dimension_validator_matcher'
+require 'active_storage_validations/matchers/size_validator_matcher'
+
+module ActiveStorageValidations
+  module Matchers
+    # Helper to stub a method with either RSpec or Minitest (whatever is available)
+    def self.stub_method(object, method, result)
+      if defined?(Minitest::Mock)
+        object.stub(method, result) do
+          yield
+        end
+      elsif defined?(RSpec::Mocks)
+        RSpec::Mocks.allow_message(object, method) { result }
+        yield
+      else
+        raise 'Need either Minitest::Mock or RSpec::Mocks to run this validator matcher'
+      end
+    end
+
+    def self.mock_metadata(attachment, width, height)
+      if Rails::VERSION::MAJOR >= 6
+        # Mock the Metadata class for rails 6
+        mock = OpenStruct.new(metadata: { width: width, height: height })
+        stub_method(ActiveStorageValidations::Metadata, :new, mock) do
+          yield
+        end
+      else
+        # Stub the metadata analysis for rails 5
+        stub_method(attachment, :analyze, true) do
+          stub_method(attachment, :analyzed?, true) do
+            stub_method(attachment, :metadata, { width: width, height: height }) do
+              yield
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_storage_validations/matchers/attached_validator_matcher.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  module Matchers
+    def validate_attached_of(name)
+      AttachedValidatorMatcher.new(name)
+    end
+
+    class AttachedValidatorMatcher
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+      end
+
+      def description
+        "validate #{@attribute_name} must be attached"
+      end
+
+      def matches?(subject)
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        responds_to_methods && valid_when_attached && invalid_when_not_attached
+      end
+
+      def failure_message
+        "is expected to validate attached of #{@attribute_name}"
+      end
+
+      def failure_message_when_negated
+        "is expected to not validate attached of #{@attribute_name}"
+      end
+
+      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
+        @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
+        @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
+        { io: Tempfile.new('.'), filename: 'dummy.txt', content_type: 'text/plain' }
+      end
+    end
+  end
+end

data/lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+# 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
+module ActiveStorageValidations
+  module Matchers
+    def validate_content_type_of(name)
+      ContentTypeValidatorMatcher.new(name)
+    end
+
+    class ContentTypeValidatorMatcher
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+      end
+
+      def description
+        "validate the content types allowed on attachment #{@attribute_name}"
+      end
+
+      def allowing(*types)
+        @allowed_types = types.flatten
+        self
+      end
+
+      def rejecting(*types)
+        @rejected_types = types.flatten
+        self
+      end
+
+      def matches?(subject)
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        responds_to_methods && allowed_types_allowed? && rejected_types_rejected?
+      end
+
+      def failure_message
+        <<~MESSAGE
+          Expected #{@attribute_name}
+            
+            Accept content types: #{allowed_types.join(", ")}
+              #{accepted_types_and_failures}
+
+            Reject content types: #{rejected_types.join(", ")}
+              #{rejected_types_and_failures}
+        MESSAGE
+      end
+
+      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)
+      end
+
+      def allowed_types_allowed?
+        @missing_allowed_types ||= allowed_types.reject { |type| type_allowed?(type) }
+        @missing_allowed_types.none?
+      end
+
+      def rejected_types_rejected?
+        @missing_rejected_types ||= rejected_types.select { |type| type_allowed?(type) }
+        @missing_rejected_types.none?
+      end
+
+      def accepted_types_and_failures
+        if @missing_allowed_types.present?
+          "#{@missing_allowed_types.join(", ")} were rejected."
+        else
+          "All were accepted successfully."
+        end
+      end
+
+      def rejected_types_and_failures
+        if @missing_rejected_types.present?
+          "#{@missing_rejected_types.join(", ")} were accepted."
+        else
+          "All were rejected successfully."
+        end
+      end
+
+      def type_allowed?(type)
+        @subject.public_send(@attribute_name).attach(attachment_for(type))
+        @subject.validate
+        @subject.errors.details[@attribute_name].all? { |error| error[:error] != :content_type_invalid }
+      end
+
+      def attachment_for(type)
+        suffix = type.to_s.split('/').last
+        { io: Tempfile.new('.'), filename: "test.#{suffix}", content_type: type }
+      end
+    end
+  end
+end

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  module Matchers
+    def validate_dimensions_of(name)
+      DimensionValidatorMatcher.new(name)
+    end
+
+    class DimensionValidatorMatcher
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+        @width_min = @width_max = @height_min = @height_max = nil
+      end
+
+      def description
+        "validate image dimensions of #{@attribute_name}"
+      end
+
+      def width_min(width)
+        @width_min = width
+        self
+      end
+
+      def width_max(width)
+        @width_max = width
+        self
+      end
+
+      def width(width)
+        @width_min = @width_max = width
+        self
+      end
+
+      def height_min(height)
+        @height_min = height
+        self
+      end
+
+      def height_max(height)
+        @height_max = height
+        self
+      end
+
+      def width_between(range)
+        @width_min, @width_max = range.first, range.last
+        self
+      end
+
+      def height_between(range)
+        @height_min, @height_max = range.first, range.last
+        self
+      end
+
+      def height(height)
+        @height_min = @height_max = height
+        self
+      end
+
+      def matches?(subject)
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        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
+
+      def failure_message
+        <<~MESSAGE
+          is expected to validate dimensions of #{@attribute_name}
+            width between #{@width_min} and #{@width_max}
+            height between #{@height_min} and #{@height_max}
+        MESSAGE
+      end
+
+      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
+
+      def valid_height
+        ((@height_min || 0) + (@height_max || 2000)) / 2
+      end
+
+      def width_smaller_than_min?
+        @width_min.nil? || !passes_validation_with_dimensions(@width_min - 1, valid_height, 'width')
+      end
+
+      def width_larger_than_min?
+        @width_min.nil? || @width_min == @width_max || passes_validation_with_dimensions(@width_min + 1, valid_height, 'width')
+      end
+
+      def width_smaller_than_max?
+        @width_max.nil? || @width_min == @width_max || passes_validation_with_dimensions(@width_max - 1, valid_height, 'width')
+      end
+
+      def width_larger_than_max?
+        @width_max.nil? || !passes_validation_with_dimensions(@width_max + 1, valid_height, 'width')
+      end
+
+      def width_equals?
+        @width_min.nil? || @width_min != @width_max || passes_validation_with_dimensions(@width_min, valid_height, 'width')
+      end
+
+      def height_smaller_than_min?
+        @height_min.nil? || !passes_validation_with_dimensions(valid_width, @height_min - 1, 'height')
+      end
+
+      def height_larger_than_min?
+        @height_min.nil? || @height_min == @height_max || passes_validation_with_dimensions(valid_width, @height_min + 1, 'height')
+      end
+
+      def height_smaller_than_max?
+        @height_max.nil? || @height_min == @height_max || passes_validation_with_dimensions(valid_width, @height_max - 1, 'height')
+      end
+
+      def height_larger_than_max?
+        @height_max.nil? || !passes_validation_with_dimensions(valid_width, @height_max + 1, 'height')
+      end
+
+      def height_equals?
+        @height_min.nil? || @height_min != @height_max || passes_validation_with_dimensions(valid_width, @height_min, 'height')
+      end
+
+      def passes_validation_with_dimensions(width, height, check)
+        @subject.public_send(@attribute_name).attach attachment_for(width, height)
+
+        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}") }
+        end
+      end
+
+      def attachment_for(width, height)
+        { io: Tempfile.new('Hello world!'), filename: 'test.png', content_type: 'image/png' }
+      end
+    end
+  end
+end

data/lib/active_storage_validations/matchers/size_validator_matcher.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# 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
+module ActiveStorageValidations
+  module Matchers
+    def validate_size_of(name)
+      SizeValidatorMatcher.new(name)
+    end
+
+    class SizeValidatorMatcher
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+        @low = @high = nil
+      end
+
+      def description
+        "validate file size of #{@attribute_name}"
+      end
+
+      def less_than(size)
+        @high = size - 1.byte
+        self
+      end
+
+      def less_than_or_equal_to(size)
+        @high = size
+        self
+      end
+
+      def greater_than(size)
+        @low = size + 1.byte
+        self
+      end
+
+      def greater_than_or_equal_to(size)
+        @low = size
+        self
+      end
+
+      def between(range)
+        @low, @high = range.first, range.last
+        self
+      end
+
+      def matches?(subject)
+        @subject = subject.is_a?(Class) ? subject.new : subject
+        responds_to_methods && lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
+      end
+
+      def failure_message
+        "is expected to validate file size of #{@attribute_name} to be between #{@low} and #{@high} bytes"
+      end
+
+      def failure_message_when_negated
+        "is expected to not validate file size of #{@attribute_name} to be between #{@low} and #{@high} bytes"
+      end
+
+      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
+
+      def higher_than_low?
+        @low.nil? || passes_validation_with_size(@low + 1)
+      end
+
+      def lower_than_high?
+        @high.nil? || @high == Float::INFINITY || passes_validation_with_size(@high - 1)
+      end
+
+      def higher_than_high?
+        @high.nil? || @high == Float::INFINITY || !passes_validation_with_size(@high + 1)
+      end
+
+      def passes_validation_with_size(new_size)
+        io = Tempfile.new('Hello world!')
+        Matchers.stub_method(io, :size, new_size) do
+          @subject.public_send(@attribute_name).attach(io: io, filename: 'test.png', content_type: 'image/pg')
+          @subject.validate
+          @subject.errors.details[@attribute_name].all? { |error| error[:error] != :file_size_out_of_range }
+        end
+      end
+    end
+  end
+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.6'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Validations for Active Storage (presence)
 email:
 - igorkasyanchuk@gmail.com
@@ -106,9 +92,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
@@ -117,6 +107,11 @@ files:
 - lib/active_storage_validations/dimension_validator.rb
 - lib/active_storage_validations/engine.rb
 - lib/active_storage_validations/limit_validator.rb
+- lib/active_storage_validations/matchers.rb
+- lib/active_storage_validations/matchers/attached_validator_matcher.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/size_validator_matcher.rb
 - lib/active_storage_validations/metadata.rb
 - lib/active_storage_validations/railtie.rb
 - lib/active_storage_validations/size_validator.rb
@@ -141,7 +136,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