validators 2.8.1 → 3.0.0

data/data/tld.json

@@ -15,7 +15,6 @@
   "accountant",
   "accountants",
   "aco",
-  "active",
   "actor",
   "ad",
   "adac",
@@ -145,7 +144,6 @@
   "bj",
   "black",
   "blackfriday",
-  "blanco",
   "blockbuster",
   "blog",
   "bloomberg",
@@ -391,7 +389,6 @@
   "engineer",
   "engineering",
   "enterprises",
-  "epost",
   "epson",
   "equipment",
   "er",
@@ -1151,13 +1148,13 @@
   "sony",
   "soy",
   "space",
-  "spiegel",
   "sport",
   "spot",
   "spreadbetting",
   "sr",
   "srl",
   "srt",
+  "ss",
   "st",
   "stada",
   "staples",
@@ -1451,6 +1448,7 @@
   "xn--mgbaakc7dvf",
   "xn--mgbaam7a8h",
   "xn--mgbab2bd",
+  "xn--mgbah1a3hjkrd",
   "xn--mgbai9azgqp6j",
   "xn--mgbayh7gpa",
   "xn--mgbb9fbpob",
@@ -1529,7 +1527,6 @@
   "zara",
   "zero",
   "zip",
-  "zippo",
   "zm",
   "zone",
   "zuerich",

data/lib/validators/constants.rb

@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 module Validators
-  EMAIL_FORMAT = /\A[a-z0-9]+([-._][a-z0-9]+)*(\+[^@]+)?@[a-z0-9]+([.-][a-z0-9]+)*\.[a-z]{2,}\z/i
-  MICROSOFT_EMAIL_FORMAT = /\A[\w][\w\d._-]*[\w\d_-]+(\+[\w\d]+)?@(hotmail|outlook).com\z/i
+  EMAIL_FORMAT = /\A[a-z0-9]+([-._][a-z0-9]+)*(\+[^@]+)?@[a-z0-9]+([.-][a-z0-9]+)*\.[a-z]{2,}\z/i.freeze
+  MICROSOFT_EMAIL_FORMAT = /\A[\w][\w\d._-]*[\w\d_-]+(\+[\w\d]+)?@(hotmail|outlook).com\z/i.freeze
 
   # 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
+  IPV4_PART = /\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]/.freeze # 0-255
 
   URL_FORMAT = %r[
     \A
     https?://                                                    # http:// or https://
     ([^\s:@]+:[^\s:@]*@)?                                        # optional username:pw@
     ( (([^\W_]+\.)*xn--)?[^\W_]+([-.][^\W_]+)*\.[a-z]{2,6}\.? |  # domain (including Punycode/IDN)...
-        #{IPv4_PART}(\.#{IPv4_PART}){3} )                        # or IPv4
+        #{IPV4_PART}(\.#{IPV4_PART}){3} )                        # or IPv4
     (:\d{1,5})?                                                  # optional port
     ([/?]\S*)?                                                   # optional /whatever or ?whatever
     \z
-  ]ixs
+  ]ixs.freeze
 
   URL_FORMAT_WITHOUT_TLD_VALIDATION = %r[
     \A
     https?://                                                    # http:// or https://
     ([^\s:@]+:[^\s:@]*@)?                                        # optional username:pw@
     ( (([^\W_]+\.)*xn--)?[^\W_]+([-.][^\W_]+)*\..{2,}\.? |       # domain (including Punycode/IDN)...
-        #{IPv4_PART}(\.#{IPv4_PART}){3} )                        # or IPv4
+        #{IPV4_PART}(\.#{IPV4_PART}){3} )                        # or IPv4
     (:\d{1,5})?                                                  # optional port
     ([/?]\S*)?                                                   # optional /whatever or ?whatever
     \z
-  ]ixs
+  ]ixs.freeze
 end

data/lib/validators/disposable_hostnames.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Validators
   class DisposableHostnames
-    FILE_PATH = File.expand_path("../../../data/disposable.json", __FILE__)
+    FILE_PATH = File.expand_path("../../data/disposable.json", __dir__)
 
     def self.all
-      @tld ||= JSON.load(File.read(FILE_PATH))
+      @all ||= JSON.parse(File.read(FILE_PATH))
     end
   end
 end

data/lib/validators/hostname.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Validators
   class Hostname
     def self.valid?(host)
@@ -5,22 +7,22 @@ module Validators
       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)
+        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)
+        !label.match(/\A\d+\z/) &&
+        label.match(/\A[a-z0-9-]{1,63}\z/i)
     end
   end
 end

