validators 3.1.0 → 3.4.0

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/test/validators/{validates_reserved_username_test.rb → validates_username_test.rb}

@@ -2,11 +2,23 @@
 
 require "test_helper"
 
-class ValidatesReservedUsernameTest < Minitest::Test
+class ValidatesUsernameTest < Minitest::Test
+  test "rejects invalid username" do
+    model = build_model do
+      attr_accessor :username
+      validates_username :username
+    end
+
+    instance = model.new(username: "1234")
+
+    refute instance.valid?
+    assert_includes instance.errors[:username], "is invalid"
+  end
+
   test "rejects reserved username" do
     model = build_model do
       attr_accessor :username
-      validates_reserved_username :username
+      validates_username :username
     end
 
     instance = model.new(username: "www")
@@ -19,7 +31,7 @@ class ValidatesReservedUsernameTest < Minitest::Test
   test "rejects reserved username with pattern" do
     model = build_model do
       attr_accessor :username
-      validates_reserved_username :username
+      validates_username :username
     end
 
     instance = model.new(username: "www1234")
@@ -30,11 +42,22 @@ class ValidatesReservedUsernameTest < Minitest::Test
   test "uses custom list" do
     model = build_model do
       attr_accessor :username
-      validates_reserved_username :username, in: %w[nope]
+      validates_username :username, in: %w[nope]
     end
 
     instance = model.new(username: "nope")
 
     refute instance.valid?
   end
+
+  test "ignores reserved username validation" do
+    model = build_model do
+      attr_accessor :username
+      validates_username :username, reserved: false
+    end
+
+    instance = model.new(username: "www")
+
+    assert instance.valid?
+  end
 end

data/validators.gemspec

@@ -12,22 +12,32 @@ 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.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) }
+  s.executables   = `git ls-files -- bin/*`
+                    .split("\n")
+                    .map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   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"
   s.add_development_dependency "pry-meta"
   s.add_development_dependency "rake"
+  s.add_development_dependency "root_domain"
   s.add_development_dependency "rubocop"
   s.add_development_dependency "rubocop-fnando"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-console"
+  s.add_development_dependency "simpleidn"
   s.add_development_dependency "sqlite3", "~> 1.4"
   s.add_development_dependency "sshkey"
+  s.add_development_dependency "whois"
+  s.add_development_dependency "whois-parser"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aitch
+  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: cpf_cnpj
   requirement: !ruby/object:Gem::Requirement
@@ -38,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
@@ -66,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: pry-meta
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: root_domain
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simpleidn
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +248,58 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: whois
+  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: whois-parser
+  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'
 description: Add some nice ActiveModel/ActiveRecord validators.
 email:
 - fnando.vieira@gmail.com
-executables:
-- sync-disposable-hostnames
-- sync-tld
+executables: []
 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/disposable.json
-- data/reserved_hostnames.json
-- data/tld.json
+- data/reserved_subdomains.txt
 - lib/validators.rb
 - lib/validators/constants.rb
-- lib/validators/disposable_hostnames.rb
+- lib/validators/disposable_domains.rb
+- lib/validators/disposable_emails.rb
 - lib/validators/hostname.rb
 - lib/validators/ip.rb
 - lib/validators/locale/en.yml
 - lib/validators/locale/pt-BR.yml
-- lib/validators/reserved_hostnames.rb
+- lib/validators/reserved_subdomains.rb
 - lib/validators/tld.rb
 - lib/validators/validates_cnpj_format_of.rb
 - lib/validators/validates_cpf_format_of.rb
@@ -214,11 +308,11 @@ files:
 - lib/validators/validates_hostname_format_of.rb
 - lib/validators/validates_ip_address.rb
 - lib/validators/validates_ownership_of.rb
-- lib/validators/validates_reserved_hostname.rb
-- lib/validators/validates_reserved_username.rb
 - lib/validators/validates_ssh_private_key.rb
 - lib/validators/validates_ssh_public_key.rb
+- lib/validators/validates_subdomain.rb
 - lib/validators/validates_url_format_of.rb
+- lib/validators/validates_username.rb
 - lib/validators/version.rb
 - test/schema.rb
 - test/support/dates.rb
@@ -242,21 +336,21 @@ files:
 - 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_reserved_hostname_test.rb
-- test/validators/validates_reserved_username_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
 - validators.gemspec
 homepage: http://rubygems.org/gems/validators
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -264,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -272,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.
 test_files:
@@ -298,12 +392,12 @@ test_files:
 - 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_reserved_hostname_test.rb
-- test/validators/validates_reserved_username_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

data/bin/sync-disposable-hostnames

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "open-uri"
-require "json"
-
-urls = %w[
-  https://raw.githubusercontent.com/ivolo/disposable-email-domains/master/index.json
-  https://raw.githubusercontent.com/andreis/disposable-email-domains/master/domains.json
-  https://raw.githubusercontent.com/FGRibreau/mailchecker/master/list.txt
-  https://raw.githubusercontent.com/willwhite/freemail/master/data/disposable.txt
-]
-
-domains = urls.each_with_object([]) do |url, buffer|
-  ext = File.extname(url)
-
-  result = case ext
-           when ".json"
-             JSON.parse(URI.open(url).read)
-           when ".txt"
-             URI.open(url).read.lines.map(&:chomp)
-           else
-             raise "Unknown extension"
-           end
-
-  buffer.push(*result)
-end
-
-domains.map!(&:downcase)
-domains.uniq!
-domains.sort!
-
-File.open("./data/disposable.json", "w") do |file|
-  file << JSON.pretty_generate(domains)
-end

data/bin/sync-tld

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "open-uri"
-require "json"
-
-tlds = URI.open("https://data.iana.org/TLD/tlds-alpha-by-domain.txt").read.lines
-tlds.shift # remove update notice
-
-tlds.map!(&:downcase)
-tlds.map!(&:strip)
-tlds.sort!
-tlds.uniq!
-
-File.open("./data/tld.json", "w") do |file|
-  file << JSON.pretty_generate(tlds)
-end