RubyGems - lite-validators - Versions diffs - 1.2.0 → 1.4.0 - Mend

lite-validators 1.2.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

checksums.yaml +4 -4
data/.rubocop.yml +6 -1
data/CHANGELOG.md +17 -0
data/Gemfile.lock +56 -54
data/docs/URL.md +3 -1
data/lib/lite/validators/base64_validator.rb +1 -1
data/lib/lite/validators/csv_validator.rb +1 -1
data/lib/lite/validators/currency_validator.rb +1 -1
data/lib/lite/validators/cusip_validator.rb +2 -2
data/lib/lite/validators/ein_validator.rb +1 -1
data/lib/lite/validators/email_validator.rb +1 -1
data/lib/lite/validators/hex_validator.rb +1 -1
data/lib/lite/validators/imei_validator.rb +1 -1
data/lib/lite/validators/ip_address_validator.rb +1 -1
data/lib/lite/validators/isin_validator.rb +1 -1
data/lib/lite/validators/name_validator.rb +1 -1
data/lib/lite/validators/phone_number_validator.rb +1 -1
data/lib/lite/validators/railtie.rb +8 -10
data/lib/lite/validators/sedol_validator.rb +2 -2
data/lib/lite/validators/slug_validator.rb +1 -1
data/lib/lite/validators/ssn_validator.rb +1 -1
data/lib/lite/validators/time_zone_validator.rb +1 -1
data/lib/lite/validators/url_validator.rb +17 -10
data/lib/lite/validators/username_validator.rb +1 -1
data/lib/lite/validators/version.rb +1 -1
data/lib/lite/validators.rb +35 -10
data/{config → lib}/locales/en.yml +1 -0
data/lite-validators.gemspec +1 -0
metadata +18 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f14e123636fd7e64c95b1ec6cfff0d75a89b675433a966e5a50e8319df59d38
-  data.tar.gz: 3c3527272a2396dd96daeb521d446cebd4679acbd2d57be410ef302d578f81e1
+  metadata.gz: e1e56debf660c1cb16481c4ba7e331c1d5f36f6666484b111fd4f54fd5dfe680
+  data.tar.gz: 1b2b174b568d7e5f2a830fb98acd79064672477911d9ab2f2ce9128e22b4fbb5
 SHA512:
-  metadata.gz: b2251e88c3258c03ea8ffa22c9ce553f91e0ccb1d757a24c9351da415fd52c063eb23853133f84a97021cf0650f4e239b2af0ac1c87238a9567694f40564d71e
-  data.tar.gz: '085d162120734d94783d859deb349d15c55ed42e878713334f5d98fe44543f22b40a37ae6edff6c2efce96d81394d50daa96734aca59c2c5e06952c566e60598'
+  metadata.gz: b6bff3d5c92d63169e7fe5a73e88383d3e40a17e1a18ece15fa5efea477acdf577618d4ef4b5e9e3498b7bd50de77a4af53b2d468e368053c5f2180b6f9d6fbe
+  data.tar.gz: 48b1f4e567f69000dd903420c7e0d3d93d55568c34cd00c3849cbd8678fa528f0d14c366e51c2f4921e2b706970ab2c135a0f805e9047b13669d709710af3f8e

data/.rubocop.yml CHANGED Viewed

@@ -1,11 +1,14 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
+Gemspec/RequireMFA:
+  Enabled: false
 Gemspec/RequiredRubyVersion:
   Enabled: false
 Layout/EmptyLinesAroundAttributeAccessor:
@@ -42,6 +45,8 @@ RSpec/LeakyConstantDeclaration:
   Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/ExpandPathArguments:

data/CHANGELOG.md CHANGED Viewed

@@ -6,6 +6,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
+## [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
 ## [1.2.0] - 2021-07-13
 ### Updated
 - Update name validator to accept numeric values and remove double quotes

data/Gemfile.lock CHANGED Viewed

@@ -1,89 +1,89 @@
 PATH
   remote: .
   specs:
-    lite-validators (1.2.0)
+    lite-validators (1.4.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.9.1)
       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.0)
     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,33 +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.7.0)
+    rubocop-ast (1.15.1)
       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-rspec (2.4.0)
