active_storage_validations 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 640238a3efac3a30376f3d5079a630774727ba91
-  data.tar.gz: 01a6ff35bcdf26f1b8b0f0a5fdc55be666c47f43
+SHA256:
+  metadata.gz: 0b1779b51e62cc8db0e51d18a471ce349a2ee7d7a6867921cfa879e9e0e696f9
+  data.tar.gz: 1f4972a779e7a2938a0d5ef8c322da49300644ec155e1d2a883af13363afc4c4
 SHA512:
-  metadata.gz: 54c834d284344bf828b048eee45e97766892eccbdc5793b3eae5e8ae7ab9e7e5914960d467fc4fae169e738ba9caaf8f050cd326ba42fb12420ec4fff9f12f0f
-  data.tar.gz: 2e643131d9f35f5707fac32a680460b348bad03e63b985f9135f38c3de18b17e6785fab42858c8a14651378af55351d07024c171530c81e071a0e7bb8e064c35
+  metadata.gz: 96539daee539f2ca6faeb7f276e6bec9f102fb62f54e32bee3509eedd996570366b89594349d548121ebb4f268088e6cd389a07b895736433a9f57389c3bdab6
+  data.tar.gz: 90ef6e23cb8347c25cc5cf9f4d1a78c1001b650d7f352e56794a2590fbb00abf1581dd5e3dd7ddb4c5184d3ccee8ebcc4f01eefe888179d649cd22d3f718a085

data/README.md

@@ -29,7 +29,7 @@ class Project < ApplicationRecord
 
   validates :title, presence: true
 
-  validates :preview, attached: 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' }
 end
 ```
@@ -78,14 +78,15 @@ Very simple example of validation with file attached, content type check and cus
 
 ## Todo
 * verify with remote storages
+* better error message when  content_size is invalid
 * travis CI
-* validation for file size
+* split validation classes into own classes
 
 ## Tests & Contributing
 
 To run tests in root folder of gem `rake test`.
 
-To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rake db:migrate`).
+To play with app `cd test/dummy` and `rails s -b 0.0.0.0` (before `rails db:migrate`).
 
 ## Contributing
 You are welcome to contribute.

data/lib/active_storage_validations.rb

@@ -49,7 +49,49 @@ module ActiveStorageValidations
     def content_type_valid?(file)
       file.blob.present? && file.blob.content_type.in?(types)
     end
+  end
+
+  class SizeValidator < ActiveModel::EachValidator
+    delegate :number_to_human_size, to: ActiveSupport::NumberHelper
+
+    AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to, :between]
+
+    def check_validity!
+      unless (AVAILABLE_CHECKS).any? { |argument| options.has_key?(argument) }
+        raise ArgumentError, "You must pass either :less_than, :greater_than, or :between to the validator"
+      end
+    end
+    
+    def validate_each(record, attribute, value)
+      files = record.send(attribute)
+      # only attached
+      return true unless files.attached?
 
+      files = Array.wrap(files)
+      
+      files.each do |file|
+        if content_size_valid?(file)
+          record.errors.add(attribute, options[:message].presence || "size #{number_to_human_size(file.blob.byte_size)} is not between required range" )
+          return
+        end
+      end
+    end
+
+    def content_size_valid?(file)
+      file_size = file.blob.byte_size
+      case
+        when options[:between].present?
+          options[:between].exclude?(file_size)
+        when options[:less_than].present?
+          file_size > options[:less_than]
+        when options[:less_than_or_equal_to].present?
+          file_size >= options[:less_than_or_equal_to]
+        when options[:greater_than].present?
+          file_size < options[:greater_than]
+        when options[:greater_than_or_equal_to].present?
+          file_size <= options[:greater_than_or_equal_to]
+      end 
+    end
   end
 
 end

data/lib/active_storage_validations/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageValidations
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage