active_validation 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b83dbcd9c5139b1142d10c326acc7288074e7491
-  data.tar.gz: 284f00a5ce2cd119744ff459e8edfc284b39fa51
+  metadata.gz: d932970843f5d25f14117bd66f2f2ec3903324bb
+  data.tar.gz: 0c8572a51416a466cc3cb4f313952e4f75447de0
 SHA512:
-  metadata.gz: 701b05b9a643a5fcb12a2968fa0e6d7516388a53ac75a1742f6135970d423c8c96d0b9701e889fcd71a90a6dda11af08f5716413e411747af6d8258cc7a7f83f
-  data.tar.gz: 1023027eed93960a34233a1e2f93df842677132dd7e24c6c4390e1e9f08518d535ad2f8d9676f7d52d9172a5671d7834fb9354830268a9d553dfe87eecd46b38
+  metadata.gz: '08d6ca92e810dbaebea9fa97bc861dcce0028d803e94bd76846ab080be3128787dad3a6ebd97b1dc804ff5564cfb019a10ebd4e52acb83e142045738658444ad'
+  data.tar.gz: c708bc6a229f45bf94a1fe7497d7b311259184a1e04f13321d8011f02f8019fa2bcfd7d2fe11d47c3710f1d228315a972fdbbf8cf61b79319ce43ea3c320e7f2

data/lib/active_validation.rb

@@ -6,10 +6,11 @@ require 'active_support'
     require "active_validation/#{file_name}"
   end
 
-%w(
+ACTIVE_VALIDATION_VALIDATORS ||= %w(
   alpha alpha_numeric base64 boolean coordinate credit_card currency cusip email equality hex imei
   ip isbn isin mac_address name password phone sedol slug ssn tracking_number type url username uuid
 )
-  .each do |file_name|
-    require "active_validation/validators/#{file_name}_validator"
-  end
+
+ACTIVE_VALIDATION_VALIDATORS.each do |file_name|
+  require "active_validation/validators/#{file_name}_validator"
+end

data/lib/active_validation/railtie.rb

@@ -9,11 +9,11 @@ if defined?(Rails)
       end
     end
 
-    protected
-
-    def path(locale)
+    def self.path(locale)
       File.expand_path("../../config/locales/#{locale}.yml", __FILE__)
     end
 
+    private_class_method :path
+
   end
 end

data/lib/active_validation/validators/alpha_numeric_validator.rb

@@ -1,10 +1,9 @@
 class AlphaNumericValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.alpha_numeric'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.alpha_numeric'))
   end
 
   private
@@ -27,7 +26,8 @@ class AlphaNumericValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_format?(value, options)
+    valid_length?(value) &&
+      valid_format?(value, options)
   end
 
 end

data/lib/active_validation/validators/alpha_validator.rb

@@ -1,10 +1,9 @@
 class AlphaValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.alpha'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.alpha'))
   end
 
   private
@@ -27,7 +26,8 @@ class AlphaValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_format?(value, options)
+    valid_length?(value) &&
+      valid_format?(value, options)
   end
 
 end

data/lib/active_validation/validators/base64_validator.rb

@@ -1,10 +1,9 @@
 class Base64Validator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.base64'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.base64'))
   end
 
   private
@@ -18,7 +17,8 @@ class Base64Validator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/boolean_validator.rb

@@ -1,12 +1,11 @@
 class BooleanValidator < ActiveModel::EachValidator
