active_storage_validations 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eeb2c72a1719accd4a287eaad2d12fd0b60dd3ea196d0e68afeeb87a8acca03
-  data.tar.gz: 748af563170ca1c931a000a2126792e97aaa4e775ccf61d0d3938412c6f741de
+  metadata.gz: c5c26b96ccb72cbb6ca57cf20df590f334703e2e30e51e4f2ccc1ff5891a74f5
+  data.tar.gz: 401043685c41419a8ab9018de42f844a15d2d1219b74f0f1c37473840129bdea
 SHA512:
-  metadata.gz: deb20600c0abc0abd12db58705fd64d8a5b4de214861c78ce18396b47178c7c42820c66e2137ed3ae259dde94a0fc71fd179b7907d98849d4bcc6ac795b84e3e
-  data.tar.gz: cefcd5c92ca650366f3eccc4431fe4431b1543ae211013a00c997f2dd8c249b429758f8a419e46ae79f94b9e2313aa7fc6edd503f9d79e0885fe8e7549842cbe
+  metadata.gz: c0cda1fa4d225a0bf381fb08a2db575d1f3a2baef5b85bd954473455a26c454af2efc0de4b40ecc9156a9b553f38cd8653cb78f7c70a05c87291d0a0a01df94e
+  data.tar.gz: c98ff98594d610a57cc649f66bc7a5bd3ac135723dae52f68d807e6ccf0131e76fc5e9e577708a36badf20583ce08f61b7a0c9f3286e53f119e4e39f04714407

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Igor Kasyanchuk
+Copyright 2018-2019 Igor Kasyanchuk
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/active_storage_validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_storage_validations/railtie'
 require 'active_storage_validations/engine'
 require 'active_storage_validations/attached_validator'
@@ -6,5 +8,5 @@ require 'active_storage_validations/size_validator'
 require 'active_storage_validations/limit_validator'
 
 ActiveSupport.on_load(:active_record) do
-  self.send :include, ActiveStorageValidations
+  send :include, ActiveStorageValidations
 end

data/lib/active_storage_validations/attached_validator.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  class AttachedValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      unless record.send(attribute).attached?
-        record.errors.add(attribute, :blank)
-      end
+  class AttachedValidator < ActiveModel::EachValidator # :nodoc:
+    def validate_each(record, attribute, _value)
+      return if record.send(attribute).attached?
+
+      record.errors.add(attribute, :blank)
     end
   end
 end

data/lib/active_storage_validations/content_type_validator.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  class ContentTypeValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
+  class ContentTypeValidator < ActiveModel::EachValidator # :nodoc:
+    def validate_each(record, attribute, _value)
       files = record.send(attribute)
 
-      return true unless files.attached?
-      return true if types.empty?
+      return true if !files.attached? || types.empty?
 
       files = Array.wrap(files)
 
@@ -12,12 +13,11 @@ module ActiveStorageValidations
       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)
+        next if content_type_valid?(file)
 
-          record.errors.add(attribute, :content_type_invalid, errors_options)
-          return
-        end
+        errors_options[:content_type] = content_type(file)
+        record.errors.add(attribute, :content_type_invalid, errors_options)
+        break
       end
     end
 
@@ -26,7 +26,7 @@ module ActiveStorageValidations
     end
 
     def types_to_human_format
-      types.join(", ")
+      types.join(', ')
     end
 
     def content_type(file)

data/lib/active_storage_validations/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
   class Engine < ::Rails::Engine
   end

data/lib/active_storage_validations/limit_validator.rb

@@ -1,36 +1,38 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  class LimitValidator < ActiveModel::EachValidator
-    AVAILABLE_CHECKS = [:max, :min]
+  class LimitValidator < ActiveModel::EachValidator # :nodoc:
+    AVAILABLE_CHECKS = %i[max min].freeze
 
     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
+      return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+
+      raise ArgumentError, 'You must pass either :max or :min to the validator'
     end
 
-    def validate_each(record, attribute, value)
+    def validate_each(record, attribute, _value)
       files = record.send(attribute)
 
+      return true unless files.attached?
+
       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
+      return true if files_count_valid?(files.count)
+
+      record.errors.add(attribute, options[:message].presence || :limit_out_of_range, errors_options)
     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]
+      if options[:max].present? && options[:min].present?
+        count >= options[:min] && count <= options[:max]
+      elsif options[:max].present?
+        count <= options[:max]
+      elsif options[:min].present?
+        count >= options[:min]
       end
     end
   end

data/lib/active_storage_validations/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
   class Railtie < ::Rails::Railtie
   end

data/lib/active_storage_validations/size_validator.rb

@@ -1,45 +1,43 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  class SizeValidator < ActiveModel::EachValidator
+  class SizeValidator < ActiveModel::EachValidator # :nodoc:
     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]
+    AVAILABLE_CHECKS = %i[less_than less_than_or_equal_to greater_than greater_than_or_equal_to between].freeze
 
     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
+      return true if AVAILABLE_CHECKS.any? { |argument| options.key?(argument) }
+
+      raise ArgumentError, 'You must pass either :less_than, :greater_than, or :between to the validator'
     end
 
-    def validate_each(record, attribute, value)
-      files = record.send(attribute)
+    def validate_each(record, attribute, _value)
       # only attached
-      return true unless files.attached?
+      return true unless record.send(attribute).attached?
 
-      files = Array.wrap(files)
+      files = Array.wrap(record.send(attribute))
 
       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
+        next if content_size_valid?(file.blob.byte_size)
+
+        record.errors.add(attribute, options[:message].presence || "size #{number_to_human_size(file.blob.byte_size)} is not between required range")
+        break
       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]
+    def content_size_valid?(file_size)
+      if options[:between].present?
+        options[:between].include?(file_size)
+      elsif options[:less_than].present?
+        file_size < options[:less_than]
+      elsif options[:less_than_or_equal_to].present?
+        file_size <= options[:less_than_or_equal_to]
+      elsif options[:greater_than].present?
+        file_size > options[:greater_than]
+      elsif 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,5 @@
+# frozen_string_literal: true
+
 module ActiveStorageValidations
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/tasks/active_storage_validations_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :active_storage_validations do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_validations
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Validations for Active Storage