+    rubocop-rake (0.6.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
@@ -132,7 +133,8 @@ DEPENDENCIES
   rspec-rails
   rubocop
   rubocop-performance
+  rubocop-rake
   rubocop-rspec
 BUNDLED WITH
-   2.2.19
+   2.2.24

data/docs/URL.md CHANGED Viewed

@@ -22,7 +22,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/base64_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class Base64Validator < BaseValidator
-  REGEXP = /^(?:[A-Za-z0-9+$]{4})*(?:[A-Za-z0-9+$]{2}==|[A-Za-z0-9+$]{3}=|[A-Za-z0-9+$]{4})$/.freeze
+  REGEXP = /^(?:[A-Za-z0-9+$]{4})*(?:[A-Za-z0-9+$]{2}==|[A-Za-z0-9+$]{3}=|[A-Za-z0-9+$]{4})$/
 end

data/lib/lite/validators/csv_validator.rb CHANGED Viewed

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

data/lib/lite/validators/currency_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class CurrencyValidator < BaseValidator
-  REGEXP = /^\d*+(\.\d{1,2})$/.freeze
+  REGEXP = /^\d*+(\.\d{1,2})$/
 end

data/lib/lite/validators/cusip_validator.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 class CusipValidator < BaseValidator
-  REGEXP = /^[0-9A-Z]{9}$/.freeze
+  REGEXP = /^[0-9A-Z]{9}$/
   private
@@ -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/ein_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class EinValidator < BaseValidator
-  REGEXP = /^[1-9]\d?-\d{7}$/.freeze
+  REGEXP = /^[1-9]\d?-\d{7}$/
 end

data/lib/lite/validators/email_validator.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 class EmailValidator < BaseValidator
-  REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i.freeze
+  REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
   private

data/lib/lite/validators/hex_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class HexValidator < BaseValidator
-  REGEXP = /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.freeze
+  REGEXP = /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/
 end

data/lib/lite/validators/imei_validator.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 class ImeiValidator < BaseValidator
-  REGEXP = /\A[\d.:\-\s]+\z/i.freeze
+  REGEXP = /\A[\d.:\-\s]+\z/i
   private

data/lib/lite/validators/ip_address_validator.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require 'resolv'
+require 'resolv' unless defined?(Resolv)
 class IpAddressValidator < BaseValidator

data/lib/lite/validators/isin_validator.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 class IsinValidator < BaseValidator
   # rubocop:disable Layout/LineLength
-  REGEXP = /^((AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|SS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW{2})([A-Z0-9]{9}))(\d{1})$/.freeze
+  REGEXP = /^((AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|SS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW{2})([A-Z0-9]{9}))(\d{1})$/
   # rubocop:enable Layout/LineLength
   private

data/lib/lite/validators/name_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class NameValidator < BaseValidator
-  REGEXP = /^([A-Za-z0-9'-]+\s+){1,4}[A-Za-z0-9'-]*\z/.freeze
+  REGEXP = /^([A-Za-z0-9'-]+\s+){1,4}[A-Za-z0-9'-]*\z/
 end

data/lib/lite/validators/phone_number_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class PhoneNumberValidator < BaseValidator
-  REGEXP = %r{^[0-9+()#.\s/ext-]+$}.freeze
+  REGEXP = %r{^[0-9+()#.\s/ext-]+$}
 end

data/lib/lite/validators/railtie.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -2,7 +2,7 @@
 class SedolValidator < BaseValidator
-  REGEXP = /^([A-Z0-9]{6})(\d{1})$/.freeze
+  REGEXP = /^([A-Z0-9]{6})(\d{1})$/
   WEIGHTS = [
     1, 3, 1, 7, 3, 9, 1
   ].freeze
@@ -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/slug_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class SlugValidator < BaseValidator
-  REGEXP = /^[A-Za-z0-9_-]+$/i.freeze
+  REGEXP = /^[A-Za-z0-9_-]+$/i
 end

data/lib/lite/validators/ssn_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class SsnValidator < BaseValidator
-  REGEXP = /^\A(\d{3}-\d{2}-\d{4}|\d{9})\Z$/.freeze
+  REGEXP = /^\A(\d{3}-\d{2}-\d{4}|\d{9})\Z$/
 end

data/lib/lite/validators/time_zone_validator.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require 'uri'
+require 'uri' unless defined?(URI)
 class UrlValidator < BaseValidator
@@ -11,27 +11,23 @@ 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]
@@ -39,7 +35,16 @@ class UrlValidator < BaseValidator
     check = Array(options[:domain]).any? { |domain| value_downcased.end_with?(".#{domain.downcase}") }
     record.errors.add(attribute, error_message_for(:domain)) unless check
   end
-  # rubocop:enable Layout/LineLength, Metrics/AbcSize
+  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) }
+    record.errors.add(attribute, error_message_for(:host)) unless check
+  end
   def valid_root?
     return true unless options[:root_only]
@@ -52,12 +57,14 @@ class UrlValidator < BaseValidator
     return true unless options[:scheme]
     value_downcased = value.scheme.to_s.downcase
-    check = Array(scheme).any? { |sch| value_downcased == sch.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
   end
   def valid_uri?
     value.is_a?(URI::Generic)
   end
+  # rubocop:enable Layout/LineLength, Metrics/AbcSize
 end

data/lib/lite/validators/username_validator.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 class UsernameValidator < BaseValidator
-  REGEXP = /^[A-Za-z0-9._-]{1,255}$/.freeze
+  REGEXP = /^[A-Za-z0-9._-]{1,255}$/
 end

data/lib/lite/validators/version.rb CHANGED Viewed

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

data/lib/lite/validators.rb CHANGED Viewed

@@ -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 RENAMED Viewed

@@ -23,5 +23,6 @@ en:
         not_equal_to: "file size is equal to %{count} but shouldn't"
       url:
         domain: "has an invalid domain"
+        host: "has an invalid host"
         root: "has a url path but shouldn't"
         scheme: "has an invalid scheme"

data/lite-validators.gemspec CHANGED Viewed

@@ -47,5 +47,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-validators
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +186,6 @@ files:
 - _config.yml
 - bin/console
 - bin/setup
-- config/locales/en.yml
 - docs/ALPHA.md
 - docs/ALPHA_NUMERIC.md
 - docs/BASE64.md
@@ -240,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:
@@ -260,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Collection of ActiveModel/ActiveRecord validators