validators 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a736f1025396b9890dbee7e6b132b4614171ea40fb40dae7b2328c46041450b0
-  data.tar.gz: 99b1a2f3ad91b27c2da61e0041e9fc467bdce72e4d4e74ceb9f94966535d8c1d
+  metadata.gz: d0f693875b0571922e182c06e57d4710dc698506a3859d943973706a4565fa3a
+  data.tar.gz: 36729706a9f37dec4243a16bd7e1a2e77007e07e03077413a78d04fba2607d53
 SHA512:
-  metadata.gz: aae5016154a43eb9ce819edb9c89174235bbd1d16999f66b03a27d220f1ee94f22d4fa537cdb5ea860552252ae12ff0595a9a306799c00216eab5676ad6a709d
-  data.tar.gz: a832a6d26868df4dcf0d53b456318adb79d40d604006bf14ed926ed027407bfbf8023af5257edcf9ca62e9cf6a41a1a77c5cf5f32697a8624ae9db695afe84f5
+  metadata.gz: ee2529d3bf6c418fff9f38c104c9f8d3df27121213472ef15b12ae19c37f4dbbeb527b821f1d48b4d803a06810efd1fbb7b3807f3cdec574c76ea1d547840def
+  data.tar.gz: 278ff5305f827bf8f097426de34ab0543b57474dc731586b6c278e199b8c7c8ac1499c8d0c875dd54378ab292009a9a8e8bc44f8ea16ba75f317fcdaa9b682eb

data/.rubocop.yml

@@ -10,15 +10,6 @@ AllCops:
 Style/AsciiComments:
   Enabled: false
 
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
 Style/Alias:
   Enabled: false
 
@@ -28,13 +19,5 @@ Layout/LineLength:
 Style/IfUnlessModifier:
   Enabled: false
 
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - bin/**/*
-    - "*.gemspec"
-
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false

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_emails.rb

@@ -13,7 +13,7 @@ module Validators
 
     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/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

@@ -19,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,

data/lib/validators/version.rb

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

data/test/validators/disposable_email_test.rb

@@ -13,9 +13,7 @@ class DisposableEmailTest < Minitest::Test
       assert_includes user.errors[:email],
                       I18n.t("activerecord.errors.messages.disposable_domain")
     end
-  end
 
-  DISPOSABLE_DOMAINS.each do |domain|
     test "rejects disposable e-mail with subdomain (custom.#{domain})" do
       User.validates_email_format_of :email
 

data/validators.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary     = "Add some nice ActiveModel/ActiveRecord validators."
   s.description = s.summary
   s.license     = "MIT"
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  s.metadata = {"rubygems_mfa_required" => "true"}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`
                     .split("\n")
                     .map {|f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -279,7 +279,8 @@ dependencies:
 description: Add some nice ActiveModel/ActiveRecord validators.
 email:
 - fnando.vieira@gmail.com
-executables: []
+executables:
+- sync-reserved-subdomains
 extensions: []
 extra_rdoc_files: []
 files:
@@ -290,6 +291,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/sync-reserved-subdomains
 - data/reserved_subdomains.txt
 - lib/validators.rb
 - lib/validators/constants.rb
@@ -349,7 +351,8 @@ files:
 homepage: http://rubygems.org/gems/validators
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -358,46 +361,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.
-test_files:
-- test/schema.rb
-- test/support/dates.rb
-- test/support/emails.rb
-- test/support/hostnames.rb
-- test/support/ips.rb
-- test/support/models.rb
-- test/support/urls.rb
-- test/test_helper.rb
-- test/validators/disposable_email_test.rb
-- test/validators/ip_test.rb
-- test/validators/validates_cnpj_format_of_test.rb
-- test/validators/validates_cpf_format_of_test.rb
-- test/validators/validates_datetime/after_option_test.rb
-- test/validators/validates_datetime/before_option_test.rb
-- test/validators/validates_datetime/defaults_test.rb
-- test/validators/validates_email_format_of_test.rb
-- test/validators/validates_hostname_format_of/with_tld_validation_test.rb
-- test/validators/validates_hostname_format_of/without_tld_validation_test.rb
-- test/validators/validates_ip_address/ipv4_test.rb
-- test/validators/validates_ip_address/ipv6_test.rb
-- test/validators/validates_ip_address_test.rb
-- test/validators/validates_ownership_of_test.rb
-- test/validators/validates_ssh_private_key/bits_test.rb
-- test/validators/validates_ssh_private_key/common_test.rb
-- test/validators/validates_ssh_private_key/dsa_test.rb
-- test/validators/validates_ssh_private_key/rsa_test.rb
-- test/validators/validates_ssh_public_key_test.rb
-- test/validators/validates_subdomain_test.rb
-- test/validators/validates_url_format_of/with_tld_validation_test.rb
-- test/validators/validates_url_format_of/without_tld_validation_test.rb
-- test/validators/validates_username_test.rb
+test_files: []