active_validation 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3c37a0ea5dafc85f13adb8ef2aedf5e7aa9056
-  data.tar.gz: 872e9ca16eb9787e673deb3df8f4ae4e467d5c17
+  metadata.gz: ad382cdab288f4c64ab7197a45cd470d31f6c7d6
+  data.tar.gz: d34760c5275f365fff05f108eacbdb6d6ec3b89a
 SHA512:
-  metadata.gz: 5b58170b66edd9b572ec7a79b1af3eabb303f5daa93f778b3ff07e274f3269fabbd51e18dacebf4d90c23bbff50e025beedbbb7d44a8262853802d4e159c1516
-  data.tar.gz: cd2b3b55ffe6993f903d0becf597852c4843d03501281d88a205f800088d5fad8b88b79d307473ce2f5f08f2602d420b89ed173fe312b64cf699f90c59569498
+  metadata.gz: d4de98fb656e899a85e0dc074cdd24f8f3a53ea6285464816a61a3b597d7609c58d48e2893ef2391b1dddd834f6e00cb303224bceaa58e82a995b15d8d7ce34b
+  data.tar.gz: 3eb5cafa8ad190ada20854ec1143a5d7bee81698abeb5cf4f211b532ef242c0c2a7c267a3a4a23ab0fb601e329c5c6b3273492b4f72c862760be83bdafde2bc4

data/active_validation.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "shoulda-matchers"
+  spec.add_development_dependency "shoulda"
 end

data/lib/active_validation/validators/alpha_numeric_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.alpha_numeric'.freeze))
     end
   end
 
@@ -11,7 +11,7 @@ class AlphaNumericValidator < ActiveModel::EachValidator
   def valid_format?(value, options)
     strict = options.fetch(:strict, false)
 
-    value =~ case options[:case]
+    value =~ case options.fetch(:case, :any)
     when :lower
       strict ? /^[a-z0-9]+$/ : /^[a-z0-9 ]+$/
     when :upper

data/lib/active_validation/validators/alpha_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.alpha'.freeze))
     end
   end
 
@@ -11,7 +11,7 @@ class AlphaValidator < ActiveModel::EachValidator
   def valid_format?(value, options)
     strict = options.fetch(:strict, false)
 
-    value =~ case options[:case]
+    value =~ case options.fetch(:case, :any)
     when :lower
       strict ? /^[a-z]+$/ : /^[a-z ]+$/
     when :upper

data/lib/active_validation/validators/base64_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.base64'.freeze))
     end
   end
 

data/lib/active_validation/validators/boolean_validator.rb

@@ -2,13 +2,13 @@ class BooleanValidator < ActiveModel::EachValidator
 
   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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.boolean'.freeze))
     end
   end
 
   private
 
-  FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE']
-  TRUE_VALUES  = [true, 1, '1', 't', 'T', 'true', 'TRUE']
+  FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].freeze
+  TRUE_VALUES  = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
 end

data/lib/active_validation/validators/coordinate_validator.rb

@@ -1,20 +1,20 @@
 class CoordinateValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    boundary = options.fetch(:boundary, :coordinate)
+    boundary = options.fetch(:boundary, :coordinate).to_sym
     unless BOUNDARIES.include?(boundary)
       raise ArgumentError,
-        "Unknown boundary: #{boundary.inspect}. Valid boundaries are: #{BOUNDARIES.map(&:inspect).join(', ')}"
+        "Unknown boundary: #{boundary.inspect}. Valid boundaries are: #{BOUNDARIES.map(&:inspect).join(', '.freeze)}"
     end
 
     unless valid?(value, options)
-      record.errors[attribute] << (options[:message] || I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
     end
   end
 
   private
 
-  BOUNDARIES = [:coordinate, :latitude, :longitude]
+  BOUNDARIES = [:coordinate, :latitude, :longitude].freeze
 
   def valid_length?(value)
     value.present?
@@ -29,7 +29,7 @@ class CoordinateValidator < ActiveModel::EachValidator
   end
 
   def valid_boundary?(value, options)
-    case options.fetch(:boundary, :coordinate)
+    case options.fetch(:boundary, :coordinate).to_sym
     when :latitude
       valid_latitude?(value)
     when :longitude

data/lib/active_validation/validators/credit_card_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.credit_card'.freeze))
     end
   end
 
@@ -19,7 +19,7 @@ class CreditCardValidator < ActiveModel::EachValidator
     solo: [16, 18, 19],
     unionpay: [16, 17, 18, 19],
     visa: [16]
-  }
+  }.freeze
 
   DEFAULT_PREFIXES = {
     american_express: ['34', '37'],
@@ -47,7 +47,7 @@ class CreditCardValidator < ActiveModel::EachValidator
       '622920', '622921', '622922', '622923', '622924', '622925'
     ],
     visa: ['4']
-  }
+  }.freeze
 
   def valid_format?(value, options)
     value =~ (options.fetch(:strict, false) ? /^[0-9]+$/ : /^[0-9 -.]+$/)
@@ -56,74 +56,39 @@ class CreditCardValidator < ActiveModel::EachValidator
   def valid_length?(value, options)
     return(false) unless value.present?
 
-    value_size_range = DEFAULT_LENGTHS.values.flatten.uniq.sort
-    value_size       = value.size
+    current_card = options.fetch(:card, :all).to_sym
+    value_size   = value.size
 
-    case options[:card]
-    when :american_express, :amex
-      DEFAULT_LENGTHS[:american_express].include?(value_size)
-    when :diners_club
-      DEFAULT_LENGTHS[:diners_club].include?(value_size)
-    when :discover
-      DEFAULT_LENGTHS[:discover].include?(value_size)
-    when :jcb
-      DEFAULT_LENGTHS[:jcb].include?(value_size)
-    when :laser
-      DEFAULT_LENGTHS[:laser].include?(value_size)
-    when :maestro
-      DEFAULT_LENGTHS[:maestro].include?(value_size)
-    when :mastercard
-      DEFAULT_LENGTHS[:mastercard].include?(value_size)
-    when :solo
-      DEFAULT_LENGTHS[:solo].include?(value_size)
-    when :unionpay
-      DEFAULT_LENGTHS[:unionpay].include?(value_size)
-    when :visa
-      DEFAULT_LENGTHS[:visa].include?(value_size)
-    else
+    case current_card
+    when :amex
+      DEFAULT_LENGTHS.fetch(:american_express).include?(value_size)
+    when :all
+      value_size_range = DEFAULT_LENGTHS.values.flatten.uniq.sort
       value_size.between?(value_size_range.first, value_size_range.last)
+    else
+      DEFAULT_LENGTHS.fetch(current_card).include?(value_size)
     end
   end
 
   def valid_prefix?(value, options)
-    value_size = value.size
+    current_card = options.fetch(:card, :all).to_sym
 
-    case options[:card]
-    when :american_express, :amex
-      DEFAULT_PREFIXES[:american_express].any? { |prefix| value.start_with?(prefix) }
-    when :diners_club
-      DEFAULT_PREFIXES[:diners_club].any? { |prefix| value.start_with?(prefix) }
-    when :discover
-      DEFAULT_PREFIXES[:discover].any? { |prefix| value.start_with?(prefix) }
-    when :jcb
-      DEFAULT_PREFIXES[:jcb].any? { |prefix| value.start_with?(prefix) }
-    when :laser
-      DEFAULT_PREFIXES[:laser].any? { |prefix| value.start_with?(prefix) }
-    when :maestro
-      DEFAULT_PREFIXES[:maestro].any? { |prefix| value.start_with?(prefix) }
-    when :mastercard
-      DEFAULT_PREFIXES[:mastercard].any? { |prefix| value.start_with?(prefix) }
-    when :solo
-      DEFAULT_PREFIXES[:solo].any? { |prefix| value.start_with?(prefix) }
-    when :unionpay
-      DEFAULT_PREFIXES[:unionpay].any? { |prefix| value.start_with?(prefix) }
-    when :visa
-      DEFAULT_PREFIXES[:visa].any? { |prefix| value.start_with?(prefix) }
-    else
+    case current_card
+    when :amex
+      DEFAULT_PREFIXES.fetch(:american_express).any? { |p| value.start_with?(p) }
+    when :all
       result = false
-      DEFAULT_LENGTHS.each do |key, values|
-        if values.include?(value_size)
-          result = DEFAULT_PREFIXES[key].any? { |prefix| value.start_with?(prefix) }
-          break if result
-        end
-        break if result
+      DEFAULT_LENGTHS.lazy.each do |key, values|
+        break if result = DEFAULT_PREFIXES.fetch(key).any? { |p| value.start_with?(p) } if values.include?(value.size)
       end
-      return(result)
+      result
+    else
+      DEFAULT_PREFIXES.fetch(current_card).any? { |p| value.start_with?(p) }
     end
   end
 
   def valid?(value, options)
-    striped_value = value.gsub(/\D/, '')
+    striped_value = value.gsub(/\D/, ''.freeze)
 
     valid_format?(value, options) &&
     valid_length?(striped_value, options) &&

data/lib/active_validation/validators/currency_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.currency'.freeze))
     end
   end
 

data/lib/active_validation/validators/cusip_validator.rb

@@ -2,18 +2,18 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.cusip'.freeze))
     end
   end
 
   private
 
   def valid_checksum?(value)
-    digits      = value.chars.map { |character| character.match(/[A-Z]/) ? (character.ord - 55) : character.to_i }
+    digits      = value.chars.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? })
     values      = odd_values.map { |i| i * 2 }.zip(even_values).flatten
-    values      = values.inject(0) { |sum, i| sum += (i / 10) + i % 10 }
+    values      = values.inject(0) { |s, i| s += (i / 10) + i % 10 }
 
     ((10 - values) % 10) % 10
   end

data/lib/active_validation/validators/email_validator.rb

@@ -2,14 +2,14 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.email'.freeze))
     end
   end
 
   private
 
   def valid_domain?(value, options)
-    options.empty? || options.any? { |domain| value.downcase.end_with?(".#{domain.downcase}") }
+    options.empty? || options.any? { |d| value.downcase.end_with?(".#{d.downcase}") }
   end
 
   def valid_format?(value)
@@ -23,7 +23,7 @@ class EmailValidator < ActiveModel::EachValidator
   def valid?(value, options)
     valid_length?(value) &&
     valid_format?(value) &&
-    valid_domain?(value, [*(options[:domain])])
+    valid_domain?(value, [*(options.fetch(:domain, nil))])
   end
 
 end

data/lib/active_validation/validators/equality_validator.rb

@@ -11,12 +11,12 @@ class EqualityValidator < ActiveModel::EachValidator
     operators = OPERATORS.keys
     unless operators.include?(operator)
       raise ArgumentError,
-        "Unknown operator: #{operator.inspect}. Valid operators are: #{operators.map(&:inspect).join(', ')}"
+        "Unknown operator: #{operator.inspect}. Valid operators are: #{operators.map(&:inspect).join(', '.freeze)}"
     end
     operator  = OPERATORS.fetch(operator)
 
     unless value.send(operator.to_sym, record.send(to.to_sym))
-      record.errors[attribute] << (options[:message] || I18n.t('active_validation.errors.messages.equality', attr: to, operator: operator))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.equality'.freeze, attr: to, operator: operator))
     end
   end
 
@@ -29,6 +29,6 @@ class EqualityValidator < ActiveModel::EachValidator
     greater_than_or_equal_to: :>=,
     equal_to: :==,
     not_equal_to: :!=
-  }
+  }.freeze
 
 end

data/lib/active_validation/validators/hex_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.hex'.freeze))
     end
   end
 

data/lib/active_validation/validators/imei_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.imei'.freeze))
     end
   end
 
@@ -17,11 +17,11 @@ class ImeiValidator < ActiveModel::EachValidator
   end
 
   def valid_luhn?(value)
-    number = value.gsub(/\D/, '').reverse
+    number = value.gsub(/\D/, ''.freeze).reverse
 
     total = 0
-    number.chars.each_with_index do |character, i|
-      result = character.to_i
+    number.chars.lazy.each_with_index do |c, i|
+      result = c.to_i
       result *= 2 if i.odd?
       result = (1 + (result - 10)) if (result >= 10)
       total  += result

data/lib/active_validation/validators/ip_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.ip'.freeze))
     end
   end
 

data/lib/active_validation/validators/isbn_validator.rb

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

data/lib/active_validation/validators/isin_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.isin'.freeze))
     end
   end
 
@@ -10,7 +10,7 @@ class IsinValidator < ActiveModel::EachValidator
 
   def valid_checksum?(value)
     characters  = value.chars
-    digits      = characters.map { |character| character.match(/[A-Z]/) ? (character.ord - 55) : character.to_i }
+    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? })
 

data/lib/active_validation/validators/mac_address_validator.rb

@@ -2,7 +2,7 @@ class MacAddressValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless valid?(value.to_s)
-      record.errors[attribute] << (options[:message] || I18n.t('active_validation.errors.messages.mac_address'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.mac_address'.freeze))
     end
   end
 
@@ -15,15 +15,12 @@ class MacAddressValidator < ActiveModel::EachValidator
     /^([\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 |pattern|
-      result = (value =~ pattern)
-      break if result
-    end
-    return(result)
+    DEFAULT_FORMATS.lazy.each { |p| break if result = (value =~ p) }
+    result
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/name_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.name'.freeze))
     end
   end
 

data/lib/active_validation/validators/password_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.password'.freeze))
     end
   end
 

data/lib/active_validation/validators/phone_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.phone'.freeze))
     end
   end
 

data/lib/active_validation/validators/sedol_validator.rb

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

data/lib/active_validation/validators/slug_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.slug'.freeze))
     end
   end
 

data/lib/active_validation/validators/ssn_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.ssn'.freeze))
     end
   end
 

data/lib/active_validation/validators/tracking_number_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.tracking_number'.freeze))
     end
   end
 
@@ -27,7 +27,7 @@ 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|
@@ -50,7 +50,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     sequence, check_digit = formula
 
     total = 0
-    sequence.chars.zip([3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1]).each do |(char1, char2)|
+    sequence.chars.zip([3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1].freeze).lazy.each do |(char1, char2)|
       total += (char1.to_i * char2)
     end
 
@@ -59,14 +59,14 @@ class TrackingNumberValidator < ActiveModel::EachValidator
 
   DEFAULT_CARRIERS_AND_SERVICES.fetch(:fedex).only(:ground, :ground18, :ground96).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)
+      return(false) unless value.size == [15, 18, 22].freeze.at(i)
 
       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.lazy.each_with_index do |character, i|
         result = character.to_i
         result *= 3 if i.even?
         total  += result
@@ -88,7 +88,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     sequence, check_digit = formula
 
     total = 0
-    sequence.chars.reverse.each_with_index do |character, i|
+    sequence.chars.reverse.lazy.each_with_index do |character, i|
       result = character.to_i
       result *= 3 if i.even?
       total  += result
@@ -103,14 +103,14 @@ class TrackingNumberValidator < ActiveModel::EachValidator
   DEFAULT_CARRIERS_AND_SERVICES.only(:ontrac, :ups).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)
+        return(false) unless value.size == [15, 18].freeze.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|
+        sequence.chars.lazy.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
@@ -135,7 +135,7 @@ 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|
+    characters.zip([8, 6, 4, 2, 3, 5, 9, 7].freeze).lazy.each do |pair|
       total += (pair[0].to_i * pair[1].to_i)
     end
 
@@ -163,7 +163,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     check_digit = sequence.last.to_i
 
     total = 0
-    characters.reverse.each_with_index do |character, i|
+    characters.reverse.lazy.each_with_index do |character, i|
       result = character.to_i
       result *= 3 if i.even?
       total  += result
@@ -186,7 +186,7 @@ class TrackingNumberValidator < ActiveModel::EachValidator
     check_digit = sequence.last.to_i
 
     total = 0
-    characters.reverse.each_with_index do |character, i|
+    characters.reverse.lazy.each_with_index do |character, i|
       result = character.to_i
       result *= 3 if i.even?
       total  += result

data/lib/active_validation/validators/url_validator.rb

@@ -5,16 +5,16 @@ class UrlValidator < ActiveModel::EachValidator
     uri = URI.parse(value.to_s)
     raise URI::InvalidURIError unless valid?(uri, options)
   rescue URI::InvalidURIError
-    record.errors[attribute] << (options[:message] || I18n.t('active_validation.errors.messages.url'))
+    record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.url'.freeze))
   end
 
   private
 
-  DEFAULT_SCHEMES = [:http, :https]
+  DEFAULT_SCHEMES = [:http, :https].freeze
 
   def valid_domain?(value, options)
     value_downcased = value.host.to_s.downcase
-    options.empty? || options.any? { |domain| value_downcased.end_with?(".#{domain.downcase}") }
+    options.empty? || options.any? { |d| value_downcased.end_with?(".#{d.downcase}".freeze) }
   end
 
   def valid_length?(value)
@@ -23,11 +23,11 @@ class UrlValidator < ActiveModel::EachValidator
 
   def valid_scheme?(value, options)
     value_downcased = value.scheme.to_s.downcase
-    options.empty? || options.any? { |scheme| value_downcased == scheme.to_s.downcase }
+    options.empty? || options.any? { |s| value_downcased == s.to_s.downcase }
   end
 
   def valid_root?(value)
-    ['/', ''].include?(value.path) && value.query.blank? && value.fragment.blank?
+    ['/', ''].freeze.include?(value.path) && value.query.blank? && value.fragment.blank?
   end
 
   def valid_uri?(value)
@@ -37,9 +37,9 @@ class UrlValidator < ActiveModel::EachValidator
   def valid?(value, options)
     valid_length?(value) &&
     valid_uri?(value) &&
-    valid_domain?(value, [*(options[:domain])]) &&
-    valid_scheme?(value, [*(options[:scheme] || UrlValidator::DEFAULT_SCHEMES)]) &&
-    (options[:root] ? valid_root?(value) : true)
+    valid_domain?(value, [*(options.fetch(:domain, nil))]) &&
+    valid_scheme?(value, [*(options.fetch(:scheme, UrlValidator::DEFAULT_SCHEMES))]) &&
+    (options.fetch(:root, false) ? valid_root?(value) : true)
   end
 
 end

data/lib/active_validation/validators/username_validator.rb

@@ -2,7 +2,7 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.username'.freeze))
     end
   end
 

data/lib/active_validation/validators/uuid_validator.rb

@@ -2,14 +2,14 @@ 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'))
+      record.errors[attribute] << (options.fetch(:message, false) || I18n.t('active_validation.errors.messages.uuid'.freeze))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    value =~ case options[:version]
+    value =~ case options.fetch(:version, 0)
     when 3
       /^[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i
     when 4

data/lib/active_validation/version.rb

@@ -1,3 +1,3 @@
 module ActiveValidation
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_validation
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="