lite-validators 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e56debf660c1cb16481c4ba7e331c1d5f36f6666484b111fd4f54fd5dfe680
-  data.tar.gz: 1b2b174b568d7e5f2a830fb98acd79064672477911d9ab2f2ce9128e22b4fbb5
+  metadata.gz: ade5bbd1d906e70f20bc1b5e5187604f2fd6775e88ece1e3c46032428853b77c
+  data.tar.gz: '0284aa1c3c38963f35fa9f3907a702bb5217ebda36902262232b6aa8730d67a0'
 SHA512:
-  metadata.gz: b6bff3d5c92d63169e7fe5a73e88383d3e40a17e1a18ece15fa5efea477acdf577618d4ef4b5e9e3498b7bd50de77a4af53b2d468e368053c5f2180b6f9d6fbe
-  data.tar.gz: 48b1f4e567f69000dd903420c7e0d3d93d55568c34cd00c3849cbd8678fa528f0d14c366e51c2f4921e2b706970ab2c135a0f805e9047b13669d709710af3f8e
+  metadata.gz: f7cc8549f33870a80054ab8b9e2429acda6cc5d4298063b8a0ed42a09ef4dca81e32e364f16fa4dc1db6170770ed0394340e973e6adc41f0a9b2bea422c75054
+  data.tar.gz: 77cd74e2c98c3258bfcb5caabfd4c06e931c9e6bb722e1f5d7b253c5cb9d14c92abbffce230fed9276474d0ba461da0e3636e40a8a6ccf6518920aa837c8915f

data/CHANGELOG.md

@@ -6,6 +6,11 @@ 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lite-validators (1.4.0)
+    lite-validators (1.5.0)
       activemodel
 
 GEM
@@ -37,7 +37,7 @@ 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)
       crass (~> 1.0.2)
@@ -69,7 +69,7 @@ GEM
       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)
@@ -101,7 +101,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
+    rubocop-ast (1.15.2)
       parser (>= 3.0.1.1)
     rubocop-performance (1.13.2)
       rubocop (>= 1.7.0, < 2.0)

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
 

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).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/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?
@@ -43,14 +45,18 @@ 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
+    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.5.0'
 
   end
 end

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.5.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel