active_storage_validations 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0b1779b51e62cc8db0e51d18a471ce349a2ee7d7a6867921cfa879e9e0e696f9
-  data.tar.gz: 1f4972a779e7a2938a0d5ef8c322da49300644ec155e1d2a883af13363afc4c4
+SHA1:
+  metadata.gz: 2501b8cdd1162e90088185dc89db71838ff63b9d
+  data.tar.gz: 2e08cbebaad918109615e604fe78f8ab323b5488
 SHA512:
-  metadata.gz: 96539daee539f2ca6faeb7f276e6bec9f102fb62f54e32bee3509eedd996570366b89594349d548121ebb4f268088e6cd389a07b895736433a9f57389c3bdab6
-  data.tar.gz: 90ef6e23cb8347c25cc5cf9f4d1a78c1001b650d7f352e56794a2590fbb00abf1581dd5e3dd7ddb4c5184d3ccee8ebcc4f01eefe888179d649cd22d3f718a085
+  metadata.gz: 42098a546430f2ddc6cdd4f06c51d91bbdde962c06108c4e0d6b8a1a80c69028caac6080dfa19283710c11b6b9f4bb29dcc379add02bec91e7c84995ea4d4ef4
+  data.tar.gz: 4922ed55b2e7a9a7ae381e279c21f5c9c25085eda26139c2921cda45110211f970fe8305a934d84b5e4c32db94c5a9a7c407f1acc2327b0e9d0774c57f58e102

data/README.md

@@ -77,10 +77,9 @@ 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)
 
 ## Todo
-* verify with remote storages
+* verify with remote storages (s3, etc)
+* verify how it works with direct upload 
 * better error message when  content_size is invalid
-* travis CI
-* split validation classes into own classes
 
 ## Tests & Contributing
 
@@ -94,6 +93,8 @@ You are welcome to contribute.
 ## Contributors (BIG THANK YOU)
 - https://github.com/schweigert
 - https://github.com/tleneveu
+- https://github.com/reckerswartz
+- https://github.com/Uysim
 
 
 ## License

data/lib/active_storage_validations.rb

@@ -1,99 +1,10 @@
-require "active_storage_validations/railtie"
+require 'active_storage_validations/railtie'
+require 'active_storage_validations/engine'
+require 'active_storage_validations/attached_validator'
+require 'active_storage_validations/content_type_validator'
+require 'active_storage_validations/size_validator'
 
-module ActiveStorageValidations
-  class Engine < ::Rails::Engine
-  end
 
-  class AttachedValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      unless record.send(attribute).attached?
-        record.errors.add(attribute, :blank)
-      end
-    end
-  end
 
-  class ContentTypeValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      files = record.send(attribute)
-
-      return true unless files.attached?
-      return true if types.empty?
-
-      files = Array.wrap(files)
-
-      errors_options = { authorized_types: types_to_human_format }
-      errors_options[:message] = options[:message] if options[:message].present?
-
-      files.each do |file|
-        unless content_type_valid?(file)
-          errors_options[:content_type] = content_type(file)
-
-          record.errors.add(attribute, :content_type_invalid, errors_options)
-          return
-        end
-      end
-    end
-
-    def types
-      Array.wrap(options[:with]) + Array.wrap(options[:in])
-    end
-
-    def types_to_human_format
-      types.join(", ")
-    end
-
-    def content_type(file)
-      file.blob.content_type
-    end
-
-    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
 
 ActiveRecord::Base.send :include, ActiveStorageValidations

data/lib/active_storage_validations/attached_validator.rb

@@ -0,0 +1,9 @@
+module ActiveStorageValidations
+  class AttachedValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      unless record.send(attribute).attached?
+        record.errors.add(attribute, :blank)
+      end
+    end
+  end
+end

data/lib/active_storage_validations/content_type_validator.rb

@@ -0,0 +1,40 @@
+module ActiveStorageValidations
+  class ContentTypeValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      files = record.send(attribute)
+
+      return true unless files.attached?
+      return true if types.empty?
+
+      files = Array.wrap(files)
+
+      errors_options = { authorized_types: types_to_human_format }
+      errors_options[:message] = options[:message] if options[:message].present?
+
+      files.each do |file|
+        unless content_type_valid?(file)
+          errors_options[:content_type] = content_type(file)
+
+          record.errors.add(attribute, :content_type_invalid, errors_options)
+          return
+        end
+      end
+    end
+
+    def types
+      Array.wrap(options[:with]) + Array.wrap(options[:in])
+    end
+
+    def types_to_human_format
+      types.join(", ")
+    end
+
+    def content_type(file)
+      file.blob.content_type
+    end
+
+    def content_type_valid?(file)
+      file.blob.present? && file.blob.content_type.in?(types)
+    end
+  end
+end

data/lib/active_storage_validations/engine.rb

@@ -0,0 +1,4 @@
+module ActiveStorageValidations
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/active_storage_validations/size_validator.rb

@@ -0,0 +1,45 @@
+module ActiveStorageValidations
+  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.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,7 +64,11 @@ files:
 - Rakefile
 - config/locales/en.yml
 - lib/active_storage_validations.rb
+- 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/railtie.rb
+- lib/active_storage_validations/size_validator.rb
 - lib/active_storage_validations/version.rb
 - lib/tasks/active_storage_validations_tasks.rake
 homepage: https://github.com/igorkasyanchuk
@@ -87,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage