validators 3.3.0 → 3.4.2

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

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

data/lib/validators.rb

@@ -7,7 +7,7 @@ module Validators
   require "validators/ip"
   require "validators/tld"
   require "validators/hostname"
-  require "validators/disposable_hostnames"
+  require "validators/disposable_domains"
   require "validators/disposable_emails"
   require "validators/reserved_subdomains"
 
@@ -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/test/test_helper.rb

@@ -3,7 +3,6 @@
 $VERBOSE = nil
 
 require "simplecov"
-SimpleCov.start
 
 SimpleCov.start do
   add_filter "test/support"
@@ -31,7 +30,7 @@ end
 
 Time.zone = "America/Sao_Paulo"
 TLDs = Validators::TLD.all.sample(10)
-DISPOSABLE_DOMAINS = Validators::DisposableHostnames.all.sample(10)
+DISPOSABLE_DOMAINS = Validators::DisposableDomains.all.sample(10)
 DISPOSABLE_EMAILS = Validators::DisposableEmails.all +
                     Validators::DisposableEmails.all.sample(10).map {|email| build_email_with_filter(email) } +
                     Validators::DisposableEmails.all.sample(10).map {|email| build_email_with_dots(email) } +

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

data/test/validators/validates_url_format_of/with_tld_validation_test.rb

@@ -14,4 +14,22 @@ class ValidatesurlFormatUrlWithTldValidationTest < Minitest::Test
       assert user.valid?
     end
   end
+
+  test "rejects invalid TLD (alternative syntax)" do
+    user_model = Class.new do
+      include ActiveModel::Validations
+      attr_accessor :site_url
+
+      def self.name
+        "User"
+      end
+
+      validates :site_url, url: {tld: true}
+    end
+
+    user = user_model.new
+    user.site_url = "https://example.xy"
+
+    refute user.valid?
+  end
 end

data/test/validators/validates_url_format_of/without_tld_validation_test.rb

@@ -47,4 +47,22 @@ class ValidatesurlFormatUrlWithoutTldValidationTest < Minitest::Test
     user = User.new(url: "")
     refute user.valid?
   end
+
+  test "accepts invalid TLD (alternative syntax)" do
+    user_model = Class.new do
+      include ActiveModel::Validations
+      attr_accessor :site_url
+
+      def self.name
+        "User"
+      end
+
+      validates :site_url, url: {tld: false}
+    end
+
+    user = user_model.new
+    user.site_url = "https://example.xy"
+
+    assert user.valid?
+  end
 end

data/validators.gemspec

@@ -12,9 +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.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) }
@@ -23,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activerecord"
   s.add_development_dependency "aitch"
   s.add_development_dependency "cpf_cnpj"
+  s.add_development_dependency "email_data"
   s.add_development_dependency "minitest-utils"
   s.add_development_dependency "mocha"
   s.add_development_dependency "nokogiri"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: email_data
+  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: minitest-utils
   requirement: !ruby/object:Gem::Requirement
@@ -266,28 +280,23 @@ description: Add some nice ActiveModel/ActiveRecord validators.
 email:
 - fnando.vieira@gmail.com
 executables:
-- sync-disposable-hostnames
-- sync-tld
+- sync-reserved-subdomains
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
-- bin/sync-disposable-hostnames
-- bin/sync-tld
-- data/country_tlds.txt
-- data/disposable_domains.txt
-- data/disposable_emails.txt
+- bin/sync-reserved-subdomains
 - data/reserved_subdomains.txt
-- data/tld.txt
 - lib/validators.rb
 - lib/validators/constants.rb
+- lib/validators/disposable_domains.rb
 - lib/validators/disposable_emails.rb
-- lib/validators/disposable_hostnames.rb
 - lib/validators/hostname.rb
 - lib/validators/ip.rb
 - lib/validators/locale/en.yml
@@ -342,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:
@@ -351,46 +361,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '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: []

data/bin/sync-disposable-hostnames

@@ -1,230 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require_relative "helpers"
-
-def ten_minute_mail
-  path = "disposable/10minutemail.txt"
-  url = "https://10minutemail.com/session/address"
-
-  20.times do
-    refresh_list(url: url, path: path) do |response|
-      _account, host = response.data.fetch("address").split("@")
-
-      [host]
-    end
-
-    sleep random_timeout
-  end
-end
-
-def temp_mail
-  path = "disposable/tempmail.txt"
-  url = "https://api4.temp-mail.org/request/domains/format/json"
-
-  refresh_list(url: url, path: path) do |response|
-    response.data.map {|domain| domain.tr("@", "") }
-  end
-end
-
-def temp_mail_address
-  path = "disposable/tempmailaddress.txt"
-  url = "https://www.tempmailaddress.com/index/index"
-
-  refresh_list(url: url, path: path) do |response|
-    data = JSON.parse(
-      response.body.gsub(/[^-,:\w@.{}"]/, ""),
-      symbolize_names: true
-    )
-    [data[:email].split("@").last]
-  end
-end
-
-def tempmail_io
-  path = "disposable/tempmail_io.txt"
-  url = "https://api.internal.temp-mail.io/api/v2/domains"
-
-  refresh_list(url: url, path: path) do |response|
-    response.data["domains"]
-  end
-end
-
-def gmailnator
-  emails = []
-
-  5.times do
-    url = "https://gmailnator.com/bulk-emails"
-    default_headers = {"user-agent" => USER_AGENT.sample}
-
-    response = Aitch.get(url: url, headers: default_headers)
-
-    throw "Received #{response.status} when getting CSRF token" unless response.ok?
-
-    cookie_header = response.headers["set-cookie"]
-    attr = response.data.css("#csrf_token").first
-    csrf_token = attr[:value]
-    csrf_field = attr[:name]
-
-    response = Aitch.post(
-      url: url,
-      params: {email_list: "1000", email: [3], csrf_field => csrf_token},
-      headers: default_headers.merge({"cookie" => cookie_header})
-    )
-
-    throw "Received #{response.status} when fetching list" unless response.ok?
-
-    emails += response.data.css("#email-list-message a").map do |node|
-      mailbox, domain = node.text.gsub(/\+[^@]+/, "").split("@")
-      mailbox = mailbox.gsub(/\./m, "")
-      "#{mailbox}@#{domain}"
-    end
-
-    sleep random_timeout
-  end
-
-  append_to_file("disposable/gmailnator.txt", emails)
-end
-
-def domain_scraping(name, url, selector)
-  timeout(10) do
-    puts "=> Scraping #{url}"
-
-    selector, value_selector = selector.split("::")
-    path = "disposable/#{name}.txt"
-    host_regex = /@?(.*?(\.[^.]+)+)/
-
-    refresh_list(url: url, path: path) do |response|
-      new_domains = response
-                    .data
-                    .css(selector)
-                    .map {|element| process_scraping(element, value_selector) }
-
-      new_domains = new_domains
-                    .map(&:squish)
-                    .reject(&:empty?)
-                    .map {|domain| domain[host_regex, 1]&.squish&.tr("@", "") }
-                    .reject(&:nil?)
-                    .reject(&:empty?)
-                    .map {|domain| domain.gsub(/\s*\((.*?)\)/, "") }
-
-      raise "No #{name} hosts found" if new_domains.empty?
-
-      new_domains
-    end
-  end
-rescue StandardError => error
-  puts "=> [ERROR] Unable to scrape #{url}; #{error.class}: #{error.message}"
-  []
-end
-
-def process_scraping(element, value_selector)
-  value = nil
-
-  case value_selector
-  when "text()"
-    value = element.text
-  when /^attr\((.*?)\)/
-    value = element[Regexp.last_match(1)]
-  else
-    element.attributes.each do |_name, attr|
-      attr = attr.value.to_s
-      value = attr if attr =~ host_regex
-    end
-  end
-
-  raise "no value found: #{element} (value_selector: #{value_selector})" unless value
-
-  value
-end
-
-def load_github_url(url)
-  puts "=> Fetching #{url}"
-
-  basename = URI.parse(url).path[%r{/([^/]+/[^/]+)}, 1].tr("/", "_").tr("-", "_")
-  path = "disposable/#{basename}.txt"
-  domains = load_file(path)
-
-  ext = File.extname(url)
-
-  domains += case ext
-             when ".json"
-               JSON.parse(http_request(:get, url).body)
-             when ".txt"
-               http_request(:get, url).body.lines.map(&:chomp)
-             else
-               raise "Unknown extension"
-             end
-
-  append_to_file(path, domains)
-  domains
-rescue StandardError => error
-  puts "=> Unable to load #{url}; #{error.class}: #{error.message}"
-  []
-end
-
-threads = []
-
-threads << thread { load_github_url("https://raw.githubusercontent.com/ivolo/disposable-email-domains/master/index.json") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/andreis/disposable-email-domains/master/domains.json") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/FGRibreau/mailchecker/master/list.txt") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/willwhite/freemail/master/data/disposable.txt") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/maxmalysh/disposable-emails/master/disposable_emails/data/domains.txt") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/jespernissen/disposable-maildomain-list/master/disposable-maildomain-list.txt") }
-threads << thread { load_github_url("https://raw.githubusercontent.com/wesbos/burner-email-providers/master/emails.txt") }
-threads << thread { load_github_url("https://gist.github.com/fnando/dafe542cac13f831bbf5521a55248116/raw/disposable.txt") }
-threads << thread { ten_minute_mail }
-threads << thread { temp_mail }
-threads << thread { temp_mail_address }
-threads << thread { tempmail_io }
-threads << thread { load_file("disposable/disposable_manually_added.txt") }
-threads << thread { domain_scraping("guerrillamail", "https://www.guerrillamail.com/", "select option::attr(value)") }
-threads << thread { domain_scraping("moakt", "https://www.moakt.com", "select option::attr(value)") }
-threads << thread { domain_scraping("tempr", "https://tempr.email/", "select[name=DomainId] option::text()") }
-threads << thread { domain_scraping("yepmail", "https://yepmail.co/", "select[name=domain] option::text()") }
-threads << thread { domain_scraping("fake_email_generator", "https://fakemailgenerator.net", "[data-mailhost]::attr(data-mailhost)") }
-threads << thread { domain_scraping("tempemails", "https://www.tempemails.net/", "select[name=domain] option::attr(value)") }
-threads << thread { domain_scraping("clipmails", "https://clipmails.com/", "select[name=domain] option::attr(value)") }
-threads << thread { domain_scraping("1secmail", "https://www.1secmail.com/", "select[id=domain] option::attr(value)") }
-threads << thread { domain_scraping("emailfake", "https://generator.email", ".tt-suggestion p::text()") }
-threads << thread { domain_scraping("emailfake", "https://emailfake.com/", ".tt-suggestion p::text()") }
-threads << thread { domain_scraping("emailfake", "https://email-fake.com/", ".tt-suggestion p::text()") }
-threads << thread { domain_scraping("receivemail", "https://www.receivemail.org/", "select[name=domain] option::text()") }
-threads << thread { domain_scraping("itemp", "https://itemp.email", "select[name=domain] option::text()") }
-threads << thread { domain_scraping("cs", "https://www.cs.email", "select[id=gm-host-select] option::text()") }
-threads << thread { domain_scraping("tempmail", "https://tempmail.io/settings/", "select[id=domain] option::text()") }
-threads << thread { domain_scraping("tempemail", "https://tempemail.co", "select[name=email_domain] option::text()") }
-threads << thread { domain_scraping("tmail", "https://mytemp-email.com/", "a.domain-selector::text()") }
-
-threads.each_slice(5) do |slice|
-  slice.each(&:join)
-end
-
-threads.clear
-
-domains = []
-
-puts "=> Loading disposable_domains.txt"
-domains += File.read("#{__dir__}/../data/disposable_domains.txt").lines.map(&:chomp)
-
-puts "=> Loading disposable/*.txt"
-Dir["./data/disposable/**/*.txt"].map do |file|
-  file = File.expand_path(file)
-  domains += File.read(file).lines.map(&:chomp).flatten.compact
-end
-
-ignore_domains = %w[gmail.com hotmail.com]
-
-puts "=> Normalize domains (count: #{domains.size})"
-domains = domains
-          .uniq
-          .map {|domain| RootDomain.call(domain.split("@").last.downcase) }
-          .compact
-          .uniq
-          .reject {|domain| ignore_domains.include?(domain) }
-
-puts "=> Saving domains (count: #{domains.size})"
-save_file("disposable_domains.txt", domains)
-
-emails = gmailnator
-puts "=> Saving email proxies (count: #{emails.size})"
-save_file("disposable_emails.txt", emails)

data/bin/sync-tld

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require_relative "helpers"
-
-tlds = http_request(:get, "https://data.iana.org/TLD/tlds-alpha-by-domain.txt").body.lines
-tlds.shift # remove update notice
-
-tlds.map!(&:downcase)
-tlds.map!(&:strip)
-tlds.map! {|tld| SimpleIDN.to_ascii(tld) }
-
-save_file("tld.txt", tlds)
-
-country_tlds = JSON.parse(http_request(:get, "https://github.com/samayo/country-json/raw/master/src/country-by-domain-tld.json").body, symbolize_names: true)
-country_tlds = country_tlds
-               .reject {|info| info[:tld].nil? }
-               .map {|info| info[:tld].gsub(/^\./, "") }
-
-save_file("country_tlds.txt", country_tlds)