validators 2.6.0 → 2.7.0

data/data/tld.json

@@ -244,7 +244,6 @@
   "chat",
   "cheap",
   "chintai",
-  "chloe",
   "christmas",
   "chrome",
   "chrysler",
@@ -538,6 +537,7 @@
   "gratis",
   "green",
   "gripe",
+  "grocery",
   "group",
   "gs",
   "gt",
@@ -594,7 +594,6 @@
   "hr",
   "hsbc",
   "ht",
-  "htc",
   "hu",
   "hughes",
   "hyatt",
@@ -745,6 +744,7 @@
   "living",
   "lixil",
   "lk",
+  "llc",
   "loan",
   "loans",
   "locker",
@@ -778,6 +778,7 @@
   "man",
   "management",
   "mango",
+  "map",
   "market",
   "marketing",
   "markets",
@@ -787,8 +788,6 @@
   "mattel",
   "mba",
   "mc",
-  "mcd",
-  "mcdonalds",
   "mckinsey",
   "md",
   "me",
@@ -801,6 +800,7 @@
   "men",
   "menu",
   "meo",
+  "merckmsd",
   "metlife",
   "mg",
   "mh",
@@ -829,7 +829,6 @@
   "monash",
   "money",
   "monster",
-  "montblanc",
   "mopar",
   "mormon",
   "mortgage",
@@ -935,7 +934,6 @@
   "ovh",
   "pa",
   "page",
-  "pamperedchef",
   "panasonic",
   "panerai",
   "paris",
@@ -953,6 +951,7 @@
   "pg",
   "ph",
   "pharmacy",
+  "phd",
   "philips",
   "phone",
   "photo",
@@ -1098,6 +1097,7 @@
   "scot",
   "sd",
   "se",
+  "search",
   "seat",
   "secure",
   "security",
@@ -1157,6 +1157,7 @@
   "soy",
   "space",
   "spiegel",
+  "sport",
   "spot",
   "spreadbetting",
   "sr",
@@ -1369,13 +1370,16 @@
   "xn--11b4c3d",
   "xn--1ck2e1b",
   "xn--1qqw23a",
+  "xn--2scrj9c",
   "xn--30rr7y",
   "xn--3bst00m",
   "xn--3ds443g",
   "xn--3e0b707e",
+  "xn--3hcrj9c",
   "xn--3oq18vl8pn36a",
   "xn--3pxu8k",
   "xn--42c2d9a",
+  "xn--45br5cyl",
   "xn--45brj9c",
   "xn--45q11c",
   "xn--4gbrim",
@@ -1429,7 +1433,9 @@
   "xn--gckr3f0f",
   "xn--gecrj9c",
   "xn--gk3at1e",
+  "xn--h2breg3eve",
   "xn--h2brj9c",
+  "xn--h2brj9c8c",
   "xn--hxt814e",
   "xn--i1b6b1a6a2e",
   "xn--imr513n",
@@ -1456,10 +1462,12 @@
   "xn--mgbai9azgqp6j",
   "xn--mgbayh7gpa",
   "xn--mgbb9fbpob",
+  "xn--mgbbh1a",
   "xn--mgbbh1a71e",
   "xn--mgbc0a9azcg",
   "xn--mgbca7dzdo",
   "xn--mgberp4a5d4ar",
+  "xn--mgbgu82a",
   "xn--mgbi4ecexp",
   "xn--mgbpl2fh",
   "xn--mgbt3dhd",
@@ -1477,6 +1485,7 @@
   "xn--nyqy26a",
   "xn--o3cw4h",
   "xn--ogbpf8fl",
+  "xn--otu796d",
   "xn--p1acf",
   "xn--p1ai",
   "xn--pbt977c",
@@ -1487,6 +1496,7 @@
   "xn--qxam",
   "xn--rhqv96g",
   "xn--rovu88b",
+  "xn--rvc1e0am3e",
   "xn--s9brj9c",
   "xn--ses554g",
   "xn--t60b56a",

data/lib/validators.rb

@@ -4,6 +4,7 @@ module Validators
   require "validators/constants"
   require "validators/ip"
   require "validators/tld"
+  require "validators/hostname"
   require "validators/disposable_hostnames"
   require "validators/validates_datetime"
   require "validators/validates_ip_address"
@@ -15,5 +16,4 @@ module Validators
   require "validators/validates_ssh_private_key"
   require "validators/validates_ssh_public_key"
   require "validators/validates_hostname_format_of"
-  require "validators/validates_subdomain_format_of"
 end

data/lib/validators/constants.rb

@@ -1,5 +1,5 @@
 module Validators
-  EMAIL_FORMAT = /\A[a-z0-9]+([-._][a-z0-9]+)*(\+[^@]+)?@[a-z0-9]+([.-][a-z0-9]+)*\.[a-z]{2,4}\z/i
+  EMAIL_FORMAT = /\A[a-z0-9]+([-._][a-z0-9]+)*(\+[^@]+)?@[a-z0-9]+([.-][a-z0-9]+)*\.[a-z]{2,}\z/i
 
   # Source: https://github.com/henrik/validates_url_format_of
   IPv4_PART = /\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]/  # 0-255

data/lib/validators/hostname.rb

@@ -0,0 +1,26 @@
+module Validators
+  class Hostname
+    def self.valid?(host)
+      host = host.to_s
+      uri = URI(host)
+
+      host.present? &&
+      uri.host.nil? &&
+      uri.scheme.nil? &&
+      uri.fragment.nil? &&
+      uri.query.nil? &&
+      uri.path == host &&
+      host.split(".").all? {|label| valid_label?(label) } &&
+      host.size <= 255 &&
+      Validators::TLD.host_with_valid_tld?(host)
+    rescue URI::InvalidURIError
+      false
+    end
+
+    def self.valid_label?(label)
+      !label.start_with?('-') &&
+      !label.match(/\A\d+\z/) &&
+      label.match(/\A[a-z0-9-]{1,63}\z/i)
+    end
+  end
+end

data/lib/validators/tld.rb

@@ -7,7 +7,7 @@ module Validators
     end
 
     def self.host_with_valid_tld?(host)
-      return false if host.split('.').size == 1
+      return false if host.split(".").size == 1
       valid? host[/\.([^.]+)$/, 1].to_s.downcase
     end
 

data/lib/validators/validates_email_format_of.rb

@@ -3,10 +3,12 @@ module ActiveModel
     class EmailValidator < EachValidator
       def validate_each(record, attribute, value)
         allow_disposable = options.fetch(:disposable, false)
+        check_tld = options.fetch(:tld, false)
 
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
 
+        validate_tld(record, attribute, value, options) if check_tld
         validate_email_format(record, attribute, value, options)
         validate_disposable_email(record, attribute, value, options) unless allow_disposable
       end
@@ -14,12 +16,26 @@ module ActiveModel
       def validate_email_format(record, attribute, value, options)
         if value.to_s !~ Validators::EMAIL_FORMAT
           record.errors.add(
-            attribute, :invalid_email,
-            :message => options[:message], :value => value
+            attribute,
+            :invalid_email,
+            message: options[:message],
+            value: value
           )
         end
       end
 
+      def validate_tld(record, attribute, value, options)
+        host = value.to_s.split("@").last
+        return if Validators::TLD.host_with_valid_tld?(host)
+
+        record.errors.add(
+          attribute,
+          :invalid_hostname,
+          message: options[:message],
+          value: value
+        )
+      end
+
       def validate_disposable_email(record, attribute, value, options)
         hostname = value.to_s.split("@").last.to_s.downcase
 

data/lib/validators/validates_hostname_format_of.rb

@@ -5,41 +5,15 @@ module ActiveModel
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
-        return if valid_hostname?(value.to_s)
+        return if Validators::Hostname.valid?(value.to_s)
 
-        record.errors.add(attribute, :invalid_hostname,
-          :message => options[:message],
-          :value => value
+        record.errors.add(
+          attribute,
+          :invalid_hostname,
+          message: options[:message],
+          value: value
         )
       end
-
-      def valid_hostname?(host)
-        host = host.to_s
-        uri = URI(host)
-
-        host.present? &&
-        uri.host.nil? &&
-        uri.scheme.nil? &&
-        uri.fragment.nil? &&
-        uri.query.nil? &&
-        uri.path == host &&
-        host.split('.').all? {|label| valid_label?(label) } &&
-        host.size <= 255 &&
-        valid_tld?(host)
-      rescue URI::InvalidURIError
-        false
-      end
-
-      def valid_label?(label)
-        !label.start_with?('-') &&
-        !label.match(/\A\d+\z/) &&
-        label.match(/\A[a-z0-9-]{1,63}\z/i)
-      end
-
-      def valid_tld?(host)
-        return true unless options[:tld]
-        Validators::TLD.host_with_valid_tld?(host)
-      end
     end
 
     module ClassMethods

data/lib/validators/version.rb

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

data/test/support/emails.rb

@@ -21,8 +21,7 @@ INVALID_EMAILS = [
   # corrected in http://www.rfc-editor.org/errata_search.php?rfc=3696
   'Fred\ Bloggs_@example.com',
   'Abc\@def+@example.com',
-  'Joe.\\Blow@example.com',
-  "invalid@invalid.invalid"
+  'Joe.\\Blow@example.com'
 ]
 
 VALID_EMAILS = [

data/test/support/models.rb

@@ -58,13 +58,13 @@ class ServerWithTLD
   end
 end
 
-class Site
+class EmailWithTLD
   include ActiveModel::Validations
-  attr_accessor :slug
+  attr_accessor :email
 
-  validates_subdomain :slug
+  validates_email :email, tld: true
 
-  def initialize(slug)
-    @slug = slug
+  def initialize(email)
+    @email = email
   end
 end

data/test/support/translations.yml

@@ -15,6 +15,7 @@ en:
         invalid_cpf: "is not a valid CPF"
         invalid_cnpj: "is not a valid CNPJ"
         disposable_email: "is not allowed (high-bounce domain)"
+        invalid_hostname: "does not have a valid hostname"
 
   activemodel:
     <<: *activerecord

data/test/validators/validates_email_format_of_test.rb

@@ -2,9 +2,9 @@ require "test_helper"
 
 class ValidatesEmailFormatOfTest < Minitest::Test
   setup do
-    User.validates_email_format_of :email, :corporate_email, :allow_blank => false
-    Buyer.validates_email_format_of :email, :message => "is not a valid e-mail"
-    Person.validates :email, :email => true
+    User.validates_email_format_of :email, :corporate_email, allow_blank: false
+    Buyer.validates_email_format_of :email, message: "is not a valid e-mail"
+    Person.validates :email, email: true
   end
 
   VALID_EMAILS.each do |email|
@@ -19,10 +19,10 @@ class ValidatesEmailFormatOfTest < Minitest::Test
 
   INVALID_EMAILS.each do |email|
     test "rejects #{email.inspect} as a valid email" do
-      user = User.new(:email => "invalid", :corporate_email => "invalid")
+      user = User.new(:email => email, :corporate_email => "invalid")
       refute user.valid?
 
-      user = Person.new(:email => "invalid")
+      user = Person.new(:email => email)
       refute user.valid?
     end
   end
@@ -73,4 +73,11 @@ class ValidatesEmailFormatOfTest < Minitest::Test
   test "defines alias method" do
     assert User.respond_to?(:validates_email)
   end
+
+  test "rejects invalid tld" do
+    user = EmailWithTLD.new(email: "john@example.zaz")
+
+    refute user.valid?
+    assert_includes user.errors[:email], "does not have a valid hostname"
+  end
 end

data/validators.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "activerecord"
   s.add_development_dependency "minitest-utils"
   s.add_development_dependency "sqlite3-ruby"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry-meta"
   s.add_development_dependency "cpf_cnpj"
   s.add_development_dependency "sshkey"
-  s.add_development_dependency "codeclimate-test-reporter"
+  s.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,6 +143,7 @@ files:
 - lib/validators.rb
 - lib/validators/constants.rb
 - lib/validators/disposable_hostnames.rb
+- lib/validators/hostname.rb
 - lib/validators/ip.rb
 - lib/validators/tld.rb
 - lib/validators/validates_cnpj_format_of.rb
@@ -154,7 +155,6 @@ files:
 - lib/validators/validates_ownership_of.rb
 - lib/validators/validates_ssh_private_key.rb
 - lib/validators/validates_ssh_public_key.rb
-- lib/validators/validates_subdomain_format_of.rb
 - lib/validators/validates_url_format_of.rb
 - lib/validators/version.rb
 - test/schema.rb
@@ -163,7 +163,6 @@ files:
 - test/support/hostnames.rb
 - test/support/ips.rb
 - test/support/models.rb
-- test/support/subdomains.rb
 - test/support/translations.yml
 - test/support/urls.rb
 - test/test_helper.rb
@@ -186,7 +185,6 @@ files:
 - 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
 - validators.gemspec
@@ -210,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.
@@ -221,7 +219,6 @@ test_files:
 - test/support/hostnames.rb
 - test/support/ips.rb
 - test/support/models.rb
-- test/support/subdomains.rb
 - test/support/translations.yml
 - test/support/urls.rb
 - test/test_helper.rb
@@ -244,6 +241,5 @@ test_files:
 - 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