active_validation 3.0.0 → 4.0.0

data/lib/active_validation/validators/ip_validator.rb

@@ -2,15 +2,18 @@ class IpValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.ip"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.ip'))
     end
   end
 
   private
 
+  # rubocop:disable Metrics/LineLength
   def valid_format?(value)
     value =~ /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
   end
+  # rubocop:enable Metrics/LineLength
 
   def valid_length?(value)
     value.present?

data/lib/active_validation/validators/isbn_validator.rb

@@ -2,19 +2,20 @@ class IsbnValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.isbn"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.isbn'))
     end
   end
 
   private
 
-  CHARS_VALUES = ["0", "1", "2" , "3", "4", "5", "6", "7", "8", "9", "0", "x"]
+  CHARS_VALUES = %w(0 1 2 3 4 5 6 7 8 9 0 x).freeze
 
   def valid_format?(value)
     return(false) if value.empty?
-    value = value.gsub(/-| /, "").downcase.chars
+    value = value.gsub(/-| /, '').downcase.chars
 
-    [10, 13].include?(value.size) && value.all? { |c| CHARS_VALUES.include?(c) }
+    [10, 13].include?(value.size) && value.all? { |chr| CHARS_VALUES.include?(chr) }
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/isin_validator.rb

@@ -2,7 +2,8 @@ class IsinValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.isin"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.isin'))
     end
   end
 
@@ -10,26 +11,28 @@ class IsinValidator < ActiveModel::EachValidator
 
   def valid_checksum?(value)
     characters = value.chars
-    digits = characters.map { |c| c.match(/[A-Z]/) ? (c.ord - 55) : c.to_i }
-    even_values = digits.values_at(*digits.each_index.select { |i| i.even? })
-    odd_values = digits.values_at(*digits.each_index.select { |i| i.odd? })
+    digits = characters.map { |chr| chr =~ /[A-Z]/ ? (chr.ord - 55) : chr.to_i }
+    even_values = digits.values_at(*digits.each_index.select(&:even?))
+    odd_values = digits.values_at(*digits.each_index.select(&:odd?))
 
     longest, shortest = if even_values.last == characters.map(&:to_i)
-      [even_values, odd_values]
-    else
-      [odd_values, even_values]
-    end
+                          [even_values, odd_values]
+                        else
+                          [odd_values, even_values]
+                        end
 
-    longest = longest.map { |i| i * 2 }
+    longest = longest.map { |int| int * 2 }
     values = longest.concat(shortest).to_s.scan(/./).map(&:to_i)
     total = values.inject(&:+)
 
     (10 - (total % 10)) % 10
   end
 
+  # rubocop:disable Metrics/LineLength
   def valid_format?(value)
     value =~ /^((AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|SS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW{2})([A-Z0-9]{9}))(\d{1})$/
   end
+  # rubocop:enable Metrics/LineLength
 
   def valid_length?(value)
     value.present?

data/lib/active_validation/validators/mac_address_validator.rb

@@ -2,7 +2,8 @@ class MacAddressValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.mac_address"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.mac_address'))
     end
   end
 
@@ -12,11 +13,14 @@ class MacAddressValidator < ActiveModel::EachValidator
     /^([\h]{2}:){5}[\h]{2}?$/i, /^([\h]{2}[-|\.|\s]){5}[\h]{2}?$/i,
     /^([\h]{6})[-|\.][\h]{6}?$/i, /^([\h]{6}):[\h]{6}?$/i,
     /^([\h]{4}[-|\.|\s]){2}[\h]{4}?$/i, /^[\h]{12}?$/i
-  ]
+  ].freeze
 
   def valid_format?(value)
     result = false
-    DEFAULT_FORMATS.each { |p| break if result = (value =~ p) }
+    DEFAULT_FORMATS.each do |pat|
+      result = (value =~ pat)
+      break if result
+    end
     result
   end
 

data/lib/active_validation/validators/name_validator.rb

@@ -2,14 +2,15 @@ class NameValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.name"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.name'))
     end
   end
 
   private
 
   def valid_format?(value)
-    value =~ /\A([a-zA-Z"-]+\s+){1,4}[a-zA-Z"-]*\z/i
+    value =~ /\A([a-zA-Z'"-]+\s+){1,4}[a-zA-Z'"-]*\z/i
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/password_validator.rb

@@ -2,14 +2,19 @@ class PasswordValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s, options)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.password"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.password'))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    value =~ (options.fetch(:strict, false) ? /^(?=^.{1,255}$)((?=.*[A-Za-z0-9])(?=.*[A-Z])(?=.*[a-z]))^.*$/ : /^[A-Za-z0-9!@#$%^&*_-]{1,255}$/)
+    value =~ if options[:strict]
+               /^(?=^.{1,255}$)((?=.*[A-Za-z0-9])(?=.*[A-Z])(?=.*[a-z]))^.*$/
+             else
+               /^[A-Za-z0-9!@#$%^&*_-]{1,255}$/
+             end
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/phone_validator.rb

@@ -2,14 +2,15 @@ class PhoneValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.phone"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.phone'))
     end
   end
 
   private
 
   def valid_format?(value)
-    value =~ /^[0-9+\(\)#\.\s\/ext-]+$/i
+    value =~ %r{^[0-9+\(\)#\.\s\/ext-]+$}
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/sedol_validator.rb

@@ -2,18 +2,19 @@ class SedolValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.sedol"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.sedol'))
     end
   end
 
   private
 
   def valid_checksum?(value)
-    digits = value.chars.map { |d| d.match(/[A-Z]/) ? (d.ord - 55) : d.to_i }
+    digits = value.chars.map { |dgt| dgt =~ /[A-Z]/ ? (dgt.ord - 55) : dgt.to_i }
     weights = [1, 3, 1, 7, 3, 9, 1]
 
     total = 0
-    digits.each_with_index { |d, i| total += (weights[i] * d) }
+    digits.each_with_index { |dgt, idx| total += (weights[idx] * dgt) }
 
     (10 - total % 10) % 10
   end

data/lib/active_validation/validators/slug_validator.rb

@@ -2,7 +2,8 @@ class SlugValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.slug"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.slug'))
     end
   end
 

data/lib/active_validation/validators/ssn_validator.rb

@@ -2,7 +2,8 @@ class SsnValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.ssn"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.ssn'))
     end
   end
 

data/lib/active_validation/validators/tracking_number_validator.rb

@@ -2,7 +2,8 @@ class TrackingNumberValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s, options)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.tracking_number"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.tracking_number'))
     end
   end
 
@@ -23,10 +24,10 @@ class TrackingNumberValidator < ActiveModel::EachValidator
       usps20: /^([0-9]{2,2})([0-9]{9,9})([0-9]{8,8})([0-9])$/,
       usps91: /^(?:420\d{5})?(9[1-5](?:[0-9]{19}|[0-9]{23}))([0-9])$/
     }
-  }
+  }.freeze
 
   # DHL
-  DEFAULT_CARRIERS_AND_SERVICES.fetch(:dhl).each do |service, pattern|
+  DEFAULT_CARRIERS_AND_SERVICES[:dhl].each do |service, pattern|
     define_method("valid_dhl_#{service}_checksum?") do |value|
       formula = value.scan(pattern).flatten.compact
       return(false) if formula.empty?
@@ -40,53 +41,55 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   def valid_fedex_express_checksum?(value)
     return(false) unless value.size == 12
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES.fetch(:fedex).fetch(:express)
+    pattern = DEFAULT_CARRIERS_AND_SERVICES[:fedex][:express]
     formula = value.scan(pattern).flatten.compact
     return(false) if formula.empty?
     sequence, check_digit = formula
 
     total = 0
-    sequence.chars.zip([3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1]).each do |char1, char2|
-      total += (char1.to_i * char2)
+    sequence.chars.zip([3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1]).each do |chr, chrx|
+      total += (chr.to_i * chrx)
     end
 
     (total % 11 % 10) == check_digit.to_i
   end
 
-  DEFAULT_CARRIERS_AND_SERVICES.fetch(:fedex).select { |k, v| [:ground, :ground18, :ground96].include?(k) }.each_with_index do |(service, pattern), i|
-    define_method("valid_fedex_#{service}_checksum?") do |value|
-      return(false) unless value.size == [15, 18, 22].at(i)
+  DEFAULT_CARRIERS_AND_SERVICES[:fedex]
+    .select { |key, _| [:ground, :ground18, :ground96].include?(key) }
+    .each_with_index do |(srv, pat), idx|
+      define_method("valid_fedex_#{srv}_checksum?") do |val|
+        return(false) unless val.size == [15, 18, 22].at(idx)
 
-      formula = value.scan(pattern).flatten.compact
-      return(false) if formula.empty?
-      sequence, check_digit = formula
+        formula = val.scan(pat).flatten.compact
+        return(false) if formula.empty?
+        sequence, check_digit = formula
 
-      total = 0
-      sequence.chars.reverse.each_with_index do |character, i|
-        result = character.to_i
-        result *= 3 if i.even?
-        total += result
-      end
+        total = 0
+        sequence.chars.reverse.each_with_index do |chr, idxx|
+          result = chr.to_i
+          result *= 3 if idxx.even?
+          total += result
+        end
 
-      check = total % 10
-      check = (10 - check) unless check.zero?
-      check == check_digit.to_i
+        check = total % 10
+        check = (10 - check) unless check.zero?
+        check == check_digit.to_i
+      end
     end
-  end
 
   def valid_fedex_smart_post_checksum?(value)
     value = "92#{value}" unless value =~ /^92/
     return(false) unless value.size == 22
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES.fetch(:fedex).fetch(:smart_post)
+    pattern = DEFAULT_CARRIERS_AND_SERVICES[:fedex][:smart_post]
     formula = value.scan(pattern).flatten.compact
     return(false) if formula.empty?
     sequence, check_digit = formula
 
     total = 0
-    sequence.chars.reverse.each_with_index do |character, i|
+    sequence.chars.reverse.each_with_index do |character, idx|
       result = character.to_i
-      result *= 3 if i.even?
+      result *= 3 if idx.even?
       total += result
     end
 
@@ -96,34 +99,36 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   end
 
   # Ontrac & UPS
-  DEFAULT_CARRIERS_AND_SERVICES.select { |k, v| [:ontrac, :ups].include?(k) }.each_with_index do |(carrier, services), i|
-    services.each do |service, pattern|
-      define_method("valid_#{carrier}_#{service}_checksum?") do |value|
-        return(false) unless value.size == [15, 18].at(i)
-
-        formula = value.scan(pattern).flatten.compact
-        return(false) if formula.empty?
-        sequence, check_digit = formula
-
-        total = 0
-        sequence.chars.each_with_index do |character, i|
-          result = character[/[0-9]/] ? character.to_i : ((character[0].ord - 3) % 10)
-          result *= 2 if i.odd?
-          total += result
+  DEFAULT_CARRIERS_AND_SERVICES
+    .select { |key, _| [:ontrac, :ups].include?(key) }
+    .each_with_index do |(cars, sers), idx|
+      sers.each do |ser, pat|
+        define_method("valid_#{cars}_#{ser}_checksum?") do |value|
+          return(false) unless value.size == [15, 18].at(idx)
+
+          formula = value.scan(pat).flatten.compact
+          return(false) if formula.empty?
+          sequence, check_digit = formula
+
+          total = 0
+          sequence.chars.each_with_index do |chr, idxx|
+            result = chr[/[0-9]/] ? chr.to_i : ((chr[0].ord - 3) % 10)
+            result *= 2 if idxx.odd?
+            total += result
+          end
+
+          check = total % 10
+          check = 10 - check unless check.zero?
+          check == check_digit.to_i
         end
-
-        check = total % 10
-        check = 10 - check unless check.zero?
-        check == check_digit.to_i
       end
     end
-  end
 
   # USPS
   def valid_usps_usps13_checksum?(value)
     return(false) unless value.size == 13
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES.fetch(:usps).fetch(:usps13)
+    pattern = DEFAULT_CARRIERS_AND_SERVICES[:usps][:usps13]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -131,17 +136,17 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     check_digit = characters.pop.to_i
 
     total = 0
-    characters.zip([8, 6, 4, 2, 3, 5, 9, 7]).each do |pair|
-      total += (pair[0].to_i * pair[1].to_i)
+    characters.zip([8, 6, 4, 2, 3, 5, 9, 7]).each do |par|
+      total += (par[0].to_i * par[1].to_i)
     end
 
     remainder = total % 11
     check = case remainder
-    when 1 then 0;
-    when 0 then 5;
-    else
-      11 - remainder
-    end
+            when 1 then 0
+            when 0 then 5
+            else
+              11 - remainder
+            end
 
     check == check_digit
   end
@@ -149,7 +154,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   def valid_usps_usps20_checksum?(value)
     return(false) unless value.size == 20
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES.fetch(:usps).fetch(:usps20)
+    pattern = DEFAULT_CARRIERS_AND_SERVICES[:usps][:usps20]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -157,9 +162,9 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     check_digit = sequence.last.to_i
 
     total = 0
-    characters.reverse.each_with_index do |character, i|
-      result = character.to_i
-      result *= 3 if i.even?
+    characters.reverse.each_with_index do |chr, idx|
+      result = chr.to_i
+      result *= 3 if idx.even?
       total += result
     end
 
@@ -172,7 +177,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     value = "91#{value}" unless value =~ /^(420\d{5})?9[1-5]/
     return(false) unless value.size == 22
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES.fetch(:usps).fetch(:usps91)
+    pattern = DEFAULT_CARRIERS_AND_SERVICES[:usps][:usps91]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -180,9 +185,9 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     check_digit = sequence.last.to_i
 
     total = 0
-    characters.reverse.each_with_index do |character, i|
-      result = character.to_i
-      result *= 3 if i.even?
+    characters.reverse.each_with_index do |chr, idx|
+      result = chr.to_i
+      result *= 3 if idx.even?
       total += result
     end
 
@@ -193,28 +198,28 @@ class TrackingNumberValidator < ActiveModel::EachValidator
 
   # Base
   def valid_checksum?(value, options)
-    carrier = options.fetch(:carrier, nil)
-    service = options.fetch(:service, nil)
+    carrier = options[:carrier]
+    service = options[:service]
     result = false
 
     if carrier.nil? && service.nil?
-      DEFAULT_CARRIERS_AND_SERVICES.each do |carrier, services|
-        services.each_key do |carrier_service|
-          result = send("valid_#{carrier}_#{carrier_service}_checksum?", value)
+      DEFAULT_CARRIERS_AND_SERVICES.each do |car, ser|
+        ser.each_key do |car_ser|
+          result = send("valid_#{car}_#{car_ser}_checksum?", value)
           break if result
         end
         break if result
       end
     elsif service.nil?
-      DEFAULT_CARRIERS_AND_SERVICES.fetch(carrier).each_key do |carrier_service|
-        result = send("valid_#{carrier}_#{carrier_service}_checksum?", value)
+      DEFAULT_CARRIERS_AND_SERVICES[carrier].each_key do |car_ser|
+        result = send("valid_#{carrier}_#{car_ser}_checksum?", value)
         break if result
       end
     else
       result = send("valid_#{carrier}_#{service}_checksum?", value)
     end
 
-    return(result)
+    result
   end
 
   def valid_length?(value)