-  FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].freeze
-  TRUE_VALUES  = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
+  FALSE_VALUES ||= [false, 0, '0', 'f', 'F', 'false', 'FALSE'].freeze
+  TRUE_VALUES  ||= [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
   def validate_each(record, attribute, value)
-    unless TRUE_VALUES.include?(value) || FALSE_VALUES.include?(value)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.boolean'))
-    end
+    return if TRUE_VALUES.include?(value) || FALSE_VALUES.include?(value)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.boolean'))
   end
 
 end

data/lib/active_validation/validators/coordinate_validator.rb

@@ -1,5 +1,7 @@
 class CoordinateValidator < ActiveModel::EachValidator
 
+  BOUNDARIES ||= [:coordinate, :latitude, :longitude].freeze
+
   # rubocop:disable Metrics/LineLength
   def validate_each(record, attribute, value)
     boundary = options[:boundary] || :coordinate
@@ -8,19 +10,16 @@ class CoordinateValidator < ActiveModel::EachValidator
             "Unknown boundary: #{boundary.inspect}. Valid boundaries are: #{BOUNDARIES.map(&:inspect).join(', ')}"
     end
 
-    unless valid?(value, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
-    end
+    return if valid?(value, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
   end
   # rubocop:enable Metrics/LineLength
 
   private
 
-  BOUNDARIES = [:coordinate, :latitude, :longitude].freeze
-
   def valid_latitude?(value)
-    value >= -90 && value <= 90
+    value >= -90.0 && value <= 90.0
   end
 
   def valid_length?(value)
@@ -28,7 +27,7 @@ class CoordinateValidator < ActiveModel::EachValidator
   end
 
   def valid_longitude?(value)
-    value >= -180 && value <= 180
+    value >= -180.0 && value <= 180.0
   end
 
   def valid_boundary?(value, options)
@@ -38,12 +37,14 @@ class CoordinateValidator < ActiveModel::EachValidator
     when :longitude
       valid_longitude?(value)
     else
-      valid_latitude?(value.first) && valid_longitude?(value.last)
+      valid_latitude?(value.first) &&
+        valid_longitude?(value.last)
     end
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_boundary?(value, options)
+    valid_length?(value) &&
+      valid_boundary?(value, options)
   end
 
 end

data/lib/active_validation/validators/credit_card_validator.rb

@@ -1,22 +1,20 @@
 class CreditCardValidator < ActiveModel::EachValidator
 
-  def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.credit_card'))
-    end
-  end
-
-  private
-
-  DEFAULT_LENGTHS = {
-    american_express: [15], diners_club: [14, 16], discover: [16], jcb: [16],
-    laser: [16, 17, 18, 19], maestro: [12, 13, 14, 15, 16, 17, 18, 19],
-    mastercard: [16], solo: [16, 18, 19], unionpay: [16, 17, 18, 19], visa: [16]
+  LENGTHS ||= {
+    american_express: [15],
+    diners_club: [14, 16],
+    discover: [16],
+    jcb: [16],
+    laser: [16, 17, 18, 19],
+    maestro: [12, 13, 14, 15, 16, 17, 18, 19],
+    mastercard: [16],
+    solo: [16, 18, 19],
+    unionpay: [16, 17, 18, 19],
+    visa: [16]
   }.freeze
 
   # rubocop:disable Style/IndentArray
-  DEFAULT_PREFIXES = {
+  PREFIXES ||= {
     american_express: %w(34 37),
     diners_club: %w(300 301 302 303 304 305 36 54 55),
     discover: %w(
@@ -37,6 +35,14 @@ class CreditCardValidator < ActiveModel::EachValidator
   }.freeze
   # rubocop:enable Style/IndentArray
 
+  def validate_each(record, attribute, value)
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.credit_card'))
+  end
+
+  private
+
   def valid_format?(value, options)
     value =~ (options[:strict] ? /^[0-9]+$/ : /^[0-9 -.]+$/)
   end
@@ -44,37 +50,37 @@ class CreditCardValidator < ActiveModel::EachValidator
   def valid_length?(value, options)
     return(false) unless value.present?
 
-    current_card = options[:card] || :all
+    card = options[:card] || :all
     value_size = value.size
 
-    case current_card
+    case card
     when :amex
-      DEFAULT_LENGTHS[:american_express].include?(value_size)
+      LENGTHS[:american_express].include?(value_size)
     when :all
-      value_size_range = DEFAULT_LENGTHS.values.flatten.uniq.sort
+      value_size_range = LENGTHS.values.flatten.uniq.sort
       value_size.between?(value_size_range.first, value_size_range.last)
     else
-      DEFAULT_LENGTHS[current_card].include?(value_size)
+      LENGTHS[card].include?(value_size)
     end
   end
 
   def valid_prefix?(value, options)
-    current_card = options[:card] || :all
+    card = options[:card] || :all
 
-    case current_card
+    case card
     when :amex
-      DEFAULT_PREFIXES[:american_express].any? { |pat| value.start_with?(pat) }
+      PREFIXES[:american_express].any? { |pat| value.start_with?(pat) }
     when :all
       result = false
-      DEFAULT_LENGTHS.each do |key, values|
+      LENGTHS.each do |key, values|
         if values.include?(value.size)
-          result = DEFAULT_PREFIXES[key].any? { |pat| value.start_with?(pat) }
+          result = PREFIXES[key].any? { |pat| value.start_with?(pat) }
           break if result
         end
       end
       result
     else
-      DEFAULT_PREFIXES[current_card].any? { |pat| value.start_with?(pat) }
+      PREFIXES[card].any? { |pat| value.start_with?(pat) }
     end
   end
 

data/lib/active_validation/validators/currency_validator.rb

@@ -1,10 +1,9 @@
 class CurrencyValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.currency'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.currency'))
   end
 
   private
@@ -18,7 +17,8 @@ class CurrencyValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_format?(value, options)
+    valid_length?(value) &&
+      valid_format?(value, options)
   end
 
 end

data/lib/active_validation/validators/cusip_validator.rb

@@ -1,10 +1,9 @@
 class CusipValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.cusip'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.cusip'))
   end
 
   private
@@ -30,7 +29,9 @@ class CusipValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value) && valid_checksum?(value)
+    valid_length?(value) &&
+      valid_format?(value) &&
+      valid_checksum?(value)
   end
 
 end

data/lib/active_validation/validators/email_validator.rb

@@ -1,10 +1,9 @@
 class EmailValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.email'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.email'))
   end
 
   private
@@ -24,7 +23,9 @@ class EmailValidator < ActiveModel::EachValidator
   def valid?(value, options)
     options = [*(options[:domain])]
 
-    valid_length?(value) && valid_format?(value) && valid_domain?(value, options)
+    valid_length?(value) &&
+      valid_format?(value) &&
+      valid_domain?(value, options)
   end
 
 end

data/lib/active_validation/validators/equality_validator.rb

@@ -1,8 +1,12 @@
 class EqualityValidator < ActiveModel::EachValidator
 
-  OPERATORS = {
-    less_than: :<, less_than_or_equal_to: :<=, greater_than: :>, greater_than_or_equal_to: :>=,
-    equal_to: :==, not_equal_to: :!=
+  OPERATORS ||= {
+    less_than: :<,
+    less_than_or_equal_to: :<=,
+    greater_than: :>,
+    greater_than_or_equal_to: :>=,
+    equal_to: :==,
+    not_equal_to: :!=
   }.freeze
 
   # rubocop:disable Metrics/LineLength
@@ -21,10 +25,9 @@ class EqualityValidator < ActiveModel::EachValidator
     end
 
     operator = OPERATORS[operator]
-    unless value.send(operator, record.send(to))
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.equality', attr: to, operator: operator))
-    end
+    return if value.send(operator, record.send(to))
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.equality', attr: to, operator: operator))
   end
   # rubocop:enable Metrics/LineLength
 

data/lib/active_validation/validators/hex_validator.rb

@@ -1,10 +1,9 @@
 class HexValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.hex'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.hex'))
   end
 
   private
@@ -18,7 +17,8 @@ class HexValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/imei_validator.rb

@@ -1,10 +1,9 @@
 class ImeiValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.imei'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.imei'))
   end
 
   private
@@ -32,7 +31,9 @@ class ImeiValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value) && valid_luhn?(value)
+    valid_length?(value) &&
+      valid_format?(value) &&
+      valid_luhn?(value)
   end
 
 end

data/lib/active_validation/validators/ip_validator.rb

@@ -1,10 +1,9 @@
 class IpValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.ip'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.ip'))
   end
 
   private
@@ -20,7 +19,8 @@ class IpValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/isbn_validator.rb

@@ -1,21 +1,20 @@
 class IsbnValidator < ActiveModel::EachValidator
 
+  CHARACTERS ||= %w(0 1 2 3 4 5 6 7 8 9 0 x).freeze
+
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.isbn'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.isbn'))
   end
 
   private
 
-  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
 
-    [10, 13].include?(value.size) && value.all? { |chr| CHARS_VALUES.include?(chr) }
+    [10, 13].include?(value.size) && value.all? { |chr| CHARACTERS.include?(chr) }
   end
 
   def valid_length?(value)
@@ -23,7 +22,8 @@ class IsbnValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/isin_validator.rb

@@ -1,10 +1,9 @@
 class IsinValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.isin'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.isin'))
   end
 
   private
@@ -39,7 +38,9 @@ class IsinValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value) && valid_checksum?(value)
+    valid_length?(value) &&
+      valid_format?(value) &&
+      valid_checksum?(value)
   end
 
 end

data/lib/active_validation/validators/mac_address_validator.rb

@@ -1,20 +1,22 @@
 class MacAddressValidator < ActiveModel::EachValidator
 
+  DEFAULT_FORMATS ||= [
+    /^([\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 validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.mac_address'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.mac_address'))
   end
 
   private
 
-  DEFAULT_FORMATS = [
-    /^([\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 do |pat|
@@ -29,7 +31,8 @@ class MacAddressValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/name_validator.rb

@@ -1,10 +1,9 @@
 class NameValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.name'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.name'))
   end
 
   private
@@ -18,7 +17,8 @@ class NameValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/password_validator.rb

@@ -1,10 +1,9 @@
 class PasswordValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.password'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.password'))
   end
 
   private
@@ -22,7 +21,8 @@ class PasswordValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_format?(value, options)
+    valid_length?(value) &&
+      valid_format?(value, options)
   end
 
 end

data/lib/active_validation/validators/phone_validator.rb

@@ -1,10 +1,9 @@
 class PhoneValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.phone'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.phone'))
   end
 
   private
@@ -18,7 +17,8 @@ class PhoneValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/sedol_validator.rb

@@ -1,20 +1,20 @@
 class SedolValidator < ActiveModel::EachValidator
 
+  WEIGHTS ||= [1, 3, 1, 7, 3, 9, 1].freeze
+
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.sedol'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.sedol'))
   end
 
   private
 
   def valid_checksum?(value)
     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 { |dgt, idx| total += (weights[idx] * dgt) }
+    digits.each_with_index { |dgt, idx| total += (WEIGHTS[idx] * dgt) }
 
     (10 - total % 10) % 10
   end
@@ -28,7 +28,9 @@ class SedolValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value) && valid_checksum?(value)
+    valid_length?(value) &&
+      valid_format?(value) &&
+      valid_checksum?(value)
   end
 
 end

data/lib/active_validation/validators/slug_validator.rb

@@ -1,10 +1,9 @@
 class SlugValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.slug'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.slug'))
   end
 
   private
@@ -18,7 +17,8 @@ class SlugValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/ssn_validator.rb

@@ -1,10 +1,9 @@
 class SsnValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.ssn'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.ssn'))
   end
 
   private
@@ -18,7 +17,8 @@ class SsnValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/tracking_number_validator.rb

@@ -1,18 +1,13 @@
 class TrackingNumberValidator < ActiveModel::EachValidator
 
-  def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.tracking_number'))
-    end
-  end
-
-  private
-
-  DEFAULT_CARRIERS_AND_SERVICES = {
-    dhl: { express: /^([0-9]{9,9})([0-9])$/, express_air: /^([0-9]{10,10})([0-9])$/ },
+  CARRIERS_AND_SERVICES ||= {
+    dhl: {
+      express: /^([0-9]{9,9})([0-9])$/,
+      express_air: /^([0-9]{10,10})([0-9])$/
+    },
     fedex: {
-      express: /^([0-9]{11,11})([0-9])$/, ground: /^([0-9]{14,14})([0-9])$/,
+      express: /^([0-9]{11,11})([0-9])$/,
+      ground: /^([0-9]{14,14})([0-9])$/,
       ground18: /^[0-9]{2,2}([0-9]{15,15})([0-9])$/,
       ground96: /^96[0-9]{5,5}([0-9]{14,14})([0-9])$/,
       smart_post: /^((?:92)?[0-9]{5}[0-9]{14})([0-9])$/
@@ -26,10 +21,18 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     }
   }.freeze
 
+  def validate_each(record, attribute, value)
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.tracking_number'))
+  end
+
+  private
+
   # DHL
-  DEFAULT_CARRIERS_AND_SERVICES[:dhl].each do |service, pattern|
-    define_method("valid_dhl_#{service}_checksum?") do |value|
-      formula = value.scan(pattern).flatten.compact
+  CARRIERS_AND_SERVICES[:dhl].each do |srv, pat|
+    define_method("valid_dhl_#{srv}_checksum?") do |val|
+      formula = val.scan(pat).flatten.compact
       return(false) if formula.empty?
       sequence, check_digit = formula.map(&:to_i)
 
@@ -41,7 +44,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   def valid_fedex_express_checksum?(value)
     return(false) unless value.size == 12
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES[:fedex][:express]
+    pattern = CARRIERS_AND_SERVICES[:fedex][:express]
     formula = value.scan(pattern).flatten.compact
     return(false) if formula.empty?
     sequence, check_digit = formula
@@ -54,7 +57,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     (total % 11 % 10) == check_digit.to_i
   end
 
-  DEFAULT_CARRIERS_AND_SERVICES[:fedex]
+  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|
@@ -81,14 +84,14 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     value = "92#{value}" unless value =~ /^92/
     return(false) unless value.size == 22
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES[:fedex][:smart_post]
+    pattern = 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, idx|
-      result = character.to_i
+    sequence.chars.reverse.each_with_index do |chr, idx|
+      result = chr.to_i
       result *= 3 if idx.even?
       total += result
     end
@@ -99,14 +102,14 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   end
 
   # Ontrac & UPS
-  DEFAULT_CARRIERS_AND_SERVICES
+  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)
+        define_method("valid_#{cars}_#{ser}_checksum?") do |val|
+          return(false) unless val.size == [15, 18].at(idx)
 
-          formula = value.scan(pat).flatten.compact
+          formula = val.scan(pat).flatten.compact
           return(false) if formula.empty?
           sequence, check_digit = formula
 
@@ -128,7 +131,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   def valid_usps_usps13_checksum?(value)
     return(false) unless value.size == 13
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES[:usps][:usps13]
+    pattern = CARRIERS_AND_SERVICES[:usps][:usps13]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -154,7 +157,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   def valid_usps_usps20_checksum?(value)
     return(false) unless value.size == 20
 
-    pattern = DEFAULT_CARRIERS_AND_SERVICES[:usps][:usps20]
+    pattern = CARRIERS_AND_SERVICES[:usps][:usps20]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -177,7 +180,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[:usps][:usps91]
+    pattern = CARRIERS_AND_SERVICES[:usps][:usps91]
     sequence = value.scan(pattern).flatten.compact
     return(false) if sequence.empty?
 
@@ -203,7 +206,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     result = false
 
     if carrier.nil? && service.nil?
-      DEFAULT_CARRIERS_AND_SERVICES.each do |car, ser|
+      CARRIERS_AND_SERVICES.each do |car, ser|
         ser.each_key do |car_ser|
           result = send("valid_#{car}_#{car_ser}_checksum?", value)
           break if result
@@ -211,7 +214,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
         break if result
       end
     elsif service.nil?
-      DEFAULT_CARRIERS_AND_SERVICES[carrier].each_key do |car_ser|
+      CARRIERS_AND_SERVICES[carrier].each_key do |car_ser|
         result = send("valid_#{carrier}_#{car_ser}_checksum?", value)
         break if result
       end
@@ -227,7 +230,8 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_checksum?(value, options)
+    valid_length?(value) &&
+      valid_checksum?(value, options)
   end
 
 end

data/lib/active_validation/validators/type_validator.rb

@@ -5,10 +5,9 @@ end
 class TypeValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.type'))
-    end
+    return if valid?(value, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.type'))
   end
 
   private

data/lib/active_validation/validators/url_validator.rb

@@ -1,6 +1,8 @@
 require 'uri'
 class UrlValidator < ActiveModel::EachValidator
 
+  DEFAULT_SCHEMES ||= [:http, :https].freeze
+
   def validate_each(record, attribute, value)
     uri = URI.parse(value.to_s)
     raise URI::InvalidURIError unless valid?(uri, options)
@@ -11,8 +13,6 @@ class UrlValidator < ActiveModel::EachValidator
 
   private
 
-  DEFAULT_SCHEMES = [:http, :https].freeze
-
   def valid_domain?(value, options)
     value_downcased = value.host.to_s.downcase
     options.empty? || options.any? { |dom| value_downcased.end_with?(".#{dom.downcase}") }

data/lib/active_validation/validators/username_validator.rb

@@ -1,10 +1,9 @@
 class UsernameValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.username'))
-    end
+    return if valid?(value.to_s)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.username'))
   end
 
   private
@@ -18,7 +17,8 @@ class UsernameValidator < ActiveModel::EachValidator
   end
 
   def valid?(value)
-    valid_length?(value) && valid_format?(value)
+    valid_length?(value) &&
+      valid_format?(value)
   end
 
 end

data/lib/active_validation/validators/uuid_validator.rb

@@ -1,10 +1,9 @@
 class UuidValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    unless valid?(value.to_s, options)
-      record.errors[attribute] <<
-        (options[:message] || I18n.t('active_validation.errors.messages.uuid'))
-    end
+    return if valid?(value.to_s, options)
+    record.errors[attribute] <<
+      (options[:message] || I18n.t('active_validation.errors.messages.uuid'))
   end
 
   private
@@ -27,7 +26,8 @@ class UuidValidator < ActiveModel::EachValidator
   end
 
   def valid?(value, options)
-    valid_length?(value) && valid_format?(value, options)
+    valid_length?(value) &&
+      valid_format?(value, options)
   end
 
 end

data/lib/active_validation/version.rb

@@ -1,3 +1,3 @@
 module ActiveValidation
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_validation
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Gem for commonly used validators.