validators 2.7.0 → 2.8.0

data/data/tld.json

@@ -165,7 +165,6 @@
   "boo",
   "book",
   "booking",
-  "boots",
   "bosch",
   "bostik",
   "boston",

data/lib/validators/constants.rb

@@ -1,5 +1,6 @@
 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
 
   # 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

@@ -18,7 +18,7 @@ module Validators
     end
 
     def self.valid_label?(label)
-      !label.start_with?('-') &&
+      !label.start_with?("-") &&
       !label.match(/\A\d+\z/) &&
       label.match(/\A[a-z0-9-]{1,63}\z/i)
     end

data/lib/validators/validates_cnpj_format_of.rb

@@ -4,11 +4,12 @@ module ActiveModel
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
+        return if CNPJ.valid?(value)
 
         record.errors.add(attribute, :invalid_cnpj,
           message: options[:message],
           value: value
-        ) unless CNPJ.valid?(value)
+        )
       end
     end
 

data/lib/validators/validates_cpf_format_of.rb

@@ -4,11 +4,12 @@ module ActiveModel
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
+        return if CPF.valid?(value)
 
         record.errors.add(attribute, :invalid_cpf,
           message: options[:message],
           value: value
-        ) unless CPF.valid?(value)
+        )
       end
     end
 

data/lib/validators/validates_datetime.rb

@@ -10,8 +10,11 @@ module ActiveModel
         return if value.nil? && options[:allow_nil]
 
         unless date?(value)
-          record.errors.add(attribute, :invalid_date,
-            :message => options[:message], :value => value
+          record.errors.add(
+            attribute,
+            :invalid_date,
+            message: options[:message],
+            value: value
           )
         end
 
@@ -50,11 +53,15 @@ module ActiveModel
 
         date, value = date_for(record, value, options[:after])
 
-        record.errors.add(attribute, :invalid_date_after, {
-          :message => options[:after_message],
-          :value   => value,
-          :date    => (date?(date) ? I18n.l(date) : date.inspect)
-        }) unless value.present? && date.present? && (value && date && value > date)
+        return if value.present? && date.present? && (value && date && value > date)
+
+        record.errors.add(
+          attribute,
+          :invalid_date_after,
+          message: options[:after_message],
+          value: value,
+          date: (date?(date) ? I18n.l(date) : date.inspect)
+        )
       end
 
       def validate_before_option(record, attribute, value)
@@ -62,11 +69,15 @@ module ActiveModel
 
         date, value = date_for(record, value, options[:before])
 
-        record.errors.add(attribute, :invalid_date_before, {
-          :message => options[:before_message],
-          :value   => value,
-          :date    => I18n.l(date)
-        }) unless value.present? && date.present? && (value && date && value < date)
+        return if value.present? && date.present? && (value && date && value < date)
+
+        record.errors.add(
+          attribute,
+          :invalid_date_before,
+          message: options[:before_message],
+          value: value,
+          date: I18n.l(date)
+        )
       end
     end
 
@@ -79,12 +90,12 @@ module ActiveModel
       #
       # Other usages:
       #
-      #   validates_datetime :starts_at, :after => 2.years.ago
-      #   validates_datetime :starts_at, :before => 2.years.ago
-      #   validates_datetime :starts_at, :before => :today
-      #   validates_datetime :starts_at, :before => :now
-      #   validates_datetime :starts_at, :before => :ends_at
-      #   validates_datetime :ends_at, :after => :starts_at
+      #   validates_datetime :starts_at, after: 2.years.ago
+      #   validates_datetime :starts_at, before: 2.years.ago
+      #   validates_datetime :starts_at, before: :today
+      #   validates_datetime :starts_at, before: :now
+      #   validates_datetime :starts_at, before: :ends_at
+      #   validates_datetime :ends_at, after: :starts_at
       #
       def validates_datetime(*attr_names)
         validates_with DatetimeValidator, _merge_attributes(attr_names)

data/lib/validators/validates_email_format_of.rb

@@ -1,6 +1,8 @@
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
+      AT_SIGN = "@".freeze
+
       def validate_each(record, attribute, value)
         allow_disposable = options.fetch(:disposable, false)
         check_tld = options.fetch(:tld, false)
@@ -14,18 +16,19 @@ module ActiveModel
       end
 
       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
-          )
-        end
+        return if value.to_s =~ Validators::EMAIL_FORMAT
+        return if value.to_s =~ Validators::MICROSOFT_EMAIL_FORMAT
+
+        record.errors.add(
+          attribute,
+          :invalid_email,
+          message: options[:message],
+          value: value
+        )
       end
 
       def validate_tld(record, attribute, value, options)
-        host = value.to_s.split("@").last
+        host = value.to_s.split(AT_SIGN).last
         return if Validators::TLD.host_with_valid_tld?(host)
 
         record.errors.add(
@@ -37,12 +40,15 @@ module ActiveModel
       end
 
       def validate_disposable_email(record, attribute, value, options)
-        hostname = value.to_s.split("@").last.to_s.downcase
+        hostname = value.to_s.split(AT_SIGN).last.to_s.downcase
+
+        return unless Validators::DisposableHostnames.all.include?(hostname)
 
         record.errors.add(
-          attribute, :disposable_email,
-          :value => value
-        ) if Validators::DisposableHostnames.all.include?(hostname)
+          attribute,
+          :disposable_email,
+          value: value
+        )
       end
     end
 

data/lib/validators/validates_ip_address.rb

@@ -19,16 +19,20 @@ module ActiveModel
           scope = :invalid_ip_address
         end
 
-        unless valid
-          record.errors.add(
-            attribute, scope,
-            :message => options[:message], :value => value
-          )
-        end
+        return if valid
+
+        record.errors.add(
+          attribute, scope,
+          message: options[:message],
+          value: value
+        )
       end
 
       def check_validity!
-        raise ArgumentError, ":only accepts a symbol that can be either :v6 or :v4" if options.key?(:only) && ![:v4, :v6].include?(options[:only])
+        return unless options.key?(:only)
+        return if [:v4, :v6].include?(options[:only])
+
+        raise ArgumentError, ":only accepts a symbol that can be either :v6 or :v4"
       end
     end
 
@@ -36,8 +40,8 @@ module ActiveModel
       # Validates whether or not the specified URL is valid.
       #
       #   validates_ip_address :ip  #=> accepts both v4 and v6
-      #   validates_ip_address :ip, :only => :v4
-      #   validates_ip_address :ip, :only => :v6
+      #   validates_ip_address :ip, only: :v4
+      #   validates_ip_address :ip, only: :v6
       #
       def validates_ip_address(*attr_names)
         validates_with IpAddressValidator, _merge_attributes(attr_names)

data/lib/validators/validates_ownership_of.rb

@@ -5,12 +5,14 @@ module ActiveModel
         owner = record.send(options[:with])
         actual_owner = value ? value.send(options[:with]) : nil
 
-        if value && owner != actual_owner
-          record.errors.add(
-            attribute, :invalid_owner,
-            :message => options[:message]
-          )
-        end
+        return unless value
+        return if owner == actual_owner
+
+        record.errors.add(
+          attribute,
+          :invalid_owner,
+          message: options[:message]
+        )
       end
 
       def check_validity!
@@ -26,7 +28,7 @@ module ActiveModel
       #     belongs_to :user
       #     belongs_to :category
       #
-      #     validates_ownership_of :category, :with => :user
+      #     validates_ownership_of :category, with: :user
       #   end
       #
       #   user = User.find(1)
@@ -35,11 +37,11 @@ module ActiveModel
       #   user_category = user.categories.first
       #   another_user_category = another_user.categories.first
       #
-      #   task = user.tasks.create(:category => user_category)
+      #   task = user.tasks.create(category: user_category)
       #   task.valid?
       #   #=> true
       #
-      #   task = user.tasks.create(:category => another_user_category)
+      #   task = user.tasks.create(category: another_user_category)
       #   task.valid?
       #   #=> false
       #

data/lib/validators/validates_ssh_private_key.rb

@@ -9,7 +9,9 @@ module ActiveModel
         validate_type(record, attribute, sshkey)
         validate_bits(record, attribute, sshkey)
       rescue OpenSSL::PKey::DSAError, OpenSSL::PKey::RSAError
