active_storage_validations 0.9.2 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8b30d036f53b6e00b209c9fe9a34339ff23aa35b789da9585df7fee6c8dfad
-  data.tar.gz: 0655072452aa29e24bcea5abb01e6b72bf6ddee6f2646d92eb8b13dbaeff128f
+  metadata.gz: 52bbd6249bbadd7549ccd7daf17673e98ccfd757b15ec954b67c5d7ce3395c84
+  data.tar.gz: cf3664efb821cd7fe60b0536e0d394f900af6fb128161ab13d62d373b2018013
 SHA512:
-  metadata.gz: 8df0893d2048e22d55660f590a747d55b2fff2595bae0f7da8b9151079d2c87e7d09a5e3059529a9fd9ef1231e44b4e9c610d3d22c9da5bfc8e49eb3aa0d25ca
-  data.tar.gz: a55c3ba3ff97b5478061fc8a8307127231dbbbb64f49fdcaccea85e6c896e48e777b30e09c97d44b9d84d61b8b5c4ef6abdb843171120b1ae739b38ebf916fb2
+  metadata.gz: bece2608d56156a83e468ffaf4ed31dead1769882457c1ff8480586ce0335122b475084f24f914d4d8083c5b4f2b891bda7465b25b2d34272ba76631c313167f
+  data.tar.gz: 56a1cbb1bd5bddc4cce887405eecd6d5e27cc9bfcdca97e636ccf43cf98ce29d9077e1b3e7a602dcb229cd24d25125024c4d83beba6f82050edc773b32d21ca4

data/README.md

@@ -1,5 +1,9 @@
 # Active Storage Validations
 