data/lib/validators/ip.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module Validators
   module Ip
-    extend self
-
     # Extracted from Ruby 1.8.7
     def v4?(addr)
       matches = addr.match(/\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/)
-      matches && matches.captures.all? {|i| i.to_i < 256}
+      matches&.captures&.all? {|i| i.to_i < 256 }
     end
 
     # Extracted from Ruby 1.8.7
@@ -25,5 +25,9 @@ module Validators
     def valid?(addr)
       v4?(addr) || v6?(addr)
     end
+
+    module_function :v4?
+    module_function :v6?
+    module_function :valid?
   end
 end

data/lib/validators/tld.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module Validators
   class TLD
-    FILE_PATH = File.expand_path("../../../data/tld.json", __FILE__)
+    FILE_PATH = File.expand_path("../../data/tld.json", __dir__)
 
     def self.all
-      @tld ||= JSON.load(File.read(FILE_PATH))
+      @all ||= JSON.parse(File.read(FILE_PATH))
     end
 
     def self.host_with_valid_tld?(host)
       return false if host.split(".").size == 1
+
       valid? host[/\.([^.]+)$/, 1].to_s.downcase
     end
 

data/lib/validators/validates_cnpj_format_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class CnpjValidator < EachValidator
@@ -6,7 +8,9 @@ module ActiveModel
         return if value.nil? && options[:allow_nil]
         return if CNPJ.valid?(value)
 
-        record.errors.add(attribute, :invalid_cnpj,
+        record.errors.add(
+          attribute,
+          :invalid_cnpj,
           message: options[:message],
           value: value
         )
@@ -24,7 +28,7 @@ module ActiveModel
         require "cnpj"
         validates_with CnpjValidator, _merge_attributes(attr_names)
       rescue LoadError
-        fail "cpf_cnpj is not part of the bundle. Add it to Gemfile."
+        raise "cpf_cnpj is not part of the bundle. Add it to Gemfile."
       end
 
       alias_method :validates_cnpj, :validates_cnpj_format_of

data/lib/validators/validates_cpf_format_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class CpfValidator < EachValidator
@@ -6,7 +8,9 @@ module ActiveModel
         return if value.nil? && options[:allow_nil]
         return if CPF.valid?(value)
 
-        record.errors.add(attribute, :invalid_cpf,
+        record.errors.add(
+          attribute,
+          :invalid_cpf,
           message: options[:message],
           value: value
         )
@@ -24,7 +28,7 @@ module ActiveModel
         require "cpf"
         validates_with CpfValidator, _merge_attributes(attr_names)
       rescue LoadError
-        fail "cpf_cnpj is not part of the bundle. Add it to Gemfile."
+        raise "cpf_cnpj is not part of the bundle. Add it to Gemfile."
       end
 
       alias_method :validates_cpf, :validates_cpf_format_of

data/lib/validators/validates_datetime.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class DatetimeValidator < EachValidator
       def date?(value)
-        value.kind_of?(Date) || value.kind_of?(Time)
+        value.is_a?(Date) || value.is_a?(Time)
       end
 
       def validate_each(record, attribute, value)
@@ -18,37 +20,36 @@ module ActiveModel
           )
         end
 
-        if date?(value)
-          validate_after_option(record, attribute, value)
-          validate_before_option(record, attribute, value)
-        end
+        return unless date?(value)
+
+        validate_after_option(record, attribute, value)
+        validate_before_option(record, attribute, value)
       end
 
-      private
-      def date_for(record, value, option)
+      private def date_for(record, value, option)
         date = case option
-        when :today
-          Date.today
-        when :now
-          Time.now
-        when Time, Date, DateTime, ActiveSupport::TimeWithZone
-          option
-        when Proc
-          option.call(record)
-        else
-          record.__send__(option) if record.respond_to?(option)
-        end
+               when :today
+                 Date.today
+               when :now
+                 Time.now
+               when Time, Date, DateTime, ActiveSupport::TimeWithZone
+                 option
+               when Proc
+                 option.call(record)
+               else
+                 record.__send__(option) if record.respond_to?(option)
+               end
 
-        if date.kind_of?(Time)
+        if date.is_a?(Time)
           value = value.to_time
-        elsif date.kind_of?(Date)
+        elsif date.is_a?(Date)
           value = value.to_date
         end
 
         [date, value]
       end
 
-      def validate_after_option(record, attribute, value)
+      private def validate_after_option(record, attribute, value)
         return unless options[:after]
 
         date, value = date_for(record, value, options[:after])
@@ -64,7 +65,7 @@ module ActiveModel
         )
       end
 
-      def validate_before_option(record, attribute, value)
+      private def validate_before_option(record, attribute, value)
         return unless options[:before]
 
         date, value = date_for(record, value, options[:before])

data/lib/validators/validates_email_format_of.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
-      AT_SIGN = "@".freeze
+      AT_SIGN = "@"
 
       def validate_each(record, attribute, value)
         allow_disposable = options.fetch(:disposable, false)
@@ -39,7 +41,7 @@ module ActiveModel
         )
       end
 
-      def validate_disposable_email(record, attribute, value, options)
+      def validate_disposable_email(record, attribute, value, _options)
         hostname = value.to_s.split(AT_SIGN).last.to_s.downcase
 
         return unless Validators::DisposableHostnames.all.include?(hostname)

data/lib/validators/validates_hostname_format_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class HostnameValidator < EachValidator

data/lib/validators/validates_ip_address.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class IpAddressValidator < EachValidator
+      PROTOCOL_OPTIONS = %i[v4 v6].freeze
+
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
@@ -30,7 +34,7 @@ module ActiveModel
 
       def check_validity!
         return unless options.key?(:only)
-        return if [:v4, :v6].include?(options[:only])
+        return if PROTOCOL_OPTIONS.include?(options[:only])
 
         raise ArgumentError, ":only accepts a symbol that can be either :v6 or :v4"
       end

data/lib/validators/validates_ownership_of.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class OwnershipValidator < EachValidator
+      WITH_OPTIONS = %w[String Symbol].freeze
+
       def validate_each(record, attribute, value)
         owner = record.send(options[:with])
         actual_owner = value ? value.send(options[:with]) : nil
@@ -17,7 +21,7 @@ module ActiveModel
 
       def check_validity!
         raise ArgumentError, ":with is required" unless options.key?(:with)
-        raise ArgumentError, ":with option must be a string or a symbol" unless ["String", "Symbol"].include?(options[:with].class.name)
+        raise ArgumentError, ":with option must be a string or a symbol" unless WITH_OPTIONS.include?(options[:with].class.name)
       end
     end
 

data/lib/validators/validates_ssh_private_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class SshPrivateKeyValidator < EachValidator
@@ -17,9 +19,7 @@ module ActiveModel
         )
       end
 
-      private
-
-      def validate_type(record, attribute, sshkey)
+      private def validate_type(record, attribute, sshkey)
         return unless options[:type]
 
         valid = [options[:type]].flatten.compact.map(&:to_s).include?(sshkey.type)
@@ -34,7 +34,7 @@ module ActiveModel
         )
       end
 
-      def validate_bits(record, attribute, sshkey)
+      private def validate_bits(record, attribute, sshkey)
         return unless options[:bits]
         return if sshkey.bits >= options[:bits].to_i
 
@@ -59,7 +59,7 @@ module ActiveModel
         require "sshkey"
         validates_with SshPrivateKeyValidator, _merge_attributes(attr_names)
       rescue LoadError
-        fail "sshkey is not part of the bundle. Add it to Gemfile."
+        raise "sshkey is not part of the bundle. Add it to Gemfile."
       end
     end
   end

data/lib/validators/validates_ssh_public_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class SshPublicKeyValidator < EachValidator
@@ -26,7 +28,7 @@ module ActiveModel
         require "sshkey"
         validates_with SshPublicKeyValidator, _merge_attributes(attr_names)
       rescue LoadError
-        fail "sshkey is not part of the bundle. Add it to Gemfile."
+        raise "sshkey is not part of the bundle. Add it to Gemfile."
       end
     end
   end

data/lib/validators/validates_url_format_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class UrlValidator < EachValidator
@@ -16,18 +18,22 @@ module ActiveModel
 
       def url?(url)
         uri = URI(url)
-        regex = options[:tld] ? Validators::URL_FORMAT_WITHOUT_TLD_VALIDATION :
-                                Validators::URL_FORMAT
+        regex = if options[:tld]
+                  Validators::URL_FORMAT_WITHOUT_TLD_VALIDATION
+                else
+                  Validators::URL_FORMAT
+                end
 
-        uri.kind_of?(URI::HTTP) &&
-        url.match(regex) &&
-        valid_tld?(uri.host)
+        uri.is_a?(URI::HTTP) &&
+          url.match(regex) &&
+          valid_tld?(uri.host)
       rescue URI::InvalidURIError
         false
       end
 
       def valid_tld?(host)
         return true unless options[:tld]
+
         Validators::TLD.host_with_valid_tld?(host)
       end
     end

data/lib/validators/version.rb

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

data/lib/validators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "json"
 
 module Validators

data/test/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define(version: 0) do
   create_table :users do |t|
     t.string :email, :corporate_email, :url

data/test/support/dates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 VALID_DATES = [
   "2010-04-26",
   "2010-04-26 23:59:00",
@@ -9,11 +11,11 @@ VALID_DATES = [
   Date.today,
   DateTime.now,
   Time.zone.now
-]
+].freeze
 
 INVALID_DATES = [
   "invalid",
   nil,
   "",
   "4/26"
-]
+].freeze

data/test/support/emails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 INVALID_EMAILS = [
   "invalid@example-com",
   # period can not start local part
@@ -19,12 +21,12 @@ INVALID_EMAILS = [
   "invalid@example.",
   # from http://tools.ietf.org/html/rfc3696, page 5
   # corrected in http://www.rfc-editor.org/errata_search.php?rfc=3696
-  'Fred\ Bloggs_@example.com',
+  "Fred\ Bloggs_@example.com",
   'Abc\@def+@example.com',
   'Joe.\\Blow@example.com',
-  'invalid.@hotmail.com',
-  'invalid.@outlook.com',
-]
+  "invalid.@hotmail.com",
+  "invalid.@outlook.com"
+].freeze
 
 VALID_EMAILS = [
   "valid@somedomain.com",
@@ -46,5 +48,5 @@ VALID_EMAILS = [
   "valid_-_-_-_-_-_@hotmail.com",
   "valid_-_-_-_-_-_@outlook.com",
   "sub_total-5+8@hotmail.com",
-  "sub_total-5+8@outlook.com",
-]
+  "sub_total-5+8@outlook.com"
+].freeze

data/test/support/hostnames.rb

@@ -1,4 +1,6 @@
-VALID_HOSTNAMES = %W[
+# frozen_string_literal: true
+
+VALID_HOSTNAMES = %w[
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com
   a-b.com
@@ -7,12 +9,12 @@ VALID_HOSTNAMES = %W[
   123a.com
   ABC123.com
   123ABC.com
-]
+].freeze
 
 INVALID_HOSTNAMES = %W[
   192.168.42.42
   a..com
-  #{'a'*64}.com
+  #{'a' * 64}.com
   http://example.com
   https://example.com
   example.com?a=1
@@ -23,4 +25,4 @@ INVALID_HOSTNAMES = %W[
   example.1234.com
   example_domain.com
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com
-]
+].freeze

data/test/support/ips.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 VALID_IPV4 = [
   "192.168.1.1",
   "64.233.163.104",
   "127.0.0.1",
   "0.0.0.0"
-]
+].freeze
 
 VALID_IPV6 = [
   "FE80:0000:0000:0000:0202:B3FF:FE1E:8329",
@@ -17,4 +19,4 @@ VALID_IPV6 = [
   "3ffe:1900:4545:3:200:f8ff:fe21:67cf",
   "fe80:0:0:0:200:f8ff:fe21:67cf",
   "fe80::200:f8ff:fe21:67cf"
-]
+].freeze

data/test/support/models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_many :tasks
   has_many :categories

data/test/support/urls.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 VALID_URLS = [
   "http://example.com",
   "http://example.com/",
@@ -17,14 +18,14 @@ VALID_URLS = [
   "http://1.2.3.4:80",
   "HttP://example.com",
   "https://example.com",
-  # "http://räksmörgås.nu",  # IDN
-  "http://xn--rksmrgs-5wao1o.nu",  # Punycode
+  # "http://räksmörgås.nu", # IDN
+  "http://xn--rksmrgs-5wao1o.nu", # Punycode
   "http://www.xn--rksmrgs-5wao1o.nu",
   "http://foo.bar.xn--rksmrgs-5wao1o.nu",
-  "http://example.xy",  # Only valid TLD
-  "http://example.com.",  # Explicit TLD root period
+  "http://example.xy", # Only valid TLD
+  "http://example.com.", # Explicit TLD root period
   "http://example.com./foo"
-]
+].freeze
 
 INVALID_URLS = [
   "url",
@@ -40,4 +41,4 @@ INVALID_URLS = [
   "http://example",
   "http://example.c",
   "http://example.toolongtld"
-]
+].freeze