validators 3.1.1 → 3.2.0

data/data/tld.json

@@ -1437,6 +1437,7 @@
   "xn--mgbbh1a71e",
   "xn--mgbc0a9azcg",
   "xn--mgbca7dzdo",
+  "xn--mgbcpq6gpa1a",
   "xn--mgberp4a5d4ar",
   "xn--mgbgu82a",
   "xn--mgbi4ecexp",
@@ -1462,6 +1463,7 @@
   "xn--pbt977c",
   "xn--pgbs0dh",
   "xn--pssy2u",
+  "xn--q7ce6a",
   "xn--q9jyb4c",
   "xn--qcka1pmc",
   "xn--qxa6a",

data/lib/validators.rb

@@ -8,7 +8,7 @@ module Validators
   require "validators/tld"
   require "validators/hostname"
   require "validators/disposable_hostnames"
-  require "validators/reserved_hostnames"
+  require "validators/reserved_subdomains"
 
   require "validators/validates_datetime"
   require "validators/validates_ip_address"
@@ -20,8 +20,8 @@ module Validators
   require "validators/validates_ssh_private_key"
   require "validators/validates_ssh_public_key"
   require "validators/validates_hostname_format_of"
-  require "validators/validates_reserved_hostname"
-  require "validators/validates_reserved_username"
+  require "validators/validates_subdomain"
+  require "validators/validates_username"
 
   I18n.load_path += Dir[File.join(__dir__, "validators/locale/*.yml")]
 end

data/lib/validators/locale/en.yml

@@ -20,8 +20,10 @@ en:
         invalid_ssh_private_key_type: "must be a %{value} key"
         invalid_ssh_public_key: "is not a valid public SSH key"
         invalid_url: "is not a valid address"
-        reserved_hostname: "%{value} is a reserved hostname"
+        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/{reserved_hostnames.rb → reserved_subdomains.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Validators
-  class ReservedHostnames
-    FILE_PATH = File.expand_path("../../data/reserved_hostnames.json", __dir__)
+  class ReservedSubdomains
+    FILE_PATH = File.expand_path("../../data/reserved_subdomains.json", __dir__)
 
     def self.reserved?(hostname, matchers = nil)
       matchers = parse_list(matchers) if matchers

data/lib/validators/validates_subdomain.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module ActiveModel
+  module Validations
+    class SubdomainValidator < EachValidator
+      def validate_each(record, attribute, value)
+        return if value.blank? && options[:allow_blank]
+        return if value.nil? && options[:allow_nil]
+
+        validate_reserved_subdomain(record, attribute, value)
+        validate_format(record, attribute, value)
+      end
+
+      def reserved?(subdomain)
+        ::Validators::ReservedSubdomains.reserved?(subdomain, options[:in])
+      end
+
+      def validate_reserved_subdomain(record, attribute, value)
+        return unless options.fetch(:reserved, true)
+        return unless reserved?(value)
+
+        record.errors.add(
+          attribute,
+          :"reserved_#{options[:error_name]}",
+          message: options[:message],
+          value: value
+        )
+      end
+
+      def validate_format(record, attribute, value)
+        return if Validators::Hostname.valid_label?(value)
+
+        record.errors.add(
+          attribute,
+          :"invalid_#{options[:error_name]}",
+          message: options[:message],
+          value: value
+        )
+      end
+    end
+
+    module ClassMethods
+      # Validates whether or not the specified host label is valid.
+      # The `in: array` can have strings and patterns. A pattern is everything
+      # that starts with `/` and will be parsed as a regular expression.
+      #
+      # Notice that subdomains will be normalized; it'll be downcased and have
+      # its underscores and hyphens stripped before validating.
+      #
+      #   class User < ActiveRecord::Base
+      #     # Validates format and rejects reserved subdomains.
+      #     validates_subdomain :subdomain
+      #
+      #     # Validates against a custom list.
+      #     validates_subdomain :subdomain, in: %w[www]
+      #
+      #     # Rejects reserved domains validation.
+      #     validates_subdomain :subdomain, reserved: false
+      #   end
+      #
+      def validates_subdomain(*attr_names)
+        options = _merge_attributes(attr_names).merge(error_name: :subdomain)
+        validates_with SubdomainValidator, options
+      end
+    end
+  end
+end

data/lib/validators/validates_username.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveModel
+  module Validations
+    class UsernameValidator < SubdomainValidator
+    end
+
+    module ClassMethods
+      def validates_username(*attr_names)
+        options = _merge_attributes(attr_names).merge(error_name: :username)
+        validates_with UsernameValidator, options
+      end
+    end
+  end
+end

data/lib/validators/version.rb

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

data/test/validators/validates_subdomain_test.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ValidatesSubdomainTest < Minitest::Test
+  test "rejects invalid subdomain" do
+    model = build_model do
+      attr_accessor :subdomain
+      validates_subdomain :subdomain
+    end
+
+    instance = model.new(subdomain: "1234")
+
+    refute instance.valid?
+    assert_includes instance.errors[:subdomain], "is invalid"
+  end
+
+  test "rejects reserved subdomain" do
+    model = build_model do
+      attr_accessor :subdomain
+      validates_subdomain :subdomain
+    end
+
+    instance = model.new(subdomain: "www")
+
+    refute instance.valid?
+    assert_includes instance.errors[:subdomain],
+                    "www is a reserved subdomain"
+  end
+
+  test "rejects reserved subdomain with pattern" do
+    model = build_model do
+      attr_accessor :subdomain
+      validates_subdomain :subdomain
+    end
+
+    instance = model.new(subdomain: "www1234")
+
+    refute instance.valid?
+  end
+
+  test "uses custom list" do
+    model = build_model do
+      attr_accessor :subdomain
+      validates_subdomain :subdomain, in: %w[nope]
+    end
+
+    instance = model.new(subdomain: "nope")
+
+    refute instance.valid?
+  end
+
+  test "ignores reserved subdomain validation" do
+    model = build_model do
+      attr_accessor :subdomain
+      validates_subdomain :subdomain, reserved: false
+    end
+
+    instance = model.new(subdomain: "www")
+
+    assert instance.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

@@ -15,19 +15,24 @@ Gem::Specification.new do |s|
 
   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 "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 "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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-02-10 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
@@ -66,6 +80,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
@@ -150,6 +178,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
@@ -195,8 +237,43 @@ files:
 - Rakefile
 - bin/sync-disposable-hostnames
 - bin/sync-tld
+- data/country_tlds.json
 - data/disposable.json
-- data/reserved_hostnames.json
+- data/disposable/10minutemail.json
+- data/disposable/1secmail.json
+- data/disposable/FGRibreau_mailchecker.json
+- data/disposable/andreis_disposable_email_domains.json
+- data/disposable/clipmails.json
+- data/disposable/cs.json
+- data/disposable/emailfake.json
+- data/disposable/fake_email_generator.json
+- data/disposable/fnando_dafe542cac13f831bbf5521a55248116.json
+- data/disposable/gmailnator.json
+- data/disposable/guerrillamail.json
+- data/disposable/ically.json
+- data/disposable/itemp.json
+- data/disposable/ivolo_disposable_email_domains.json
+- data/disposable/jespernissen_disposable_maildomain_list.json
+- data/disposable/maxmalysh_disposable_emails.json
+- data/disposable/moakt.json
+- data/disposable/receivemail.json
+- data/disposable/sneakykiwi_LeagueCreatorPublic.json
+- data/disposable/tempemail.json
+- data/disposable/tempemails.json
+- data/disposable/tempmail.json
+- data/disposable/tempmail_io.json
+- data/disposable/tempmailaddress.json
+- data/disposable/tempomail.json
+- data/disposable/tempr.json
+- data/disposable/tmail.json
+- data/disposable/wesbos_burner_email_providers.json
+- data/disposable/willwhite_freemail.json
+- data/disposable/yepmail.json
+- data/disposable_emails.json
+- data/disposable_patterns.json
+- data/disposable_raw.json
+- data/reserved_subdomains.json
+- data/sld.json
 - data/tld.json
 - lib/validators.rb
 - lib/validators/constants.rb
@@ -205,7 +282,7 @@ files:
 - 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 +291,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,15 +319,15 @@ 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:
@@ -298,12 +375,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