validators 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49077fb99da3c1c92a3b981cdfd0354acb5a62a9b433512658bfc5c1e4df649b
-  data.tar.gz: 9d48b1cf25f3782afeaa00c0fa7f51ecf5581ea7e6bb49ebd5796ab914aecb50
+  metadata.gz: a736f1025396b9890dbee7e6b132b4614171ea40fb40dae7b2328c46041450b0
+  data.tar.gz: 99b1a2f3ad91b27c2da61e0041e9fc467bdce72e4d4e74ceb9f94966535d8c1d
 SHA512:
-  metadata.gz: 1b307ad09f0e26c9e1db7766a15512aab5c87eb5cbd6217e9da489a45abce98bad30c4c320d0042d46fbf92d1d2c061487736f45d723d569a04cf26fb27bc453
-  data.tar.gz: b72f412e65628ac2d4b1e14160e2fcc855383ff3e40641d78e77cfa99f3f9b781e82d9cc4ca269ecd45493f4b199d918102b713d7860c99bf73e88b73ab6e060
+  metadata.gz: aae5016154a43eb9ce819edb9c89174235bbd1d16999f66b03a27d220f1ee94f22d4fa537cdb5ea860552252ae12ff0595a9a306799c00216eab5676ad6a709d
+  data.tar.gz: a832a6d26868df4dcf0d53b456318adb79d40d604006bf14ed926ed027407bfbf8023af5257edcf9ca62e9cf6a41a1a77c5cf5f32697a8624ae9db695afe84f5

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
   Exclude:
     - vendor/**/*
 

data/README.md

@@ -2,7 +2,8 @@
 
 [![Build Status](https://travis-ci.org/fnando/validators.svg)](https://travis-ci.org/fnando/validators)
 [![Code Climate](https://codeclimate.com/github/fnando/validators/badges/gpa.svg)](https://codeclimate.com/github/fnando/validators)
-[![Test Coverage](https://codeclimate.com/github/fnando/validators/badges/coverage.svg)](https://codeclimate.com/github/fnando/validators)
+[![Gem](https://img.shields.io/gem/v/validators.svg)](https://rubygems.org/gems/validators)
+[![Gem](https://img.shields.io/gem/dt/validators.svg)](https://rubygems.org/gems/validators)
 
 Add some nice ActiveModel/ActiveRecord validators.
 
@@ -20,6 +21,11 @@ gem "validators"
 
 ## Usage
 
+**Notice**: Some validators will require additional dependencies; whenever you
+get a message like
+`gem-name is not part of the bundle. Add it to your project's Gemfile.`, all you
+have to do is adding that gem to your own project's Gemfile.
+
 ### validates_email_format_of
 
 ```ruby
@@ -32,7 +38,9 @@ class User < ActiveRecord::Base
 end
 ```
 
-By default, it rejects disposable e-mails (e.g. mailinator). This loads a lot of data (~1.7MB), but you can disable this validation by setting `disposable: true`.
+By default, it rejects disposable e-mails (e.g. mailinator). This loads a lot of
+data (~1.7MB), but you can disable this validation by setting
+`disposable: true`.
 
 ```ruby
 class User < ActiveRecord::Base
@@ -135,7 +143,6 @@ Rules:
 - labels do not consist of numeric values only
 - TLD validation (optional)
 
-
 ```ruby
 class Server < ActiveRecord::Base
   validates_hostname :hostname
@@ -152,8 +159,8 @@ A valid username/subdomain follows the hostname label validation:
 - cannot begin or end with a hyphen
 - cannot consist of numeric values only
 
-The compiled list will be used for both username and subdomain validations. 
-This validation loads ~20KB of text.
+The compiled list will be used for both username and subdomain validations. This
+validation loads ~20KB of text.
 
 ```ruby
 class Server < ActiveRecord::Base
@@ -189,27 +196,25 @@ end
 
 ## Maintainer
 
-* [Nando Vieira](http://nandovieira.com)
+- [Nando Vieira](http://nandovieira.com)
 
 ## License
 
 (The MIT License)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the 'Software'), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/validators.rb

@@ -25,4 +25,11 @@ module Validators
   require "validators/validates_username"
 
   I18n.load_path += Dir[File.join(__dir__, "validators/locale/*.yml")]
+
+  def self.require_dependency!(dep)
+    require dep
+  rescue LoadError
+    raise "#{dep} is not part of the bundle. " \
+          "Add it to your project's Gemfile."
+  end
 end

data/lib/validators/disposable_domains.rb

@@ -5,10 +5,9 @@ module Validators
     def self.all
       @all ||=
         begin
-          require "email_data"
+          Validators.require_dependency! "root_domain"
+          Validators.require_dependency! "email_data"
           EmailData.disposable_domains
-        rescue LoadError
-          raise "email_data is not part of the bundle. Add it to Gemfile."
         end
     end
 

data/lib/validators/disposable_emails.rb

@@ -5,10 +5,9 @@ module Validators
     def self.all
       @all ||=
         begin
-          require "email_data"
+          Validators.require_dependency! "root_domain"
+          Validators.require_dependency! "email_data"
           EmailData.disposable_emails
-        rescue LoadError
-          raise "email_data is not part of the bundle. Add it to Gemfile."
         end
     end
 

data/lib/validators/tld.rb

@@ -5,10 +5,8 @@ module Validators
     def self.all
       @all ||=
         begin
-          require "email_data"
+          Validators.require_dependency! "email_data"
           EmailData.tlds
-        rescue LoadError
-          raise "email_data is not part of the bundle. Add it to Gemfile."
         end
     end
 

data/lib/validators/validates_cnpj_format_of.rb

@@ -25,10 +25,9 @@ module ActiveModel
       #   end
       #
       def validates_cnpj_format_of(*attr_names)
+        Validators.require_dependency! "cpf_cnpj"
         require "cnpj"
         validates_with CnpjValidator, _merge_attributes(attr_names)
-      rescue LoadError
-        raise "cpf_cnpj is not part of the bundle. Add it to Gemfile."
       end
 
       alias_method :validates_cnpj, :validates_cnpj_format_of

data/lib/validators/validates_cpf_format_of.rb

@@ -25,10 +25,9 @@ module ActiveModel
       #   end
       #
       def validates_cpf_format_of(*attr_names)
+        Validators.require_dependency! "cpf_cnpj"
         require "cpf"
         validates_with CpfValidator, _merge_attributes(attr_names)
-      rescue LoadError
-        raise "cpf_cnpj is not part of the bundle. Add it to Gemfile."
       end
 
       alias_method :validates_cpf, :validates_cpf_format_of

data/lib/validators/validates_email_format_of.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "root_domain"
-
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
@@ -79,6 +77,8 @@ module ActiveModel
       #   end
       #
       def validates_email_format_of(*attr_names)
+        Validators.require_dependency! "root_domain"
+        Validators.require_dependency! "email_data"
         validates_with EmailValidator, _merge_attributes(attr_names)
       end
 

data/lib/validators/validates_ssh_private_key.rb

@@ -56,10 +56,8 @@ module ActiveModel
       #   end
       #
       def validates_ssh_private_key(*attr_names)
-        require "sshkey"
+        Validators.require_dependency! "sshkey"
         validates_with SshPrivateKeyValidator, _merge_attributes(attr_names)
-      rescue LoadError
-        raise "sshkey is not part of the bundle. Add it to Gemfile."
       end
     end
   end

data/lib/validators/validates_ssh_public_key.rb

@@ -25,10 +25,8 @@ module ActiveModel
       #   end
       #
       def validates_ssh_public_key(*attr_names)
-        require "sshkey"
+        Validators.require_dependency! "sshkey"
         validates_with SshPublicKeyValidator, _merge_attributes(attr_names)
-      rescue LoadError
-        raise "sshkey is not part of the bundle. Add it to Gemfile."
       end
     end
   end

data/lib/validators/version.rb

@@ -4,7 +4,7 @@ module Validators
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/validators/validates_cnpj_format_of_test.rb

@@ -15,10 +15,10 @@ class ValidatesCnpjFormatOfTest < Minitest::Test
     end
   end
 
-  test "fails when gem is not available" do
-    assert_raises do
+  test "fails when cpf_cnpj is not available" do
+    assert_raises(StandardError, /cpf_cnpj is not part of the bundle/) do
       Class.new do
-        expects(:require).with("cnpj").raises(LoadError)
+        Validators.expects(:require).with("cpf_cnpj").raises(LoadError, "-- cpf_cnpj")
 
         include ActiveModel::Model
         validates_cnpj_format_of :document

data/test/validators/validates_cpf_format_of_test.rb

@@ -15,10 +15,10 @@ class ValidatesCpfFormatOfTest < Minitest::Test
     end
   end
 
-  test "fails when gem is not available" do
-    assert_raises do
+  test "fails when cpf_cnpj is not available" do
+    assert_raises(StandardError, /cpf_cnpj is not part of the bundle/) do
       Class.new do
-        expects(:require).with("cpf").raises(LoadError)
+        Validators.expects(:require).with("cpf_cnpj").raises(LoadError, "-- cpf_cnpj")
 
         include ActiveModel::Model
         validates_cpf_format_of :document

data/test/validators/validates_email_format_of_test.rb

@@ -9,6 +9,29 @@ class ValidatesEmailFormatOfTest < Minitest::Test
     Person.validates :email, email: true
   end
 
+  test "fails when email_data is not available" do
+    assert_raises(StandardError, /email_data is not part of the bundle/) do
+      Class.new do
+        Validators.expects(:require).with("root_domain")
+        Validators.expects(:require).with("email_data").raises(LoadError, "-- email_data")
+
+        include ActiveModel::Model
+        validates_email :email
+      end
+    end
+  end
+
+  test "fails when root_domain is not available" do
+    assert_raises(StandardError, /root_domain is not part of the bundle/) do
+      Class.new do
+        Validators.expects(:require).with("root_domain").raises(LoadError, "-- root_domain")
+
+        include ActiveModel::Model
+        validates_email :email
+      end
+    end
+  end
+
   VALID_EMAILS.each do |email|
     test "accepts #{email.inspect} as a valid email" do
       user = User.new(email: email, corporate_email: email)

data/test/validators/validates_ssh_private_key/common_test.rb

@@ -15,10 +15,10 @@ class ValidatesSshPrivateKeyCommonTest < Minitest::Test
     end
   end
 
-  test "fails when gem is not available" do
-    assert_raises do
+  test "fails when sshkey is not available" do
+    assert_raises(StandardError, /sshkey is not part of the bundle/) do
       Class.new do
-        expects(:require).with("sshkey").raises(LoadError)
+        Validators.expects(:require).with("sshkey").raises(LoadError.new("-- sshkey"))
 
         include ActiveModel::Model
         validates_ssh_private_key :key

data/test/validators/validates_ssh_public_key_test.rb

@@ -15,10 +15,10 @@ class ValidatesSsshPublicKeyCommonTest < Minitest::Test
     end
   end
 
-  test "fails when gem is not available" do
-    assert_raises do
+  test "fails when sshkey is not available" do
+    assert_raises(StandardError, /sshkey is not part of the bundle/) do
       Class.new do
-        expects(:require).with("sshkey").raises(LoadError)
+        Validators.expects(:require).with("sshkey").raises(LoadError, "-- sshkey")
 
         include ActiveModel::Model
         validates_ssh_public_key :key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord