validators 3.3.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 862ad7c2a49bcc38d917336b109047a330c6de6c6da16d83ea7953ddefe70096
-  data.tar.gz: fb5e0b9db3ec0fdbc064eb6467cb36fab3d0f4bab6f29a5c8439c8d5edeb46fd
+  metadata.gz: d0f693875b0571922e182c06e57d4710dc698506a3859d943973706a4565fa3a
+  data.tar.gz: 36729706a9f37dec4243a16bd7e1a2e77007e07e03077413a78d04fba2607d53
 SHA512:
-  metadata.gz: b8842cf3ee2161ef2fe18c384efdb5ff6407c135560a95b91689d29b8ff65d87272c599288de55a6422dfaa6ff4be3b0b00fbd7ea8a8472e47bc08acfb973a85
-  data.tar.gz: 7a6fe664d6ef7a33735b8bf41cc198f8509a5712f788a2db93d6f2c4b39678ad6965eea1557fb6e43551a4d947a0cfd2e89c16a53c0721b6ada4390baa8cf293
+  metadata.gz: ee2529d3bf6c418fff9f38c104c9f8d3df27121213472ef15b12ae19c37f4dbbeb527b821f1d48b4d803a06810efd1fbb7b3807f3cdec574c76ea1d547840def
+  data.tar.gz: 278ff5305f827bf8f097426de34ab0543b57474dc731586b6c278e199b8c7c8ac1499c8d0c875dd54378ab292009a9a8e8bc44f8ea16ba75f317fcdaa9b682eb

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [fnando]

data/.rubocop.yml

@@ -3,20 +3,13 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
+  Exclude:
+    - vendor/**/*
 
 Style/AsciiComments:
   Enabled: false
 
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
 Style/Alias:
   Enabled: false
 
@@ -26,13 +19,5 @@ Layout/LineLength:
 Style/IfUnlessModifier:
   Enabled: false
 
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - bin/**/*
-    - "*.gemspec"
-
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false

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/Rakefile

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rubocop/rake_task"

data/bin/sync-reserved-subdomains

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "open-uri"
+require "json"
+require "yaml"
+require "email_data"
+require "aitch"
+
+def fetch_nkkollaw
+  matchers = YAML.safe_load(Aitch.get("https://github.com/nkkollaw/reserved-subdomains/raw/master/reserved-subdomains.yaml").body).map(&:to_s)
+  matchers.map do |matcher|
+    next matcher unless matcher.start_with?("/")
+
+    matcher.gsub(%r{/(.*?)/}) do |_m, _group|
+      new_matcher = Regexp.last_match(1).gsub("[0-9]+", "[0-9-]*")
+      "/^#{new_matcher}$/"
+    end
+  end
+end
+
+def fetch_mottie
+  data = JSON.parse(Aitch.get("https://github.com/Mottie/github-reserved-names/raw/master/oddballs.json").body, symbolize_names: true)
+  data.keys.map(&:to_s)
+end
+
+def fetch_jedireza
+  data = JSON.parse(Aitch.get("https://github.com/jedireza/reserved-subdomains/raw/master/names.json").body, symbolize_names: true)
+  data.map(&:to_s)
+end
+
+def fetch_mvila
+  data = JSON.parse(Aitch.get("https://github.com/mvila/reserved-usernames/raw/master/data.json").body)
+  data.map(&:to_s)
+end
+
+def fetch_lukes
+  data = JSON.parse(Aitch.get("https://github.com/lukes/ISO-3166-Countries-with-Regional-Codes/raw/master/all/all.json").body)
+  data.map do |info|
+    info["alpha-2"].downcase
+  end
+end
+
+def fetch_dominicsayers
+  %w[
+    https://github.com/dominicsayers/reserved_subdomain/raw/master/lib/reserved_subdomain/literals/miscellaneous.txt
+  ].each_with_object([]) do |url, buffer|
+    data = Aitch.get(url).body.lines
+    buffer.push(*data.map(&:chomp))
+  end
+end
+
+subdomains = []
+subdomains << fetch_nkkollaw
+subdomains << fetch_mottie
+subdomains << fetch_jedireza
+subdomains << fetch_mvila
+subdomains << fetch_lukes
+subdomains << fetch_dominicsayers
+subdomains << ("a".."z").to_a
+subdomains << EmailData.tlds
+subdomains << %w[
+  /^db[0-9-]*$/
+  /^dc[0-9-]*$/
+  /^dev[0-9-]*$/
+  /^dns[0-9-]*$/
+  /^ftp[0-9-]*$/
+  /^host[0-9-]*$/
+  /^mail[0-9-]*$/
+  /^mx[0-9-]*$/
+  /^ns[0-9-]*$/
+  /^ntp[0-9-]*$/
+  /^server[0-9-]*$/
+  /^smtp[0-9-]*$/
+  /^static[0-9-]*$/
+  /^support[0-9-]*$/
+  /^test[0-9-]*$/
+  /^vpn[0-9-]*$/
+  /^web[0-9-]*$/
+  /^www[0-9-]*$/
+  /^your.+$/
+  /^[0-9-]+$/
+  eu
+  us
+]
+
+subdomains = subdomains.flatten.map do |subdomain|
+  next subdomain if subdomain.start_with?("/")
+
+  subdomain.gsub(/[-_]/, "")
+end
+
+File.open("./data/reserved_subdomains.txt", "w") do |file|
+  file << subdomains.flatten.uniq.sort.map(&:downcase).join("\n")
+end

data/data/reserved_subdomains.txt

@@ -136,6 +136,7 @@ adult
 adv
 advanceautoparts
 advertising
+advisories
 ae
 aecom
 aeg
@@ -144,7 +145,6 @@ aero
 aes
 aetna
 af
-afamilycompany
 affiliate
 affiliates
 afginc
@@ -398,7 +398,6 @@ brother
 brussels
 bs
 bt
-budapest
 bug
 bugatti
 bugs
@@ -451,7 +450,6 @@ cars
 cart
 casa
 case
-caseih
 casestudies
 caseys
 cash
@@ -472,7 +470,6 @@ cc
 cd
 cdn
 cdw
-ceb
 celanese
 celgene
 centene
@@ -743,7 +740,6 @@ drupal
 dteenergy
 dtv
 dubai
-duck
 dukeenergy
 dunlop
 dupont
@@ -950,7 +946,6 @@ fs
 ftp
 ftr
 fujitsu
-fujixerox
 fun
 fund
 furniture
@@ -1008,7 +1003,6 @@ github
 gives
 giving
 gl
-glade
 glass
 gle
 global
@@ -1230,7 +1224,6 @@ item
 items
 itv
 itw
-iveco
 j
 jabber
 jabil
@@ -1243,7 +1236,6 @@ javanese
 javascript
 jbhunt
 jcb
-jcp
 jcpenney
 je
 jeep
@@ -1292,6 +1284,7 @@ kg
 kh
 ki
 kia
+kids
 kiewit
 kim
 kimberlyclark
@@ -1397,7 +1390,6 @@ live
 livejournal
 livenation
 living
-lixil
 lj
 lk
 lkqcorp
@@ -1435,7 +1427,6 @@ ltd
 ltda
 lu
 lundbeck
-lupin
 luxe
 luxury
 lv
@@ -1631,7 +1622,6 @@ networkip
 neustar
 new
 newellbrands
-newholland
 newmont
 news
 newscorp
@@ -1709,7 +1699,6 @@ oauth
 oauthclients
 obi
 observer
-off
 offer
 offers
 office
@@ -1732,7 +1721,6 @@ oneok
 ong
 onl
 online
-onyourside
 ooo
 open
 openid
@@ -1924,11 +1912,9 @@ query
 quest
 questdiagnostics
 quintiles
-qvc
 r
 racing
 radio
-raid
 ralphlauren
 random
 ranking
@@ -1999,7 +1985,6 @@ ril
 rio
 rip
 riteaid
-rmit
 ro
 rocher
 rocks
@@ -2071,7 +2056,6 @@ schools
 schule
 schwarz
 science
-scjohnson
 scot
 script
 scripts
@@ -2128,7 +2112,6 @@ shopping
 shouji
 show
 showtime
-shriram
 si
 signin
 signout
@@ -2176,6 +2159,7 @@ southerncompany
 southwest
 soy
 sp
+spa
 space
 spam
 spanish
@@ -2189,7 +2173,6 @@ spiritaero
 sport
 sports
 spot
-spreadbetting
 sql
 sr
 src
@@ -2262,7 +2245,6 @@ suzuki
 sv
 svn
 swatch
-swiftcover
 swiss
 sx
 sy
@@ -2646,12 +2628,12 @@ xn3bst00m
 xn3ds443g
 xn3e0b707e
 xn3hcrj9c
-xn3oq18vl8pn36a
 xn3pxu8k
 xn42c2d9a
 xn45br5cyl
 xn45brj9c
 xn45q11c
+xn4dbrk0ce
 xn4gbrim
 xn54b7fta0cc
 xn55qw42g

data/lib/validators/disposable_domains.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Validators
+  class DisposableDomains
+    def self.all
+      @all ||=
+        begin
+          Validators.require_dependency! "root_domain"
+          Validators.require_dependency! "email_data"
+          EmailData.disposable_domains
+        end
+    end
+
+    def self.include?(domain)
+      all.include?(domain)
+    end
+  end
+end

data/lib/validators/disposable_emails.rb

@@ -2,15 +2,18 @@
 
 module Validators
   class DisposableEmails
-    FILE_PATH = File.expand_path("../../data/disposable_emails.txt", __dir__)
-
     def self.all
-      @all ||= File.read(FILE_PATH).lines.map(&:chomp)
+      @all ||=
+        begin
+          Validators.require_dependency! "root_domain"
+          Validators.require_dependency! "email_data"
+          EmailData.disposable_emails
+        end
     end
 
     def self.include?(email)
       mailbox, domain = email.to_s.split("@")
-      mailbox = mailbox.to_s.gsub(".", "")
+      mailbox = mailbox.to_s.delete(".")
       mailbox = mailbox.gsub(/\+(.+)?\Z/, "")
 
       all.include?("#{mailbox}@#{domain}")

data/lib/validators/ip.rb

@@ -11,13 +11,13 @@ module Validators
     # Extracted from Ruby 1.8.7
     def v6?(addr)
       # IPv6 (normal)
-      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*\Z/i =~ addr
-      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*::([\da-f]{1,4}(:[\da-f]{1,4})*)?\Z/i =~ addr
-      return true if /\A::([\da-f]{1,4}(:[\da-f]{1,4})*)?\Z/i =~ addr
+      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*\Z/i.match?(addr)
+      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*::([\da-f]{1,4}(:[\da-f]{1,4})*)?\Z/i.match?(addr)
+      return true if /\A::([\da-f]{1,4}(:[\da-f]{1,4})*)?\Z/i.match?(addr)
       # IPv6 (IPv4 compat)
-      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*:/i =~ addr && v4?($')
-      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*::([\da-f]{1,4}(:[\da-f]{1,4})*:)?/i =~ addr && v4?($')
-      return true if /\A::([\da-f]{1,4}(:[\da-f]{1,4})*:)?/i =~ addr && v4?($')
+      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*:/i =~ addr && v4?(Regexp.last_match.post_match)
+      return true if /\A[\da-f]{1,4}(:[\da-f]{1,4})*::([\da-f]{1,4}(:[\da-f]{1,4})*:)?/i =~ addr && v4?(Regexp.last_match.post_match)
+      return true if /\A::([\da-f]{1,4}(:[\da-f]{1,4})*:)?/i =~ addr && v4?(Regexp.last_match.post_match)
 
       false
     end

data/lib/validators/locale/en.yml

@@ -3,8 +3,8 @@ en:
   activemodel: &activemodel
     errors:
       messages:
-        disposable_email: "is not allowed (high-bounce email)"
         disposable_domain: "is not allowed (high-bounce domain)"
+        disposable_email: "is not allowed (high-bounce email)"
         invalid_cnpj: "is not a valid CNPJ"
         invalid_cpf: "is not a valid CPF"
         invalid_date: "is not a valid date"
@@ -17,14 +17,15 @@ en:
         invalid_ipv6_address: "is not a valid IPv6 address"
         invalid_owner: "is not associated with your user"
         invalid_ssh_private_key: "is not a valid private SSH key"
-        invalid_ssh_private_key_bits: "needs to be at least %{required} bits; got %{value} bits instead"
+        invalid_ssh_private_key_bits:
+          "needs to be at least %{required} bits; got %{value} bits instead"
         invalid_ssh_private_key_type: "must be a %{value} key"
         invalid_ssh_public_key: "is not a valid public SSH key"
+        invalid_subdomain: "is invalid"
         invalid_url: "is not a valid address"
+        invalid_username: "is invalid"
         reserved_subdomain: "%{value} is a reserved subdomain"
-        invalid_subdomain: "is invalid"
         reserved_username: "%{value} is a reserved username"
-        invalid_username: "is invalid"
 
   activerecord:
     <<: *activemodel

data/lib/validators/locale/pt-BR.yml

@@ -3,8 +3,8 @@ pt-BR:
   activemodel: &activemodel
     errors:
       messages:
-        disposable_email: "não é permitido (e-mail temporário)"
         disposable_domain: "não é permitido (e-mail temporário)"
+        disposable_email: "não é permitido (e-mail temporário)"
         invalid_cnpj: "não é um CNPJ válido"
         invalid_cpf: "não é um CPF válido"
         invalid_date: "não é uma data válida"
@@ -17,11 +17,15 @@ pt-BR:
         invalid_ipv6_address: "não é um endereço IPv6 válido"
         invalid_owner: "não está associado ao seu usuário"
         invalid_ssh_private_key: "não é uma chave privada de SSH válida"
-        invalid_ssh_private_key_bits: "precisa ter pelo menos %{required} bits; a sua chave tem %{value} bits"
+        invalid_ssh_private_key_bits:
+          "precisa ter pelo menos %{required} bits; a sua chave tem %{value}
+          bits"
         invalid_ssh_private_key_type: "precisa ser uma chave %{value}"
         invalid_ssh_public_key: "não é uma chave pública de SSH válida"
+        invalid_subdomain: "é inválido"
         invalid_url: "não parece ser uma URL válida"
-        reserved_hostname: "%{value} é um hostname reservado"
+        invalid_username: "não é válido"
+        reserved_subdomain: "%{value} é um subdomínio reservado"
         reserved_username: "%{value} é nome de usuário reservado"
 
   activerecord:

data/lib/validators/tld.rb

@@ -2,10 +2,12 @@
 
 module Validators
   class TLD
-    FILE_PATH = File.expand_path("../../data/tld.txt", __dir__)
-
     def self.all
-      @all ||= File.read(FILE_PATH).lines.map(&:chomp)
+      @all ||=
+        begin
+          Validators.require_dependency! "email_data"
+          EmailData.tlds
+        end
     end
 
     def self.host_with_valid_tld?(host)
@@ -13,10 +15,10 @@ module Validators
 
       return false if host.split(".").size == 1
 
-      valid?(host[/\.([^.]+)$/, 1].to_s.downcase)
+      include?(host[/\.([^.]+)$/, 1].to_s.downcase)
     end
 
-    def self.valid?(tld)
+    def self.include?(tld)
       all.include?(tld)
     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_datetime.rb

@@ -40,9 +40,10 @@ module ActiveModel
                  record.__send__(option) if record.respond_to?(option)
                end
 
-        if date.is_a?(Time)
+        case date
+        when Time
           value = value.to_time
-        elsif date.is_a?(Date)
+        when Date
           value = value.to_date
         end
 

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
@@ -21,8 +19,8 @@ module ActiveModel
       end
 
       def validate_email_format(record, attribute, value, options)
-        return if value.to_s =~ Validators::EMAIL_FORMAT
-        return if value.to_s =~ Validators::MICROSOFT_EMAIL_FORMAT
+        return if Validators::EMAIL_FORMAT.match?(value.to_s)
+        return if Validators::MICROSOFT_EMAIL_FORMAT.match?(value.to_s)
 
         record.errors.add(
           attribute,
@@ -50,7 +48,7 @@ module ActiveModel
         hostname = value.to_s.split(AT_SIGN).last.to_s.downcase
         root_domain = RootDomain.call(hostname)
 
-        return unless Validators::DisposableHostnames.all.include?(root_domain)
+        return unless Validators::DisposableDomains.include?(root_domain)
 
         record.errors.add(
           attribute,
@@ -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