active_storage_validations 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77abbd375626f37f0ecae9dc8710249bde59202cb71ea2e925b5c2f026afd025
-  data.tar.gz: 5d694245be38c6f3ea7f3e1d157974e9bd5e63a67be276e25fccde072e48a52e
+  metadata.gz: 9ba7e03a6367634ed5ece53bda87d82c76b179c75e2c9b37e4055d8f47f9ab98
+  data.tar.gz: 7225e4937cab59e3209d082d9650c1077342eae7dcae46ddee0c25a9a5e93e56
 SHA512:
-  metadata.gz: c7e1a56bf9eb906d7bb5c05c2d89d901bbe93ca63ed86423276edb1eb22078f35dd70b40c997c9b0ed7e53df7364c8ed264ca627cf415bf74b8054e1a9d19f00
-  data.tar.gz: 024c5f428d64ed7462e395cea6add2c121b393ccd7d89992a0304fe44e97cdba6eb99b9b5b6ace0a4a199e759d31e08dd2eb1427c3aee4acfa6f624fe8238027
+  metadata.gz: 9464b889ae0f8ab4167bcc612926e44c52d3541de6092fa0c82baf57a2f9edb4f541780145443966fa168c8f3f819456b000fac4a8770c1e923219a7394918da
+  data.tar.gz: 4dea3b65668a16cac757d85f4e8d8f31e98c5089bbcf5747a5f192083fb12e2b57d611091eb2e2fb468aff27c590cdad1232566f24b75415784c7fe28434013f

data/README.md

@@ -53,7 +53,7 @@ $ bundle
 
 ### Error messages (I18n)
 
-Once you have installed the gem, you need to add the gem I18n error messages to your app. See [Internationalization (I18n)](#internationalization-i18n) section for more details.
+Once you have installed the gem, I18n error messages will be added automatically to your app. See [Internationalization (I18n)](#internationalization-i18n) section for more details.
 
 ### Using image metadata validators
 
@@ -71,6 +71,8 @@ Plus, you have to be sure to have the corresponding command-line tool installed
 
 To use the video and audio metadata validators (`dimension`, `aspect_ratio`, `processable_file` and `duration`), you will not need to add any gems. However you will need to have the `ffmpeg` command-line tool installed on your system (once again, be sure to have it installed both on your local and in your CI / production environments).
 
+If you want some inspiration about how to add `imagemagick`, `libvips` or `ffmpeg` to your docker image, you can check how we do it for the gem CI (https://github.com/igorkasyanchuk/active_storage_validations/blob/master/.github/workflows/main.yml)
+
 ### Using content type spoofing protection validator option
 
 To use the `spoofing_protection` option with the `content_type` validator, you only need to have the UNIX `file` command on your system.
@@ -248,7 +250,7 @@ If you choose to use a content_type 'shorthand' (like `png`), note that it will
 Marcel::MimeType.extend "application/ino", extensions: %w(ino), parents: "text/plain" # Registering arduino INO files
 ```
 
-Be sure to at least include one the the `extensions`, `parents` or `magic` option, otherwise the content type will not be registered.
+Be sure to at least include one the `extensions`, `parents` or `magic` option, otherwise the content type will not be registered.
 
 #### Content type spoofing protection
 
@@ -656,65 +658,11 @@ But this major version bump also comes with some breaking changes. Below are the
 
 ## Internationalization (I18n)
 
-Active Storage Validations uses I18n for error messages. Add these keys in your translation files to make them available:
+Active Storage Validations uses I18n for error messages. The error messages are automatically loaded in your Rails app if your language translations are present in the gem.
 
-```yml
-en:
-  errors:
-    messages:
-      content_type_invalid:
-        one: "has an invalid content type (authorized content type is %{authorized_human_content_types})"
-        other: "has an invalid content type (authorized content types are %{authorized_human_content_types})"
-      content_type_spoofed:
-        one: "has a content type that is not equivalent to the one that is detected through its content (authorized content type is %{authorized_human_content_types})"
-        other: "has a content type that is not equivalent to the one that is detected through its content (authorized content types are %{authorized_human_content_types})"
-      file_size_not_less_than: "file size must be less than %{max} (current size is %{file_size})"
-      file_size_not_less_than_or_equal_to: "file size must be less than or equal to %{max} (current size is %{file_size})"
-      file_size_not_greater_than: "file size must be greater than %{min} (current size is %{file_size})"
-      file_size_not_greater_than_or_equal_to: "file size must be greater than or equal to %{min} (current size is %{file_size})"
-      file_size_not_between: "file size must be between %{min} and %{max} (current size is %{file_size})"
-      total_file_size_not_less_than: "total file size must be less than %{max} (current size is %{total_file_size})"
-      total_file_size_not_less_than_or_equal_to: "total file size must be less than or equal to %{max} (current size is %{total_file_size})"
-      total_file_size_not_greater_than: "total file size must be greater than %{min} (current size is %{total_file_size})"
-      total_file_size_not_greater_than_or_equal_to: "total file size must be greater than or equal to %{min} (current size is %{total_file_size})"
-      total_file_size_not_between: "total file size must be between %{min} and %{max} (current size is %{total_file_size})"
-      duration_not_less_than: "duration must be less than %{max} (current duration is %{duration})"
-      duration_not_less_than_or_equal_to: "duration must be less than or equal to %{max} (current duration is %{duration})"
-      duration_not_greater_than: "duration must be greater than %{min} (current duration is %{duration})"
-      duration_not_greater_than_or_equal_to: "duration must be greater than or equal to %{min} (current duration is %{duration})"
-      duration_not_between: "duration must be between %{min} and %{max} (current duration is %{duration})"
-      limit_out_of_range:
-        zero: "no files attached (must have between %{min} and %{max} files)"
-        one: "only 1 file attached (must have between %{min} and %{max} files)"
-        other: "total number of files must be between %{min} and %{max} files (there are %{count} files attached)"
-      limit_min_not_reached:
-        zero: "no files attached (must have at least %{min} files)"
-        one: "only 1 file attached (must have at least %{min} files)"
-        other: "%{count} files attached (must have at least %{min} files)"
-      limit_max_exceeded:
-        zero: "no files attached (maximum is %{max} files)"
-        one: "too many files attached (maximum is %{max} files, got %{count})"
-        other: "too many files attached (maximum is %{max} files, got %{count})"
-      media_metadata_missing: "is not a valid media file"
-      dimension_min_not_included_in: "must be greater than or equal to %{width} x %{height} pixel"
-      dimension_max_not_included_in: "must be less than or equal to %{width} x %{height} pixel"
-      dimension_width_not_included_in: "width is not included between %{min} and %{max} pixel"
-      dimension_height_not_included_in: "height is not included between %{min} and %{max} pixel"
-      dimension_width_not_greater_than_or_equal_to: "width must be greater than or equal to %{length} pixel"
-      dimension_height_not_greater_than_or_equal_to: "height must be greater than or equal to %{length} pixel"
-      dimension_width_not_less_than_or_equal_to: "width must be less than or equal to %{length} pixel"
-      dimension_height_not_less_than_or_equal_to: "height must be less than or equal to %{length} pixel"
-      dimension_width_not_equal_to: "width must be equal to %{length} pixel"
-      dimension_height_not_equal_to: "height must be equal to %{length} pixel"
-      aspect_ratio_not_square: "must be square (current file is %{width}x%{height}px)"
-      aspect_ratio_not_portrait: "must be portrait (current file is %{width}x%{height}px)"
-      aspect_ratio_not_landscape: "must be landscape (current file is %{width}x%{height}px)"
-      aspect_ratio_not_x_y: "must be %{authorized_aspect_ratios} (current file is %{width}x%{height}px)"
-      aspect_ratio_invalid: "has an invalid aspect ratio (valid aspect ratios are %{authorized_aspect_ratios})"
-      file_not_processable: "is not identified as a valid media file"
-```
+Translation files are available [here](https://github.com/igorkasyanchuk/active_storage_validations/tree/master/config/locales). We currently have translations for `da`, `de`, `en`, `en-GB`, `es`, `fr`, `it`, `ja`, `nl`, `pl`, `pt-BR`, `ru`, `sv`, `tr`, `uk`, `vi` and `zh-CN`. Feel free to drop a PR to add your language ✌️.
 
-Other translation files are available [here](https://github.com/igorkasyanchuk/active_storage_validations/tree/master/config/locales).
+If you wish to customize the error messages, just copy, paste and update the translation files into your application locales.
 
 ## Test matchers
 
@@ -760,8 +708,8 @@ describe User do
 
   # content_type:
   # #allowing, #rejecting
-  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_content_type_of(:avatar).allowing('image/png', 'image/gif') } # possible to use an Array or *splatted array
+  it { is_expected.to validate_content_type_of(:avatar).rejecting('text/plain', 'text/xml') } # possible to use an Array or *splatted array
 
   # dimension:
   # #width, #height, #width_min, #height_min, #width_max, #height_max, #width_between, #height_between

data/config/locales/da.yml

@@ -34,6 +34,7 @@ da:
         zero: "ingen filer vedhæftet (maks. er %{max} filer)"
         one: "for mange vedhæftede filer (maks. er %{max} filer, fik %{count})"
         other: "for mange vedhæftede filer (maks. er %{max} filer, fik %{count})"
+      attachment_missing: "har ingen vedhæftet fil"
       media_metadata_missing: "er ikke en gyldig mediefil"
       dimension_min_not_included_in: "skal være større end eller lig med %{width} x %{height} pixel"
       dimension_max_not_included_in: "skal være mindre end eller lig med %{width} x %{height} pixel"

data/config/locales/de.yml

@@ -34,6 +34,7 @@ de:
         zero: "Keine Dateien angehängt (maximal %{max} Dateien)"
         one: "zu viele angehängte Dateien (maximal %{max} Dateien, %{count})"
         other: "Zu viele angehängte Dateien (maximal %{max} Dateien, %{count})"
+      attachment_missing: "hat keine angehängte Datei"
       media_metadata_missing: "ist keine gültige Mediendatei"
       dimension_min_not_included_in: "muss größer oder gleich %{width} x %{height} Pixel sein"
       dimension_max_not_included_in: "muss kleiner oder gleich %{width} x %{height} Pixel sein"

data/config/locales/en-GB.yml

@@ -0,0 +1,54 @@
+en-GB:
+  errors:
+    messages:
+      content_type_invalid:
+        one: "has an invalid content type (authorized content type is %{authorized_human_content_types})"
+        other: "has an invalid content type (authorized content types are %{authorized_human_content_types})"
+      content_type_spoofed:
+        one: "has a content type that is not equivalent to the one that is detected through its content (authorized content type is %{authorized_human_content_types})"
+        other: "has a content type that is not equivalent to the one that is detected through its content (authorized content types are %{authorized_human_content_types})"
+      file_size_not_less_than: "file size must be less than %{max} (current size is %{file_size})"
+      file_size_not_less_than_or_equal_to: "file size must be less than or equal to %{max} (current size is %{file_size})"
+      file_size_not_greater_than: "file size must be greater than %{min} (current size is %{file_size})"
+      file_size_not_greater_than_or_equal_to: "file size must be greater than or equal to %{min} (current size is %{file_size})"
+      file_size_not_between: "file size must be between %{min} and %{max} (current size is %{file_size})"
+      total_file_size_not_less_than: "total file size must be less than %{max} (current size is %{total_file_size})"
+      total_file_size_not_less_than_or_equal_to: "total file size must be less than or equal to %{max} (current size is %{total_file_size})"
+      total_file_size_not_greater_than: "total file size must be greater than %{min} (current size is %{total_file_size})"
+      total_file_size_not_greater_than_or_equal_to: "total file size must be greater than or equal to %{min} (current size is %{total_file_size})"
+      total_file_size_not_between: "total file size must be between %{min} and %{max} (current size is %{total_file_size})"
+      duration_not_less_than: "duration must be less than %{max} (current duration is %{duration})"
+      duration_not_less_than_or_equal_to: "duration must be less than or equal to %{max} (current duration is %{duration})"
+      duration_not_greater_than: "duration must be greater than %{min} (current duration is %{duration})"
+      duration_not_greater_than_or_equal_to: "duration must be greater than or equal to %{min} (current duration is %{duration})"
+      duration_not_between: "duration must be between %{min} and %{max} (current duration is %{duration})"
+      limit_out_of_range:
+        zero: "no files attached (must have between %{min} and %{max} files)"
+        one: "only 1 file attached (must have between %{min} and %{max} files)"
+        other: "total number of files must be between %{min} and %{max} files (there are %{count} files attached)"
+      limit_min_not_reached:
+        zero: "no files attached (must have at least %{min} files)"
+        one: "only 1 file attached (must have at least %{min} files)"
+        other: "%{count} files attached (must have at least %{min} files)"
+      limit_max_exceeded:
+        zero: "no files attached (maximum is %{max} files)"
+        one: "too many files attached (maximum is %{max} files, got %{count})"
+        other: "too many files attached (maximum is %{max} files, got %{count})"
+      attachment_missing: "is missing its attachment"
+      media_metadata_missing: "is not a valid media file"
+      dimension_min_not_included_in: "must be greater than or equal to %{width} x %{height} pixel"
+      dimension_max_not_included_in: "must be less than or equal to %{width} x %{height} pixel"
+      dimension_width_not_included_in: "width is not included between %{min} and %{max} pixel"
+      dimension_height_not_included_in: "height is not included between %{min} and %{max} pixel"
+      dimension_width_not_greater_than_or_equal_to: "width must be greater than or equal to %{length} pixel"
+      dimension_height_not_greater_than_or_equal_to: "height must be greater than or equal to %{length} pixel"
+      dimension_width_not_less_than_or_equal_to: "width must be less than or equal to %{length} pixel"
+      dimension_height_not_less_than_or_equal_to: "height must be less than or equal to %{length} pixel"
+      dimension_width_not_equal_to: "width must be equal to %{length} pixel"
+      dimension_height_not_equal_to: "height must be equal to %{length} pixel"
+      aspect_ratio_not_square: "must be square (current file is %{width}x%{height}px)"
+      aspect_ratio_not_portrait: "must be portrait (current file is %{width}x%{height}px)"
+      aspect_ratio_not_landscape: "must be landscape (current file is %{width}x%{height}px)"
+      aspect_ratio_not_x_y: "must be %{authorized_aspect_ratios} (current file is %{width}x%{height}px)"
+      aspect_ratio_invalid: "has an invalid aspect ratio (valid aspect ratios are %{authorized_aspect_ratios})"
+      file_not_processable: "is not identified as a valid media file"

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
         zero: "no files attached (maximum is %{max} files)"
         one: "too many files attached (maximum is %{max} files, got %{count})"
         other: "too many files attached (maximum is %{max} files, got %{count})"
+      attachment_missing: "is missing its attachment"
       media_metadata_missing: "is not a valid media file"
       dimension_min_not_included_in: "must be greater than or equal to %{width} x %{height} pixel"
       dimension_max_not_included_in: "must be less than or equal to %{width} x %{height} pixel"

data/config/locales/es.yml

@@ -34,6 +34,7 @@ es:
         zero: "no hay archivos adjuntos (máximo es %{max} archivos)"
         one: "demasiados archivos adjuntos (máximo es %{max} archivos, got %{count})"
         other: "demasiados archivos adjuntos (máximo es %{max} archivos, got %{count})"
+      attachment_missing: "no tiene archivo adjunto"
       media_metadata_missing: "no es un archivo multimedia válido"
       dimension_min_not_included_in: "debe ser mayor o igual a %{width} x %{height} pixel"
       dimension_max_not_included_in: "debe ser menor o igual a %{width} x %{height} pixel"

data/config/locales/fr.yml

@@ -34,6 +34,7 @@ fr:
         zero: "pas de fichiers joints (le maximum autorisé est %{max} fichiers)"
         one: "trop de fichiers joints (le maximum autorisé est %{max} fichiers, obtenu %{count})"
         other: "trop de fichiers joints (le maximum autorisé est %{max} fichiers, obtenu %{count})"
+      attachment_missing: "n'a pas de fichier joint"
       media_metadata_missing: "n'est pas un fichier média valide"
       dimension_min_not_included_in: "doit être supérieur ou égal à %{width} x %{height} pixels"
       dimension_max_not_included_in: "doit être inférieur ou égal à %{width} x %{height} pixels"

data/config/locales/it.yml

@@ -19,7 +19,7 @@ it:
       total_file_size_not_between: "la dimensione totale dei file deve essere compresa tra %{min} e %{max} (la dimensione attuale è %{total_file_size})"
       duration_not_less_than: "la durata deve essere inferiore a %{max} (la durata corrente è %{duration})"
       duration_not_less_than_or_equal_to: "la durata deve essere inferiore o uguale a %{max} (la durata corrente è %{duration})"
-      duration_not_greader_than: "la durata deve essere superiore a %{min} (la durata corrente è %{duration})"
+      duration_not_greater_than: "la durata deve essere superiore a %{min} (la durata corrente è %{duration})"
       duration_not_greater_than_or_equal_to: "la durata deve essere maggiore o uguale a %{min} (la durata corrente è %{duration})"
       duration_not_between: "la durata deve essere compresa tra %{min} e %{max} (la durata corrente è %{duration})"
       limit_out_of_range:
@@ -34,6 +34,7 @@ it:
         zero: "nessun file allegato (massimo è %{max} file)"
         one: "troppi file allegati (massimo è %{max} file, ottenuto %{count})"
         other: "troppi file allegati (massimo è %{max} file, ottenuto %{count})"
+      attachment_missing: "non ha un file allegato"
       media_metadata_missing: "non è un file multimediale valido"
       dimension_min_not_included_in: "deve essere maggiore o uguale a %{width} x %{height} pixel"
       dimension_max_not_included_in: "deve essere minore o uguale a %{width} x %{height} pixel"

data/config/locales/ja.yml

@@ -34,6 +34,7 @@ ja:
         zero: "添付されたファイルはありません(最大は%{max}ファイル)"
         one: "添付されているファイルが多すぎます(最大は%{max}ファイル、%{count})"
         other: "添付されているファイルが多すぎます(最大は%{max}ファイル、%{count})"
+      attachment_missing: "添付ファイルがありません"
       media_metadata_missing: "有効なメディアファイルではありません"
       dimension_min_not_included_in: "は %{width} x %{height} ピクセル以上の大きさにしてください"
       dimension_max_not_included_in: "は %{width} x %{height} ピクセル以下の大きさにしてください"

data/config/locales/nl.yml

@@ -34,6 +34,7 @@ nl:
         zero: "geen bestanden bijgevoegd (maximaal is %{max} bestanden)"
         one: "te veel bijgevoegde bestanden (maximaal is %{max} bestanden, kreeg %{count})"
         other: "te veel bijgevoegde bestanden (maximum is %{max} bestanden, kreeg %{count})"
+      attachment_missing: "heeft geen bijgevoegd bestand"
       media_metadata_missing: "is geen geldig mediabestand"
       dimension_min_not_included_in: "moet groter of gelijk zijn aan %{width} x %{height} pixels"
       dimension_max_not_included_in: "moet kleiner of gelijk zijn aan %{width} x %{height} pixels"

data/config/locales/pl.yml

@@ -34,6 +34,7 @@ pl:
         zero: "brak dołączonych plików (maksymalnie jest to %{max} pliki)"
         one: "zbyt wiele dołączonych plików (maksymalnie jest to %{max} pliki, otrzymano %{count})"
         other: "zbyt wiele dołączonych plików (maksymalnie jest to %{max} pliki, otrzymano %{count})"
+      attachment_missing: "nie ma załączonego pliku"
       media_metadata_missing: "nie jest prawidłowym plikiem multimedialnym"
       dimension_min_not_included_in: "musi być równe lub większe od %{width} x %{height} pixeli"
       dimension_max_not_included_in: "musi być równe lub mniejsze od %{width} x %{height} pixeli"

data/config/locales/pt-BR.yml

@@ -34,6 +34,7 @@ pt-BR:
         zero: "sem arquivos anexados (o máximo é %{max})"
         one: "muitos arquivos anexados (o máximo é %{max}, obteve %{count})"
         other: "muitos arquivos anexados (o máximo é %{max}, obteve %{count})"
+      attachment_missing: "não tem nenhum arquivo anexado"
       media_metadata_missing: "não é um arquivo de mídia válido"
       dimension_min_not_included_in: "deve ser maior ou igual a %{width} x %{height} pixels"
       dimension_max_not_included_in: "deve ser menor ou igual a %{width} x %{height} pixels"

data/config/locales/ru.yml

@@ -34,6 +34,7 @@ ru:
         zero: "никаких файлов не прилагается (максимум составляет %{max} файлов)"
         one: "слишком много файлов прикреплено (максимум составляет %{max} файлов, получил %{count})"
         other: "слишком много файлов прикреплено (максимум составляет %{max} файлов, получил %{count})"
+      attachment_missing: "не имеет прикрепленного файла"
       media_metadata_missing: "не является действительным медиафайлом"
       dimension_min_not_included_in: "должен быть больше или равно %{width} x %{height} пикселям"
       dimension_max_not_included_in: "должно быть меньше или равно %{width} x %{height} пикселям"

data/config/locales/sv.yml

@@ -34,6 +34,7 @@ sv:
         zero: "inga filer bifogade (maximalt är %{max} filer)"
         one: "för många filer bifogade (maximalt är %{max} -filer, fick %{count})"
         other: "för många filer bifogade (maximalt är %{max} -filer, fick %{count})"
+      attachment_missing: "har ingen bifogad fil"
       media_metadata_missing: "är inte en giltig mediefil"
       dimension_min_not_included_in: "måste minst vara %{width} x %{height} pixlar"
       dimension_max_not_included_in: "måste vara mindre eller lika med %{width} x %{height} pixlar"

data/config/locales/tr.yml

@@ -34,6 +34,7 @@ tr:
         zero: "dosya eklenmedi (maksimum %{max} dosyaları)"
         one: "çok fazla dosya eklendi (maksimum %{max} dosyaları, %{count})"
         other: "çok fazla dosya eklendi (maksimum %{max} dosyaları, %{count} var)"
+      attachment_missing: "ekli dosya yok"
       media_metadata_missing: "geçerli bir medya dosyası değil"
       dimension_min_not_included_in: "%{width} x %{height} piksele eşit ya da büyük olmalı"
       dimension_max_not_included_in: "%{width} x %{height} piksele eşit ya da küçük olmalı"

data/config/locales/uk.yml

@@ -34,6 +34,7 @@ uk:
         zero: "не додано файлів (максимум -%{max} файли)"
         one: "занадто багато доданих файлів (максимум -%{max} файлів, отримав %{count})"
         other: "занадто багато доданих файлів (максимум -%{max} файлів, отримав %{count})"
+      attachment_missing: "не має доданого файлу"
       media_metadata_missing: "не є допустимим зображенням"
       dimension_min_not_included_in: "мусить бути більше або дорівнювати %{width} x %{height} пікселям"
       dimension_max_not_included_in: "мусить бути менше або дорівнювати %{width} x %{height} пікселям"

data/config/locales/vi.yml

@@ -34,6 +34,7 @@ vi:
         zero: "không có tệp nào được đính kèm (tối đa là các tệp %{max})"
         one: "quá nhiều tệp được đính kèm (tối đa là các tệp %{max}, có %{count})"
         other: "quá nhiều tệp được đính kèm (tối đa là các tệp %{max}, có %{count})"
+      attachment_missing: "không có tập tin đính kèm"
       media_metadata_missing: "không phải là ảnh"
       dimension_min_not_included_in: "phải lớn hơn hoặc bằng %{width} x %{height} pixel"
       dimension_max_not_included_in: "phải nhỏ hơn hoặc bằng %{width} x %{height} pixel"

data/config/locales/zh-CN.yml

@@ -34,6 +34,7 @@ zh-CN:
         zero: "未附加文件（最大为%{max}文件)"
         one: "附加的文件太多（最大为%{max}文件,得到%{count})"
         other: "附加的文件太多（最大为%{max}文件,得到%{count})"
+      attachment_missing: "没有附件"
       media_metadata_missing: "不是有效的媒体文件"
       dimension_min_not_included_in: "必须大于或等于 %{width} x %{height} 像素"
       dimension_max_not_included_in: "必须小于或等于 %{width} x %{height} 像素"

data/lib/active_storage_validations/analyzer/audio_analyzer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'open3'
-require_relative 'shared/asv_ff_probable'
+require "open3"
+require_relative "shared/asv_ff_probable"
 
 module ActiveStorageValidations
   # = ActiveStorageValidations Audio \Analyzer

data/lib/active_storage_validations/analyzer/content_type_analyzer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'open3'
+require "open3"
 
 module ActiveStorageValidations
   # = ActiveStorageValidations ContentType \Analyzer
@@ -41,15 +41,15 @@ module ActiveStorageValidations
         end
       end
     rescue Errno::ENOENT
-      raise FileCommandLineToolNotInstalledError, 'file command-line tool is not installed'
+      raise FileCommandLineToolNotInstalledError, "file command-line tool is not installed"
     end
 
     def media_from_path(path)
       instrument("file") do
         stdout, status = Open3.capture2(
-          'file',
-          '-b',
-          '--mime-type',
+          "file",
+          "-b",
+          "--mime-type",
           path
         )
 

data/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb

@@ -5,7 +5,6 @@ module ActiveStorageValidations
   # MiniMagick requires the {ImageMagick}[http://www.imagemagick.org] system library.
   # This is the default Rails image analyzer.
   class Analyzer::ImageAnalyzer::ImageMagick < Analyzer::ImageAnalyzer
-
     private
 
     def read_media

data/lib/active_storage_validations/analyzer/image_analyzer/vips.rb

@@ -4,7 +4,6 @@ module ActiveStorageValidations
   # This analyzer relies on the third-party {ruby-vips}[https://github.com/libvips/ruby-vips] gem.
   # Ruby-vips requires the {libvips}[https://libvips.github.io/libvips/] system library.
   class Analyzer::ImageAnalyzer::Vips < Analyzer::ImageAnalyzer
-
     private
 
     def read_media

data/lib/active_storage_validations/analyzer/video_analyzer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'open3'
-require_relative 'shared/asv_ff_probable'
+require "open3"
+require_relative "shared/asv_ff_probable"
 
 module ActiveStorageValidations
   # = ActiveStorageValidations Video \Analyzer
@@ -80,7 +80,7 @@ module ActiveStorageValidations
           numerator   = Integer(terms[0])
           denominator = Integer(terms[1])
 
-          [numerator, denominator] unless numerator == 0
+          [ numerator, denominator ] unless numerator == 0
         end
       end
     end
@@ -127,4 +127,4 @@ module ActiveStorageValidations
       @container ||= @media["format"] || {}
     end
   end
-end
+end

data/lib/active_storage_validations/analyzer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_loggable'
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_loggable"
 
 module ActiveStorageValidations
   # = Active Storage Validations \Analyzer
@@ -37,29 +37,30 @@ module ActiveStorageValidations
       raise NotImplementedError
     end
 
+    # rubocop:disable Metrics/MethodLength
     def media(tempfile)
       @media ||= case @attachable
-                 when ActiveStorage::Blob, String
-                   blob = @attachable.is_a?(String) ? ActiveStorage::Blob.find_signed!(@attachable) : @attachable
-                   media_from_tempfile_path(tempfile, blob)
-                 when Hash
-                   io = @attachable[:io]
-                   if io.is_a?(StringIO)
-                     media_from_tempfile_path(tempfile, io)
-                   else
-                     File.open(io) do |file|
-                       media_from_path(file.path)
-                    end
-                   end
-                 when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile
-                   media_from_path(@attachable.path)
-                 when File
-                   supports_file_attachment? ? media_from_path(@attachable.path) : raise_rails_like_error(@attachable)
-                 when Pathname
-                   supports_pathname_attachment? ? media_from_path(@attachable.to_s) : raise_rails_like_error(@attachable)
-                 else
-                   raise_rails_like_error(@attachable)
-                 end
+      when ActiveStorage::Blob, String
+        blob = @attachable.is_a?(String) ? ActiveStorage::Blob.find_signed!(@attachable) : @attachable
+        media_from_tempfile_path(tempfile, blob)
+      when Hash
+        io = @attachable[:io]
+        if io.is_a?(StringIO)
+          media_from_tempfile_path(tempfile, io)
+        else
+          File.open(io) do |file|
+            media_from_path(file.path)
+        end
+        end
+      when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile
+        media_from_path(@attachable.path)
+      when File
+        supports_file_attachment? ? media_from_path(@attachable.path) : raise_rails_like_error(@attachable)
+      when Pathname
+        supports_pathname_attachment? ? media_from_path(@attachable.to_s) : raise_rails_like_error(@attachable)
+      else
+        raise_rails_like_error(@attachable)
+      end
     end
 
     def media_from_tempfile_path(tempfile, file_representation)

data/lib/active_storage_validations/aspect_ratio_validator.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_analyzable'
-require_relative 'shared/asv_attachable'
-require_relative 'shared/asv_errorable'
-require_relative 'shared/asv_optionable'
-require_relative 'shared/asv_symbolizable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_analyzable"
+require_relative "shared/asv_attachable"
+require_relative "shared/asv_errorable"
+require_relative "shared/asv_optionable"
+require_relative "shared/asv_symbolizable"
 
 module ActiveStorageValidations
   class AspectRatioValidator < ActiveModel::EachValidator # :nodoc
@@ -48,7 +48,7 @@ module ActiveStorageValidations
     private
 
     def is_valid?(record, attribute, attachable, metadata)
-      !media_metadata_missing?(record, attribute, attachable, metadata) &&
+      media_metadata_present?(record, attribute, attachable, metadata) &&
         authorized_aspect_ratio?(record, attribute, attachable, metadata)
     end
 
@@ -64,11 +64,10 @@ module ActiveStorageValidations
 
       return true if attachable_aspect_ratio_is_authorized
 
-      errors_options = initialize_error_options(options, attachable)
-      error_type = aspect_ratio_error_mapping
-      errors_options[:authorized_aspect_ratios] = string_aspect_ratios
+      errors_options = initialize_and_populate_error_options(options, attachable)
       errors_options[:width] = metadata[:width]
       errors_options[:height] = metadata[:height]
+      error_type = aspect_ratio_error_mapping
       add_error(record, attribute, error_type, **errors_options)
       false
     end
@@ -80,13 +79,17 @@ module ActiveStorageValidations
       NAMED_ASPECT_RATIOS.include?(aspect_ratio) ? :"aspect_ratio_not_#{aspect_ratio}" : :aspect_ratio_not_x_y
     end
 
-    def media_metadata_missing?(record, attribute, attachable, metadata)
-      return false if metadata[:width].to_i > 0 && metadata[:height].to_i > 0
+    def media_metadata_present?(record, attribute, attachable, metadata)
+      return true if metadata[:width].to_i > 0 && metadata[:height].to_i > 0
+
+      add_media_metadata_missing_error(record, attribute, attachable)
+      false
+    end
 
+    def initialize_and_populate_error_options(options, attachable)
       errors_options = initialize_error_options(options, attachable)
       errors_options[:authorized_aspect_ratios] = string_aspect_ratios
-      add_error(record, attribute, :media_metadata_missing, **errors_options)
-      true
+      errors_options
     end
 
     def valid_square_aspect_ratio?(metadata)
@@ -112,7 +115,7 @@ module ActiveStorageValidations
     def ensure_at_least_one_validator_option
       return if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
 
-      raise ArgumentError, 'You must pass either :with or :in to the validator'
+      raise ArgumentError, "You must pass either :with or :in to the validator"
     end
 
     def ensure_aspect_ratio_validity
@@ -148,7 +151,7 @@ module ActiveStorageValidations
 
           "#{x}:#{y}"
         end
-      end.join(', ')
+      end.join(", ")
     end
   end
 end

data/lib/active_storage_validations/attached_validator.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_errorable'
-require_relative 'shared/asv_symbolizable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_errorable"
+require_relative "shared/asv_symbolizable"
 
 module ActiveStorageValidations
   class AttachedValidator < ActiveModel::EachValidator # :nodoc:

data/lib/active_storage_validations/base_comparison_validator.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'shared/asv_active_storageable'
-require_relative 'shared/asv_errorable'
-require_relative 'shared/asv_optionable'
-require_relative 'shared/asv_symbolizable'
+require_relative "shared/asv_active_storageable"
+require_relative "shared/asv_errorable"
+require_relative "shared/asv_optionable"
+require_relative "shared/asv_symbolizable"
 
 module ActiveStorageValidations
   class BaseComparisonValidator < ActiveModel::EachValidator # :nodoc:
@@ -22,14 +22,14 @@ module ActiveStorageValidations
 
     def initialize(*args)
       if self.class == BaseComparisonValidator
-        raise NotImplementedError, 'BaseComparisonValidator is an abstract class and cannot be instantiated directly.'
+        raise NotImplementedError, "BaseComparisonValidator is an abstract class and cannot be instantiated directly."
       end
       super
     end
 
     def check_validity!
       unless AVAILABLE_CHECKS.one? { |argument| options.key?(argument) }
-        raise ArgumentError, 'You must pass either :less_than(_or_equal_to), :greater_than(_or_equal_to), or :between to the validator'
+        raise ArgumentError, "You must pass either :less_than(_or_equal_to), :greater_than(_or_equal_to), or :between to the validator"
       end
     end