lite-validators 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa69377873f2ee0d6ef14558b29db5fc92da777468505e75414b49d60a7b64b0
-  data.tar.gz: 455b5668ab8b970df14d560bdf2a3bf1ce2c816e05437007e043c75ea4623878
+  metadata.gz: ade5bbd1d906e70f20bc1b5e5187604f2fd6775e88ece1e3c46032428853b77c
+  data.tar.gz: '0284aa1c3c38963f35fa9f3907a702bb5217ebda36902262232b6aa8730d67a0'
 SHA512:
-  metadata.gz: b8929cf7229fb4e634de7b436227c0b034ee63eecb03567466fa523f7456b714b478f7ad7393edd8c295df3d3eecde246e35214f9145c140ab01e1bdfe6fa900
-  data.tar.gz: 035152f46aa9d2d9125e9dbf3b305bfcf6a15977c2f1b049d785dc489ed9ea4c54e2e1baeaa85ea14fca12eeb187828c2810fd5366fb35bf9d413c5461f16a1f
+  metadata.gz: f7cc8549f33870a80054ab8b9e2429acda6cc5d4298063b8a0ed42a09ef4dca81e32e364f16fa4dc1db6170770ed0394340e973e6adc41f0a9b2bea422c75054
+  data.tar.gz: 77cd74e2c98c3258bfcb5caabfd4c06e931c9e6bb722e1f5d7b253c5cb9d14c92abbffce230fed9276474d0ba461da0e3636e40a8a6ccf6518920aa837c8915f

data/.rubocop.yml

@@ -7,6 +7,8 @@ AllCops:
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
+Gemspec/RequireMFA:
+  Enabled: false
 Gemspec/RequiredRubyVersion:
   Enabled: false
 Layout/EmptyLinesAroundAttributeAccessor:

data/CHANGELOG.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+- Added `exclude_host` to url validator
+
+## [1.3.2] - 2021-07-22
+### Changed
+- Improved setup
+
+## [1.3.1] - 2021-07-21
+### Changed
+- Improved Railtie support
+
 ## [1.3.0] - 2021-07-19
 ### Added
 - Added Ruby 3.0 support

data/Gemfile.lock

@@ -1,89 +1,89 @@
 PATH
   remote: .
   specs:
-    lite-validators (1.3.0)
+    lite-validators (1.5.0)
       activemodel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4)
-      actionview (= 6.1.4)
-      activesupport (= 6.1.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      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 (6.1.4)
-      activesupport (= 6.1.4)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
     colorize (0.8.1)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.1)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -91,35 +91,34 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.15.2)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.4)