+[![MiniTest](https://github.com/igorkasyanchuk/active_storage_validations/workflows/MiniTest/badge.svg)](https://github.com/igorkasyanchuk/active_storage_validations/actions)
+[![RailsJazz](https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/my_other.svg?raw=true)](https://www.railsjazz.com)
+[![https://www.patreon.com/igorkasyanchuk](https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/patron.svg?raw=true)](https://www.patreon.com/igorkasyanchuk)
+
 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.
@@ -54,14 +58,15 @@ end
 
 ### More examples
 
-- Content type validation using symbols. In order to infer the correct mime type from the symbol, the types must be registered with `Mime::Type`.
+- Content type validation using symbols. In order to infer the correct mime type from the symbol, the types must be registered with `Marcel::EXTENSIONS` (`MimeMagic::EXTENSIONS` for Rails <= 6.1.3).
 
 ```ruby
 class User < ApplicationRecord
   has_one_attached :avatar
   has_many_attached :photos
 
-  validates :avatar, attached: true, content_type: :png # Mime[:png].to_s => 'image/png'
+  validates :avatar, attached: true, content_type: :png # Marcel::Magic.by_extension(:png).to_s => 'image/png'
+                                                        # Rails <= 6.1.3; MimeMagic.by_extension(:png).to_s => 'image/png'
   # or
   validates :photos, attached: true, content_type: [:png, :jpg, :jpeg]
   # or
@@ -216,6 +221,7 @@ describe User do
 
   it { is_expected.to validate_dimensions_of(:avatar).width(250) }
   it { is_expected.to validate_dimensions_of(:avatar).height(200) }
+  it { is_expected.to validate_dimensions_of(:avatar).width(250).height(200).with_message('Invalid dimensions.') }
   it { is_expected.to validate_dimensions_of(:avatar).width_min(200) }
   it { is_expected.to validate_dimensions_of(:avatar).width_max(500) }
   it { is_expected.to validate_dimensions_of(:avatar).height_min(100) }
@@ -257,6 +263,7 @@ class UserTest < ActiveSupport::TestCase
 
   should validate_dimensions_of(:avatar).width(250)
   should validate_dimensions_of(:avatar).height(200)
+  should validate_dimensions_of(:avatar).width(250).height(200).with_message('Invalid dimensions.')
   should validate_dimensions_of(:avatar).width_min(200)
   should validate_dimensions_of(:avatar).width_max(500)
   should validate_dimensions_of(:avatar).height_min(100)
@@ -286,6 +293,20 @@ To run tests in root folder of gem:
 * `BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test` to run for Rails 5.2
 * `BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test` to run for Rails 6.0
 * `BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle exec rake test` to run for Rails 6.1
+* `BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle exec rake test` to run for Rails main branch
+
+Snippet to run in console:
+
+```
+BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle
+BUNDLE_GEMFILE=gemfiles/rails_5_2.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_6_0.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_6_1.gemfile bundle exec rake test
+BUNDLE_GEMFILE=gemfiles/rails_next.gemfile bundle exec rake test
+```
 
 ## Known issues
 
@@ -332,7 +353,19 @@ You are welcome to contribute.
 - https://github.com/molfar
 - https://github.com/connorshea
 - https://github.com/yshmarov
+- https://github.com/fongfan999
+- https://github.com/cooperka
+- https://github.com/dolarsrg
+- https://github.com/jayshepherd
+- https://github.com/ohbarye
+- https://github.com/randsina
+- https://github.com/vietqhoang
+- https://github.com/kemenaran
+- https://github.com/jrmhaig
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+[<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
+/>](https://www.railsjazz.com/)

data/config/locales/de.yml

@@ -15,3 +15,8 @@ de:
       dimension_height_less_than_or_equal_to: "Höhe muss kleiner oder gleich %{length} Pixel sein"
       dimension_width_equal_to: "Bildbreite muss genau %{length} Pixel sein"
       dimension_height_equal_to: "Bildhöhe muss genau %{length} Pixel sein"
+      aspect_ratio_not_square: "muss quadratisch sein"
+      aspect_ratio_not_portrait: "muss Hochformat sein"
+      aspect_ratio_not_landscape: "muss Querformat sein"
+      aspect_ratio_is_not: "muss ein Bildseitenverhältnis von %{aspect_ratio} haben"
+      aspect_ratio_unknown: "hat ein unbekanntes Bildseitenverhältnis"

data/config/locales/es.yml

@@ -16,7 +16,7 @@ es:
       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_not_portrait: "debe ser una imagen vertical"
+      aspect_ratio_not_landscape: "debe ser una imagen apaisada"
       aspect_ratio_is_not: "debe tener una relación de aspecto de %{aspect_ratio}"
       aspect_ratio_unknown: "tiene una relación de aspecto desconocida"

data/config/locales/it.yml

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

data/config/locales/pl.yml

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

data/config/locales/vi.yml

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

data/lib/active_storage_validations/aspect_ratio_validator.rb

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

data/lib/active_storage_validations/attached_validator.rb

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

data/lib/active_storage_validations/content_type_validator.rb

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

data/lib/active_storage_validations/dimension_validator.rb

@@ -34,7 +34,7 @@ module ActiveStorageValidations
     end
 
 
-    if Rails::VERSION::MAJOR >= 6
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
       def validate_each(record, attribute, _value)
         return true unless record.send(attribute).attached?
 

data/lib/active_storage_validations/matchers/content_type_validator_matcher.rb

@@ -57,7 +57,7 @@ module ActiveStorageValidations
       end
 
       def rejected_types
-        @rejected_types || (Mime::LOOKUP.keys - allowed_types)
+        @rejected_types || (Marcel::TYPES.keys - allowed_types)
       end
 
       def allowed_types_allowed?

data/lib/active_storage_validations/matchers/dimension_validator_matcher.rb

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

data/lib/active_storage_validations/matchers.rb

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

data/lib/active_storage_validations/metadata.rb

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

data/lib/active_storage_validations/size_validator.rb

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

data/lib/active_storage_validations/version.rb

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

metadata

@@ -1,17 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.6
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: activestorage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,12 +150,15 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/tr.yml
 - config/locales/uk.yml
+- config/locales/vi.yml
 - lib/active_storage_validations.rb
 - lib/active_storage_validations/aspect_ratio_validator.rb
 - lib/active_storage_validations/attached_validator.rb
@@ -150,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage