active_validation 3.0.0 → 4.0.0

data/lib/active_validation/railtie.rb

@@ -0,0 +1,19 @@
+if defined?(Rails)
+  class ActiveValidation::Railtie < ::Rails::Railtie
+
+    initializer 'active_validation' do |app|
+      ActiveValidation::Railtie.instance_eval do
+        [app.config.i18n.available_locales].flatten.each do |locale|
+          (I18n.load_path << path(locale)) if File.file?(path(locale))
+        end
+      end
+    end
+
+    protected
+
+    def path(locale)
+      File.expand_path("../../config/locales/#{locale}.yml", __FILE__)
+    end
+
+  end
+end

data/lib/active_validation/validators/alpha_numeric_validator.rb

@@ -2,23 +2,24 @@ class AlphaNumericValidator < 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.alpha_numeric"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.alpha_numeric'))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    strict = options.fetch(:strict, false)
+    strict = options[:strict]
 
-    value =~ case options.fetch(:case, :any)
-    when :lower
-      strict ? /^[a-z0-9]+$/ : /^[a-z0-9 ]+$/
-    when :upper
-      strict ? /^[A-Z0-9]+$/ : /^[A-Z0-9 ]+$/
-    else
-      strict ? /^[A-Za-z0-9]+$/i : /^[A-Za-z0-9 ]+$/i
-    end
+    value =~ case options[:case]
+             when :lower
+               strict ? /^[a-z0-9]+$/ : /^[a-z0-9 ]+$/
+             when :upper
+               strict ? /^[A-Z0-9]+$/ : /^[A-Z0-9 ]+$/
+             else
+               strict ? /^[A-Za-z0-9]+$/i : /^[A-Za-z0-9 ]+$/i
+             end
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/alpha_validator.rb

@@ -2,23 +2,24 @@ class AlphaValidator < 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.alpha"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.alpha'))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    strict = options.fetch(:strict, false)
+    strict = options[:strict]
 
-    value =~ case options.fetch(:case, :any)
-    when :lower
-      strict ? /^[a-z]+$/ : /^[a-z ]+$/
-    when :upper
-      strict ? /^[A-Z]+$/ : /^[A-Z ]+$/
-    else
-      strict ? /^[A-Za-z]+$/i : /^[A-Za-z ]+$/i
-    end
+    value =~ case options[:case]
+             when :lower
+               strict ? /^[a-z]+$/ : /^[a-z ]+$/
+             when :upper
+               strict ? /^[A-Z]+$/ : /^[A-Z ]+$/
+             else
+               strict ? /^[A-Za-z]+$/i : /^[A-Za-z ]+$/i
+             end
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/base64_validator.rb

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

data/lib/active_validation/validators/boolean_validator.rb

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

data/lib/active_validation/validators/coordinate_validator.rb

@@ -1,20 +1,23 @@
 class CoordinateValidator < ActiveModel::EachValidator
 
+  # rubocop:disable Metrics/LineLength
   def validate_each(record, attribute, value)
-    boundary = options.fetch(:boundary, :coordinate)
+    boundary = options[:boundary] || :coordinate
     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(', ')}"
     end
 
     unless valid?(value, options)
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t("active_validation.errors.messages.coordinate.#{boundary}"))
     end
   end
+  # rubocop:enable Metrics/LineLength
 
   private
 
-  BOUNDARIES = [:coordinate, :latitude, :longitude]
+  BOUNDARIES = [:coordinate, :latitude, :longitude].freeze
 
   def valid_latitude?(value)
     value >= -90 && value <= 90
@@ -29,7 +32,7 @@ class CoordinateValidator < ActiveModel::EachValidator
   end
 
   def valid_boundary?(value, options)
-    case options.fetch(:boundary, :coordinate)
+    case options[:boundary]
     when :latitude
       valid_latitude?(value)
     when :longitude

data/lib/active_validation/validators/credit_card_validator.rb

@@ -2,7 +2,8 @@ class CreditCardValidator < 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.credit_card"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.credit_card'))
     end
   end
 
@@ -12,79 +13,77 @@ class CreditCardValidator < ActiveModel::EachValidator
     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 = {
-    american_express: ["34", "37"],
-    diners_club: ["300", "301", "302", "303", "304", "305", "36", "54", "55"],
-    discover: [
-      "6011", "622126", "622127", "622128", "622129", "62213", "62214", "62215",
-      "62216", "62217", "62218", "62219", "6222", "6223", "6224", "6225", "6226",
-      "6227", "6228", "62290", "62291", "622920", "622921", "622922", "622923",
-      "622924", "622925", "644", "645", "646", "647", "648", "649", "65"
-    ],
-    jcb: ["3528", "3529", "353", "354", "355", "356", "357", "358"],
-    laser: ["6304", "6706", "6771", "6709"],
-    maestro: [
-      "5018", "5020", "5038", "6304", "6759", "6761", "6762", "6763", "6764",
-      "6765", "6766"
-    ],
-    mastercard: ["51", "52", "53", "54", "55"],
-    solo: ["6334", "6767"],
-    unionpay: [
-      "622126", "622127", "622128", "622129", "62213", "62214", "62215", "62216",
-      "62217", "62218", "62219", "6222", "6223", "6224", "6225", "6226", "6227", "6228",
-      "62290", "62291", "622920", "622921", "622922", "622923", "622924", "622925"
-    ],
-    visa: ["4"]
-  }
+    american_express: %w(34 37),
+    diners_club: %w(300 301 302 303 304 305 36 54 55),
+    discover: %w(
+                  6011 622126 622127 622128 622129 62213 62214 62215 62216 62217 62218 62219 6222
+                  6223 6224 6225 6226 6227 6228 62290 62291 622920 622921 622922 622923 622924
+                  622925 644 645 646 647 648 649 65
+                ),
+    jcb: %w(3528 3529 353 354 355 356 357 358),
+    laser: %w(6304 6706 6771 6709),
+    maestro: %w(5018 5020 5038 6304 6759 6761 6762 6763 6764 6765 6766),
+    mastercard: %w(51 52 53 54 55),
+    solo: %w(6334 6767),
+    unionpay: %w(
+                  622126 622127 622128 622129 62213 62214 62215 62216 62217 62218 62219 6222 6223
+                  6224 6225 6226 6227 6228 62290 62291 622920 622921 622922 622923 622924 622925
+                ),
+    visa: %w(4)
+  }.freeze
+  # rubocop:enable Style/IndentArray
 
   def valid_format?(value, options)
-    value =~ (options.fetch(:strict, false) ? /^[0-9]+$/ : /^[0-9 -.]+$/)
+    value =~ (options[:strict] ? /^[0-9]+$/ : /^[0-9 -.]+$/)
   end
 
   def valid_length?(value, options)
     return(false) unless value.present?
 
-    current_card = options.fetch(:card, :all)
+    current_card = options[:card] || :all
     value_size = value.size
 
     case current_card
     when :amex
-      DEFAULT_LENGTHS.fetch(:american_express).include?(value_size)
+      DEFAULT_LENGTHS[: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)
+      DEFAULT_LENGTHS[current_card].include?(value_size)
     end
   end
 
   def valid_prefix?(value, options)
-    current_card = options.fetch(:card, :all)
+    current_card = options[:card] || :all
 
     case current_card
     when :amex
-      DEFAULT_PREFIXES.fetch(:american_express).any? { |p| value.start_with?(p) }
+      DEFAULT_PREFIXES[:american_express].any? { |pat| value.start_with?(pat) }
     when :all
       result = false
       DEFAULT_LENGTHS.each do |key, values|
         if values.include?(value.size)
-          break if result = DEFAULT_PREFIXES.fetch(key).any? { |p| value.start_with?(p) }
+          result = DEFAULT_PREFIXES[key].any? { |pat| value.start_with?(pat) }
+          break if result
         end
       end
       result
     else
-      DEFAULT_PREFIXES.fetch(current_card).any? { |p| value.start_with?(p) }
+      DEFAULT_PREFIXES[current_card].any? { |pat| value.start_with?(pat) }
     end
   end
 
   def valid?(value, options)
-    striped_value = value.gsub(/\D/, "")
+    striped_value = value.gsub(/\D/, '')
 
     valid_format?(value, options) &&
-    valid_length?(striped_value, options) &&
-    valid_prefix?(striped_value, options)
+      valid_length?(striped_value, options) &&
+      valid_prefix?(striped_value, options)
   end
 
 end

data/lib/active_validation/validators/currency_validator.rb

@@ -2,14 +2,15 @@ class CurrencyValidator < 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.currency"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.currency'))
     end
   end
 
   private
 
   def valid_format?(value, options)
-    value =~ (options.fetch(:strict, false) ? /^\d+(\.\d{2})$/ : /^\d*+(\.\d{1,2})$/)
+    value =~ (options[:strict] ? /^\d+(\.\d{2})$/ : /^\d*+(\.\d{1,2})$/)
   end
 
   def valid_length?(value)

data/lib/active_validation/validators/cusip_validator.rb

@@ -2,21 +2,24 @@ class CusipValidator < 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.cusip"))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.cusip'))
     end
   end
 
   private
 
+  # rubocop:disable Lint/UselessAssignment
   def valid_checksum?(value)
-    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) { |s, i| s += (i / 10) + i % 10 }
+    digits = value.chars.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?))
+    values = odd_values.map { |int| int * 2 }.zip(even_values).flatten
+    values = values.inject(0) { |sum, int| sum += (int / 10) + int % 10 }
 
     ((10 - values) % 10) % 10
   end
+  # rubocop:enable Lint/UselessAssignment
 
   def valid_format?(value)
     value =~ /^[0-9A-Z]{9}$/

data/lib/active_validation/validators/email_validator.rb

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

data/lib/active_validation/validators/equality_validator.rb

@@ -1,30 +1,31 @@
 class EqualityValidator < ActiveModel::EachValidator
 
+  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
   def validate_each(record, attribute, value)
-    to = options.fetch(:to, nil)
+    to = options[:to]
     if to.nil?
       raise ArgumentError,
-        "ArgumentError: missing ':to' attribute for comparison."
+            'ArgumentError: missing ":to" attribute for comparison.'
     end
 
-    operator = options.fetch(:operator, nil)
+    operator = options[:operator]
     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(', ')}"
     end
-    operator = OPERATORS.fetch(operator)
 
+    operator = OPERATORS[operator]
     unless value.send(operator, record.send(to))
-      record.errors[attribute] << options.fetch(:message, I18n.t("active_validation.errors.messages.equality", attr: to, operator: operator))
+      record.errors[attribute] <<
+        (options[:message] || I18n.t('active_validation.errors.messages.equality', attr: to, operator: operator))
     end
   end
-
-  private
-
-  OPERATORS = {
-    less_than: :<, less_than_or_equal_to: :<=, greater_than: :>,
-    greater_than_or_equal_to: :>=, equal_to: :==, not_equal_to: :!=
-  }
+  # rubocop:enable Metrics/LineLength
 
 end

data/lib/active_validation/validators/hex_validator.rb

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

data/lib/active_validation/validators/imei_validator.rb

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