lite-validators 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e56debf660c1cb16481c4ba7e331c1d5f36f6666484b111fd4f54fd5dfe680
-  data.tar.gz: 1b2b174b568d7e5f2a830fb98acd79064672477911d9ab2f2ce9128e22b4fbb5
+  metadata.gz: c30c0e86b00cc4525b0878c22cf5d5dfae82ffa4b3301726197d51c46efaba7e
+  data.tar.gz: 926913306e4b90b172db620412c5018090888b0bc8f76f3c3097f583c941f705
 SHA512:
-  metadata.gz: b6bff3d5c92d63169e7fe5a73e88383d3e40a17e1a18ece15fa5efea477acdf577618d4ef4b5e9e3498b7bd50de77a4af53b2d468e368053c5f2180b6f9d6fbe
-  data.tar.gz: 48b1f4e567f69000dd903420c7e0d3d93d55568c34cd00c3849cbd8678fa528f0d14c366e51c2f4921e2b706970ab2c135a0f805e9047b13669d709710af3f8e
+  metadata.gz: c53420f1612dd642452e7b9e1720e89cab49de4dd75d61e4c040eecc8474066908449be8d9740f39386ae52f3652428e4a6ab19c2be01b97789ba86282b242d4
+  data.tar.gz: 6ccb77637a747d155539cd2b7fc06a868fb4e816ccf501099b891968f132bb0f6aa0d8d967aaefcf1fe33e35303464724ad0b9973cea2bd96273f50c0805d66b

data/CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.0] - 2022-03-17
+### Added
+- Added Reference validator
+
+## [1.6.0] - 2022-02-17
+### Added
+- Added List validator
+### Changed
+- Update to use public_send instead of send
+
+## [1.5.0] - 2022-02-17
+### Changed
+- Added `include_address` to ip_address validator
+- Added `exclude_address` to ip_address validator
+
 ## [1.4.0] - 2022-02-11
 ### Changed
 - Added `include_host` to url validator

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    lite-validators (1.4.0)
+    lite-validators (1.7.0)
       activemodel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.2)
-      actionview (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.2.2)
-      activesupport (= 7.0.2.2)
-    activesupport (7.0.2.2)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -37,19 +37,19 @@ GEM
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.14.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     racc (1.6.0)
     rack (2.2.3)
@@ -60,16 +60,16 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    railties (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.2.1)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -83,7 +83,7 @@ GEM
     rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.0)
+    rspec-rails (5.1.1)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -92,23 +92,23 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rubocop (1.26.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.8.0)
+    rubocop-rspec (2.9.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby_parser (3.18.1)

data/README.md

@@ -51,10 +51,12 @@ Or install it yourself as:
 * [IP address](https://github.com/drexed/lite-validators/blob/master/docs/IP_ADDRESS.md)
 * [ISBN](https://github.com/drexed/lite-validators/blob/master/docs/ISBN.md)
 * [ISIN](https://github.com/drexed/lite-validators/blob/master/docs/ISIN.md)
+* [List](https://github.com/drexed/lite-validators/blob/master/docs/LIST.md)
 * [MAC address](https://github.com/drexed/lite-validators/blob/master/docs/MAC.md)
 * [Name](https://github.com/drexed/lite-validators/blob/master/docs/NAME.md)
 * [Password](https://github.com/drexed/lite-validators/blob/master/docs/PASSWORD.md)
 * [Phone number](https://github.com/drexed/lite-validators/blob/master/docs/PHONE_NUMBER.md)
+* [Reference](https://github.com/drexed/lite-validators/blob/master/docs/REFERENCE.md)
 * [SEDOL](https://github.com/drexed/lite-validators/blob/master/docs/SEDOL.md)
 * [Slug](https://github.com/drexed/lite-validators/blob/master/docs/SLUG.md)
 * [SSN](https://github.com/drexed/lite-validators/blob/master/docs/SSN.md)

data/docs/IP_ADDRESS.md

@@ -13,6 +13,8 @@
 Option | Type | Available | Default
 --- | --- | --- | ---
 protocol | symbol | any, ipv4, ipv6 | any
+include_address | array, string, symbol | |
+exclude_address | array, string, symbol | |
 
 #### Usage
 
@@ -21,6 +23,8 @@ class User < ActiveRecord::Base
 
   validates :input0, ip_address: true
   validates :input1, ip_address: { protocol: :ipv4 }
+  validates :input2, ip_address: { include_address: ['0.0.0.0', '99.39.240.31'] }
+  validates :input3, ip_address: { exclude_address: ['0.0.0.0', '99.39.240.31'] }
 
 end
 ```

data/docs/LIST.md

@@ -0,0 +1,28 @@
+# List
+
+#### Rules
+
+```ruby
+# 1. Check
+```
+
+#### Options
+
+Option | Type | Available | Default
+--- | --- | --- | ---
+all | array | |
+any | array | |
+none | array | |
+
+#### Usage
+
+```ruby
+class User < ActiveRecord::Base
+
+  validates :input0, list: { all: %w[monday tuesday] }
+  validates :input1, list: { any: %w[saturday sunday] }
+  validates :input2, list: { none: %w[wednesday thursday] }
+  validates :input3, list: { any: %w[saturday sunday], none: %w[wednesday thursday] }
+
+end
+```

data/docs/REFERENCE.md

@@ -0,0 +1,25 @@
+# Reference
+
+#### Rules
+
+```ruby
+# 1. Pattern
+/\A[+-]?\d+\z/
+```
+
+#### Options
+
+Option | Type | Available | Default
+--- | --- | --- | ---
+association | symbol | object method | attribute without `_id`
+
+#### Usage
+
+```ruby
+class User < ActiveRecord::Base
+
+  validates :input_id, reference: true
+  validates :output_id, reference: { association: :input }
+
+end
+```

data/docs/URL.md

@@ -13,6 +13,8 @@ Option | Type | Available | Default
 domain | array, string, symbol | |
 root_only | boolean | true, false | false
 scheme | array, string, symbol | |
+include_host | array, string, symbol | |
+exclude_host | array, string, symbol | |
 
 #### Usage
 

data/lib/lite/validators/compare_validator.rb

@@ -34,8 +34,8 @@ class CompareValidator < BaseValidator
   end
 
   def valid_attr?
-    other = record.send(options[:to])
-    value.send(CHECKS[check], other)
+    other = record.public_send(options[:to])
+    value.public_send(CHECKS[check], other)
   end
 
 end

data/lib/lite/validators/file_size_validator.rb

@@ -59,9 +59,9 @@ class FileSizeValidator < BaseValidator
     return false if size.nil?
 
     if option_value.is_a?(Range)
-      option_value.send(CHECKS[option], size)
+      option_value.public_send(CHECKS[option], size)
     else
-      size.send(CHECKS[option], option_value)
+      size.public_send(CHECKS[option], option_value)
     end
   end
 

data/lib/lite/validators/ip_address_validator.rb

@@ -20,11 +20,30 @@ class IpAddressValidator < BaseValidator
     assert_valid_option!(:protocol, REGEXP.keys.push(:any))
   end
 
+  def error_message_for(option)
+    options[:message] || I18n.t("errors.messages.ip_address.#{option}")
+  end
+
   def protocol
     options[:protocol] || :any
   end
 
-  def valid_attr?
+  def valid?
+    valid_format? && valid_address?
+  end
+
+  def valid_address?
+    addresses = options[:include_address] || options[:exclude_address]
+    return true unless addresses
+
+    check = options[:include_address] ? :any? : :none?
+    check = Array(addresses).public_send(check) { |address| value.include?(address.to_s) }
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:address))
+  end
+
+  def valid_format?
     case protocol
     when :ipv4 then valid_regexp?(:ipv4)
     when :ipv6 then valid_regexp?(:ipv6)

data/lib/lite/validators/list_validator.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class ListValidator < BaseValidator
+
+  def validate_each(record, attribute, value)
+    assert_valid_all_or_any_or_none!
+    assign_attr_readers(record, attribute, value)
+    valid?
+  end
+
+  private
+
+  def assert_valid_all_or_any_or_none!
+    return if options.key?(:all) || options.key?(:any) || options.key?(:none)
+
+    raise ArgumentError, 'Missing ":all", ":any" or ":none" attribute for comparison.'
+  end
+
+  def valid_attr?
+    options.slice(:all, :any, :none).each do |option, option_value|
+      validate_check(option, option_value)
+    end
+  end
+
+  def valid_content_type?(option, option_value)
+    Array(value).public_send("#{option}?") { |val| option_value.include?(val) }
+  end
+
+  def validate_check(option, option_value)
+    return if valid_content_type?(option, option_value)
+
+    record.errors.add(attribute, *error_message)
+  end
+
+end

data/lib/lite/validators/reference_validator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class ReferenceValidator < BaseValidator
+
+  REGEXP = /\A[+-]?\d+\z/
+
+  private
+
+  def valid?
+    valid_id? || valid_object?
+  end
+
+  def valid_id?
+    if value.blank?
+      false
+    elsif !valid_regexp?
+      record.errors.add(attribute, *error_message)
+    else
+      !value.to_i.negative?
+    end
+  end
+
+  def valid_object?
+    association_object = options[:association] || attribute.to_s.chomp('_id')
+    record.send(association_object).present?
+  end
+
+end

data/lib/lite/validators/url_validator.rb

@@ -33,7 +33,9 @@ class UrlValidator < BaseValidator
 
     value_downcased = value.host.to_s.downcase
     check = Array(options[:domain]).any? { |domain| value_downcased.end_with?(".#{domain.downcase}") }
-    record.errors.add(attribute, error_message_for(:domain)) unless check
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:domain))
   end
 
   def valid_host?
@@ -42,15 +44,19 @@ class UrlValidator < BaseValidator
 
     value_downcased = value.host.to_s.downcase
     check = options[:include_host] ? :any? : :none?
-    check = Array(hosts).send(check) { |host| value_downcased.include?(host.to_s.downcase) }
-    record.errors.add(attribute, error_message_for(:host)) unless check
+    check = Array(hosts).public_send(check) { |host| value_downcased.include?(host.to_s.downcase) }
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:host))
   end
 
   def valid_root?
     return true unless options[:root_only]
 
     check = ['', '/'].include?(value.path) && value.query.blank? && value.fragment.blank?
-    record.errors.add(attribute, error_message_for(:root)) unless check
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:root))
   end
 
   def valid_scheme?
@@ -59,7 +65,9 @@ class UrlValidator < BaseValidator
     value_downcased = value.scheme.to_s.downcase
     schemes = options[:scheme] || SCHEMES
     check = Array(schemes).any? { |scheme| value_downcased == scheme.to_s.downcase }
-    record.errors.add(attribute, error_message_for(:scheme)) unless check
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:scheme))
   end
 
   def valid_uri?

data/lib/lite/validators/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Validators
 
-    VERSION = '1.4.0'
+    VERSION = '1.7.0'
 
   end
 end

data/lib/lite/validators.rb

@@ -25,10 +25,12 @@ require 'lite/validators/imei_validator'
 require 'lite/validators/ip_address_validator'
 require 'lite/validators/isbn_validator'
 require 'lite/validators/isin_validator'
+require 'lite/validators/list_validator'
 require 'lite/validators/mac_address_validator'
 require 'lite/validators/name_validator'
 require 'lite/validators/password_validator'
 require 'lite/validators/phone_number_validator'
+require 'lite/validators/reference_validator'
 require 'lite/validators/sedol_validator'
 require 'lite/validators/slug_validator'
 require 'lite/validators/ssn_validator'

data/lib/locales/en.yml

@@ -21,6 +21,8 @@ en:
         less_than_or_equal_to: "file size is not less than or equal to %{count}"
         equal_to: "file size is not equal to %{count} but should"
         not_equal_to: "file size is equal to %{count} but shouldn't"
+      ip_address:
+        address: "has an invalid address"
       url:
         domain: "has an invalid domain"
         host: "has an invalid host"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-validators
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -205,10 +205,12 @@ files:
 - docs/IP_ADDRESS.md
 - docs/ISBN.md
 - docs/ISIN.md
+- docs/LIST.md
 - docs/MAC_ADDRESS.md
 - docs/NAME.md
 - docs/PASSWORD.md
 - docs/PHONE_NUMBER.md
+- docs/REFERENCE.md
 - docs/SEDOL.md
 - docs/SLUG.md
 - docs/SSN.md
@@ -239,11 +241,13 @@ files:
 - lib/lite/validators/ip_address_validator.rb
 - lib/lite/validators/isbn_validator.rb
 - lib/lite/validators/isin_validator.rb
+- lib/lite/validators/list_validator.rb
 - lib/lite/validators/mac_address_validator.rb
 - lib/lite/validators/name_validator.rb
 - lib/lite/validators/password_validator.rb
 - lib/lite/validators/phone_number_validator.rb
 - lib/lite/validators/railtie.rb
+- lib/lite/validators/reference_validator.rb
 - lib/lite/validators/sedol_validator.rb
 - lib/lite/validators/slug_validator.rb
 - lib/lite/validators/ssn_validator.rb