active_storage_validations 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c309d722907560012bd41f805b1a0469c234e39a1087c4c8a9e9ff11d8ab58a
-  data.tar.gz: 9bae813ffb0cd86479ac7b451eaa682602261a6c2daa3357b474e0dbcf7935f7
+  metadata.gz: 0eeb2c72a1719accd4a287eaad2d12fd0b60dd3ea196d0e68afeeb87a8acca03
+  data.tar.gz: 748af563170ca1c931a000a2126792e97aaa4e775ccf61d0d3938412c6f741de
 SHA512:
-  metadata.gz: 167aa259ec9011e638ed5c5ca67b5402d51fa11293f31766400ce9bddf028901ee4733345797ad2bf34acbb653652f16b8c150341fc867a36a4688c8c12bc8ff
-  data.tar.gz: 1c86899eb90a09dfb27f2c35693098c01de8b1a6e92573a10f3163fa19006b45c27a302d5b86f2616132e18739e7688b648b9088ba7d789b46e794f7f11bd1ee
+  metadata.gz: deb20600c0abc0abd12db58705fd64d8a5b4de214861c78ce18396b47178c7c42820c66e2137ed3ae259dde94a0fc71fd179b7907d98849d4bcc6ac795b84e3e
+  data.tar.gz: cefcd5c92ca650366f3eccc4431fe4431b1543ae211013a00c997f2dd8c249b429758f8a419e46ae79f94b9e2313aa7fc6edd503f9d79e0885fe8e7549842cbe

data/README.md

@@ -4,6 +4,16 @@ If you are using `active_storage` gem and you want to add simple validations for
 
 This gems doing it for you. Just use `attached: true` or `content_type: 'image/png'` validation.
 
+[![Build Status](https://travis-ci.org/igorkasyanchuk/active_storage_validations.svg?branch=master)](https://travis-ci.org/igorkasyanchuk/active_storage_validations)
+
+## What it can do
+
+* validates if file(s) attached
+* validates content type
+* validates size of files
+* validates number of uploaded files (min/max required)
+* custom error messages
+
 ## Usage
 
 For example you have a model like this and you want to add validation.
@@ -26,11 +36,13 @@ or
 class Project < ApplicationRecord
   has_one_attached :preview
   has_one_attached :attachment
+  has_many_attached :documents
 
   validates :title, presence: true
 
   validates :preview, attached: true, size: { less_than: 100.megabytes , message: 'is not given between size' }
   validates :attachment, attached: true, content_type: { in: 'application/pdf', message: 'is not a PDF' }
+  validates :documents, limit: { min: 1, max: 3 }
 end
 ```
 
@@ -43,6 +55,7 @@ en:
   errors:
     messages:
       content_type_invalid: "has an invalid content type"
+      limit_out_of_range: "total number is out of range"
 ```
 
 In some cases Active Storage Validations provides variables to help you customize messages :
@@ -57,6 +70,14 @@ For example :
 content_type_invalid: "has an invalid content type : %{content_type}"
 ```
 
+Also the "limit_out_of_range" key supports two variables the "min" and "max".
+
+For example :
+
+```yml
+limit_out_of_range: "total number is out of range. range: [%{min}, %{max}]"
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -107,6 +128,7 @@ You are welcome to contribute.
 - https://github.com/reckerswartz
 - https://github.com/Uysim
 - https://github.com/D-system
+- https://github.com/ivanelrey
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/config/locales/en.yml

@@ -2,3 +2,4 @@ en:
   errors:
     messages:
       content_type_invalid: "has an invalid content type"
+      limit_out_of_range: "total number is out of range"

data/lib/active_storage_validations.rb

@@ -3,6 +3,7 @@ require 'active_storage_validations/engine'
 require 'active_storage_validations/attached_validator'
 require 'active_storage_validations/content_type_validator'
 require 'active_storage_validations/size_validator'
+require 'active_storage_validations/limit_validator'
 
 ActiveSupport.on_load(:active_record) do
   self.send :include, ActiveStorageValidations

data/lib/active_storage_validations/limit_validator.rb

@@ -0,0 +1,37 @@
+module ActiveStorageValidations
+  class LimitValidator < ActiveModel::EachValidator
+    AVAILABLE_CHECKS = [:max, :min]
+
+    def check_validity!
+      unless (AVAILABLE_CHECKS).any? { |argument| options.has_key?(argument) }
+        raise ArgumentError, "You must pass either :max or :min to the validator"
+      end
+    end
+
+    def validate_each(record, attribute, value)
+      files = record.send(attribute)
+
+      files = Array.wrap(files)
+
+      errors_options = {}
+      errors_options[:min] = options[:min]
+      errors_options[:max] = options[:max]
+
+      unless files_count_valid?(files.count)
+        record.errors.add(attribute, options[:message].presence || :limit_out_of_range, errors_options)
+        return
+      end
+    end
+
+    def files_count_valid?(count)
+      case
+        when options[:max].present? && options[:min].present?
+          count >= options[:min] && count <= options[:max]
+        when options[:max].present?
+          count <= options[:max]
+        when options[:min].present?
+          count >= options[:min]
+      end
+    end
+  end
+end

data/lib/active_storage_validations/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageValidations
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,7 @@ files:
 - lib/active_storage_validations/attached_validator.rb
 - lib/active_storage_validations/content_type_validator.rb
 - lib/active_storage_validations/engine.rb
+- lib/active_storage_validations/limit_validator.rb
 - lib/active_storage_validations/railtie.rb
 - lib/active_storage_validations/size_validator.rb
 - lib/active_storage_validations/version.rb