+    rubocop-performance (1.13.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.16.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
-    sexp_processor (4.15.3)
-    thor (1.1.0)
+    ruby_parser (3.18.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

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/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
 
@@ -22,7 +24,9 @@ class User < ActiveRecord::Base
   validates :input0, url: true
   validates :input1, url: { domain: [:com, 'org'] }
   validates :input2, url: { scheme: :https }
-  validates :input3, url: { root_only: true }
+  validates :input3, url: { include_host: ['example', 'test.org'] }
+  validates :input4, url: { exclude_host: ['example', 'test.org'] }
+  validates :input5, url: { root_only: true }
 
 end
 ```

data/lib/lite/validators/csv_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'csv'
+require 'csv' unless defined?(CSV)
 
 class CsvValidator < FileSizeValidator
 

data/lib/lite/validators/cusip_validator.rb

@@ -18,7 +18,7 @@ class CusipValidator < BaseValidator
     odd_values = digits.values_at(*digits.each_index.select(&:odd?))
 
     values = odd_values.map { |int| int * 2 }.zip(even_values).flatten
-    values = values.inject(0) { |sum, int| sum + (int / 10) + int % 10 }
+    values = values.inject(0) { |sum, int| sum + (int / 10) + (int % 10) }
 
     ((10 - values) % 10) % 10
   end

data/lib/lite/validators/ip_address_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'resolv'
+require 'resolv' unless defined?(Resolv)
 
 class IpAddressValidator < BaseValidator
 
@@ -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).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/railtie.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require 'rails/railtie'
-
 module Lite
   module Validators
-    class Railtie < ::Rails::Railtie
+    class Railtie < Rails::Railtie
 
-      initializer 'lite-validators' do |app|
-        Lite::Validators::Railtie.instance_eval do
-          Array(app.config.i18n.available_locales).each do |locale|
-            path = File.expand_path("../../../config/locales/#{locale}.yml", __FILE__)
-            next if !File.file?(path) || I18n.load_path.include?(path)
+      initializer 'lite-validators.configure_locales' do |app|
+        Array(app.config.i18n.available_locales).each do |locale|
+          path = File.expand_path("../../../locales/#{locale}.yml", __FILE__)
+          next unless File.file?(path)
 
-            I18n.load_path << path
-          end
+          I18n.load_path << path
         end
+
+        I18n.reload!
       end
 
     end

data/lib/lite/validators/sedol_validator.rb

@@ -17,7 +17,7 @@ class SedolValidator < BaseValidator
     total = 0
     digits = value.chars.map { |dgt| /[A-Z]/.match?(dgt) ? (dgt.ord - 55) : dgt.to_i }
     digits.each_with_index { |dgt, idx| total += (WEIGHTS[idx] * dgt) }
-    (10 - total % 10) % 10
+    (10 - (total % 10)) % 10
   end
 
 end

data/lib/lite/validators/time_zone_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/time/zones' unless defined?(ActiveSupport)
 
 class TimeZoneValidator < BaseValidator
 

data/lib/lite/validators/url_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri'
+require 'uri' unless defined?(URI)
 
 class UrlValidator < BaseValidator
 
@@ -11,53 +11,68 @@ class UrlValidator < BaseValidator
   def validate_each(record, attribute, value)
     assign_attr_readers(record, attribute, URI.parse(value.to_s))
     valid_attr?
-  rescue URI::InvalidURIError
+  rescue URI::BadURIError, URI::InvalidURIError
     record.errors.add(attribute, *error_message)
   end
 
   private
 
-  def scheme
-    options[:scheme] || UrlValidator::SCHEMES
-  end
-
   def error_message_for(option)
     options[:message] || I18n.t("errors.messages.url.#{option}")
   end
 
+  # rubocop:disable Layout/LineLength, Metrics/AbcSize
   def valid_attr?
     raise URI::InvalidURIError if value.to_s.strip.empty?
 
-    valid_uri? && valid_domain? && valid_scheme? && valid_root?
+    valid_uri? && valid_host? && valid_domain? && valid_scheme? && valid_root?
   end
 
-  # rubocop:disable Layout/LineLength, Metrics/AbcSize
   def valid_domain?
     return true unless options[:domain]
 
     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?
+    hosts = options[:include_host] || options[:exclude_host]
+    return true unless hosts
+
+    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) }
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:host))
   end
-  # rubocop:enable Layout/LineLength, Metrics/AbcSize
 
   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?
     return true unless options[:scheme]
 
     value_downcased = value.scheme.to_s.downcase
-    check = Array(scheme).any? { |sch| value_downcased == sch.to_s.downcase }
-    record.errors.add(attribute, error_message_for(:scheme)) unless check
+    schemes = options[:scheme] || SCHEMES
+    check = Array(schemes).any? { |scheme| value_downcased == scheme.to_s.downcase }
+    return true if check
+
+    record.errors.add(attribute, error_message_for(:scheme))
   end
 
   def valid_uri?
     value.is_a?(URI::Generic)
   end
+  # rubocop:enable Layout/LineLength, Metrics/AbcSize
 
 end

data/lib/lite/validators/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Validators
 
-    VERSION = '1.3.0'
+    VERSION = '1.5.0'
 
   end
 end

data/lib/lite/validators.rb

@@ -1,14 +1,39 @@
 # frozen_string_literal: true
 
-require 'active_model'
+require 'active_model' unless defined?(ActiveModel)
 
+require 'lite/validators/railtie' if defined?(Rails::Railtie)
 require 'lite/validators/version'
-require 'lite/validators/railtie' if defined?(Rails)
-
-%w[
-  base alpha alpha_numeric base64 boolean compare coordinate credit_card currency cusip email ein
-  file_content_type file_extension file_size csv hex imei ip_address isbn isin mac_address name
-  password phone_number sedol slug ssn time_zone type url username uuid
-].each do |name|
-  require "lite/validators/#{name}_validator"
-end
+require 'lite/validators/base_validator'
+require 'lite/validators/alpha_validator'
+require 'lite/validators/alpha_numeric_validator'
+require 'lite/validators/base64_validator'
+require 'lite/validators/boolean_validator'
+require 'lite/validators/compare_validator'
+require 'lite/validators/coordinate_validator'
+require 'lite/validators/credit_card_validator'
+require 'lite/validators/currency_validator'
+require 'lite/validators/cusip_validator'
+require 'lite/validators/email_validator'
+require 'lite/validators/ein_validator'
+require 'lite/validators/file_content_type_validator'
+require 'lite/validators/file_extension_validator'
+require 'lite/validators/file_size_validator'
+require 'lite/validators/csv_validator'
+require 'lite/validators/hex_validator'
+require 'lite/validators/imei_validator'
+require 'lite/validators/ip_address_validator'
+require 'lite/validators/isbn_validator'
+require 'lite/validators/isin_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/sedol_validator'
+require 'lite/validators/slug_validator'
+require 'lite/validators/ssn_validator'
+require 'lite/validators/time_zone_validator'
+require 'lite/validators/type_validator'
+require 'lite/validators/url_validator'
+require 'lite/validators/username_validator'
+require 'lite/validators/uuid_validator'

data/{config → lib}/locales/en.yml

@@ -21,7 +21,10 @@ 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"
         root: "has a url path but shouldn't"
         scheme: "has an invalid scheme"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-validators
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -186,7 +186,6 @@ files:
 - _config.yml
 - bin/console
 - bin/setup
-- config/locales/en.yml
 - docs/ALPHA.md
 - docs/ALPHA_NUMERIC.md
 - docs/BASE64.md
@@ -254,6 +253,7 @@ files:
 - lib/lite/validators/username_validator.rb
 - lib/lite/validators/uuid_validator.rb
 - lib/lite/validators/version.rb
+- lib/locales/en.yml
 - lite-validators.gemspec
 homepage: http://drexed.github.io/lite-validators
 licenses:
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Collection of ActiveModel/ActiveRecord validators