-        record.errors.add(attribute, :invalid_ssh_private_key,
+        record.errors.add(
+          attribute,
+          :invalid_ssh_private_key,
           message: options[:message],
           value: value
         )
@@ -20,23 +22,29 @@ module ActiveModel
       def validate_type(record, attribute, sshkey)
         return unless options[:type]
 
-        valid = [options[:type]]
-          .flatten.compact.map(&:to_s).include?(sshkey.type)
+        valid = [options[:type]].flatten.compact.map(&:to_s).include?(sshkey.type)
 
-        record.errors.add(attribute, :invalid_ssh_private_key_type,
+        return if valid
+
+        record.errors.add(
+          attribute,
+          :invalid_ssh_private_key_type,
           message: options[:message],
           value: (%w[rsa dsa] - [sshkey.type])[0].upcase
-        ) unless valid
+        )
       end
 
       def validate_bits(record, attribute, sshkey)
         return unless options[:bits]
+        return if sshkey.bits >= options[:bits].to_i
 
-        record.errors.add(attribute, :invalid_ssh_private_key_bits,
+        record.errors.add(
+          attribute,
+          :invalid_ssh_private_key_bits,
           message: options[:message],
           value: sshkey.bits,
           required: options[:bits]
-        ) unless sshkey.bits >= options[:bits].to_i
+        )
       end
     end
 

data/lib/validators/validates_ssh_public_key.rb

@@ -4,11 +4,14 @@ module ActiveModel
       def validate_each(record, attribute, value)
         return if value.blank? && options[:allow_blank]
         return if value.nil? && options[:allow_nil]
+        return if SSHKey.valid_ssh_public_key?(value)
 
-        record.errors.add(attribute, :invalid_ssh_public_key,
+        record.errors.add(
+          attribute,
+          :invalid_ssh_public_key,
           message: options[:message],
           value: value
-        ) unless SSHKey.valid_ssh_public_key?(value)
+        )
       end
     end
 

data/lib/validators/validates_url_format_of.rb

@@ -6,9 +6,11 @@ module ActiveModel
         return if value.nil? && options[:allow_nil]
         return if url?(value.to_s)
 
-        record.errors.add(attribute, :invalid_url,
-          :message => options[:message],
-          :value => value
+        record.errors.add(
+          attribute,
+          :invalid_url,
+          message: options[:message],
+          value: value
         )
       end
 

data/lib/validators/version.rb

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

data/test/schema.rb

@@ -1,4 +1,4 @@
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(version: 0) do
   create_table :users do |t|
     t.string :email, :corporate_email, :url
     t.datetime :registered_at, :starts_at, :ends_at

data/test/support/emails.rb

@@ -1,40 +1,50 @@
 INVALID_EMAILS = [
-  'invalid@example-com',
+  "invalid@example-com",
   # period can not start local part
-  '.invalid@example.com',
+  ".invalid@example.com",
   # period can not end local part
-  'invalid.@example.com',
+  "invalid.@example.com",
   # period can not appear twice consecutively in local part
-  'invali..d@example.com',
+  "invali..d@example.com",
   # should not allow underscores in domain names
-  'invalid@ex_mple.com',
-  'invalid@example.com.',
-  'invalid@example.com_',
-  'invalid@example.com-',
-  'invalid-example.com',
-  'invalid@example.b#r.com',
-  'invalid@example.c',
-  'invali d@example.com',
-  'invalidexample.com',
-  'invalid@example.',
+  "invalid@ex_mple.com",
+  "invalid@example.com.",
+  "invalid@example.com_",
+  "invalid@example.com-",
+  "invalid-example.com",
+  "invalid@example.b#r.com",
+  "invalid@example.c",
+  "invali d@example.com",
+  "invalidexample.com",
+  "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',
   'Abc\@def+@example.com',
-  'Joe.\\Blow@example.com'
+  'Joe.\\Blow@example.com',
+  'invalid.@hotmail.com',
+  'invalid.@outlook.com',
 ]
 
 VALID_EMAILS = [
-  'valid@somedomain.com',
-  'Valid@test.somedomain.com',
-  'valid+valid123@test.somedomain.com',
-  'valid_valid123@test.somedomain.com',
-  'valid-valid+123@test.somedomain.co.uk',
-  'valid-valid+1.23@test.somedomain.com.au',
-  'valid@somedomain.co.uk',
-  'v@somedomain.com',
-  'valid@somedomain.ca',
-  'valid123.456@somedomain.org',
-  'valid@somedomain.mobi',
-  'valid@somedomain.info',
+  "valid@somedomain.com",
+  "Valid@test.somedomain.com",
+  "valid+valid123@test.somedomain.com",
+  "valid_valid123@test.somedomain.com",
+  "valid-valid+123@test.somedomain.co.uk",
+  "valid-valid+1.23@test.somedomain.com.au",
+  "valid@somedomain.co.uk",
+  "v@somedomain.com",
+  "valid@somedomain.ca",
+  "valid123.456@somedomain.org",
+  "valid@somedomain.mobi",
+  "valid@somedomain.info",
+  "valid-@hotmail.com",
+  "valid-@outlook.com",
+  "valid_@hotmail.com",
+  "valid_@outlook.com",
+  "valid_-_-_-_-_-_@hotmail.com",
+  "valid_-_-_-_-_-_@outlook.com",
+  "sub_total-5+8@hotmail.com",
+  "sub_total-5+8@outlook.com",
 ]

data/test/support/models.rb

@@ -28,7 +28,7 @@ class UserWithTLD
   validates_url_format_of :url, tld: true
 
   def self.name
-    'User'
+    "User"
   end
 
   def initialize(url)

data/test/support/urls.rb

@@ -1,29 +1,29 @@
 # encoding: utf-8
 VALID_URLS = [
-  'http://example.com',
-  'http://example.com/',
-  'http://www.example.com/',
-  'http://sub.domain.example.com/',
-  'http://bbc.co.uk',
-  'http://example.com?foo',
-  'http://example.com?url=http://example.com',
-  'http://example.com:8000',
-  'http://www.sub.example.com/page.html?foo=bar&baz=%23#anchor',
-  'http://user:pass@example.com',
-  'http://user:@example.com',
-  'http://example.com/~user',
-  'http://example.museum',
-  'http://1.0.255.249',
-  '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://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.com./foo'
+  "http://example.com",
+  "http://example.com/",
+  "http://www.example.com/",
+  "http://sub.domain.example.com/",
+  "http://bbc.co.uk",
+  "http://example.com?foo",
+  "http://example.com?url=http://example.com",
+  "http://example.com:8000",
+  "http://www.sub.example.com/page.html?foo=bar&baz=%23#anchor",
+  "http://user:pass@example.com",
+  "http://user:@example.com",
+  "http://example.com/~user",
+  "http://example.museum",
+  "http://1.0.255.249",
+  "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://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.com./foo"
 ]
 
 INVALID_URLS = [
@@ -31,13 +31,13 @@ INVALID_URLS = [
   "www.example.com",
   "http://ex ample.com",
   "http://example.com/foo bar",
-  'http://256.0.0.1',
-  'http://u:u:u@example.com',
-  'http://r?ksmorgas.com',
+  "http://256.0.0.1",
+  "http://u:u:u@example.com",
+  "http://r?ksmorgas.com",
 
   # These can all be valid local URLs, but should not be considered valid
   # for public consumption.
   "http://example",
   "http://example.c",
-  'http://example.toolongtld'
+  "http://example.toolongtld"
 ]

data/test/validators/validates_datetime/after_option_test.rb

@@ -5,7 +5,7 @@ class ValidatesDatetimeAfterOptionTest < Minitest::Test
 
   test "rejects when date is set to before :after option" do
     future_date = 1.week.from_now
-    User.validates_datetime :registered_at, :after => future_date
+    User.validates_datetime :registered_at, after: future_date
     user.registered_at = Time.now
 
     refute user.valid?
@@ -13,14 +13,14 @@ class ValidatesDatetimeAfterOptionTest < Minitest::Test
   end
 
   test "accepts when date is set accordingly to the :after option" do
-    User.validates_datetime :registered_at, :after => 1.week.from_now
+    User.validates_datetime :registered_at, after: 1.week.from_now
     user.registered_at = 2.weeks.from_now
 
     assert user.valid?
   end
 
   test "validates using today as date" do
-    User.validates_datetime :registered_at, :after => :today
+    User.validates_datetime :registered_at, after: :today
 
     user.registered_at = Time.now
     refute user.valid?
@@ -36,7 +36,7 @@ class ValidatesDatetimeAfterOptionTest < Minitest::Test
   end
 
   test "validates using now as date" do
-    User.validates_datetime :registered_at, :after => :now
+    User.validates_datetime :registered_at, after: :now
 
     user.registered_at = Time.now
     refute user.valid?
@@ -53,7 +53,7 @@ class ValidatesDatetimeAfterOptionTest < Minitest::Test
 
   test "validates using method as date" do
     User.validates_datetime :starts_at
-    User.validates_datetime :ends_at, :after => :starts_at, :if => :starts_at?
+    User.validates_datetime :ends_at, after: :starts_at, if: :starts_at?
 
     user.starts_at = nil
     user.ends_at = Time.now

data/test/validators/validates_datetime/before_option_test.rb

@@ -7,7 +7,7 @@ class ValidatesDatetimeBeforeOptionTest < Minitest::Test
     week_ago = 1.week.ago
     now = Time.now
 
-    User.validates_datetime :registered_at, :before => week_ago
+    User.validates_datetime :registered_at, before: week_ago
     user.registered_at = now
 
     refute user.valid?
@@ -15,7 +15,7 @@ class ValidatesDatetimeBeforeOptionTest < Minitest::Test
   end
 
   test "accepts when date is set accordingly to the :before option" do
-    User.validates_datetime :registered_at, :before => 1.week.ago
+    User.validates_datetime :registered_at, before: 1.week.ago
     user.registered_at = 2.weeks.ago
 
     assert user.valid?

data/test/validators/validates_datetime/defaults_test.rb

@@ -5,7 +5,7 @@ class ValidatesDatetimeDefaultsTest < Minitest::Test
 
   setup do
     User.validates_datetime :registered_at
-    User.validates :birthday, :datetime => true
+    User.validates :birthday, datetime: true
   end
 
   VALID_DATES.each do |date|