lib/validators/phony_validator.rb in phony_rails-0.13.1 vs lib/validators/phony_validator.rb in phony_rails-0.14.0

@@ -6,42 +6,49 @@
   # Validates a String using Phony.plausible? method.
   def validate_each(record, attribute, value)
     return if value.blank?
 
     @record = record
-
     value = PhonyRails.normalize_number(value.dup, default_country_code: normalized_country_code) if normalized_country_code
     @record.errors.add(attribute, error_message) unless Phony.plausible?(value, cc: country_number)
   end
 
   private
 
   def error_message
-    options[:message] || :improbable_phone
+    options_value(:message) || :improbable_phone
   end
 
   def country_number
-    options[:country_number] || record_country_number || country_number_from_country_code
+    options_value(:country_number) || record_country_number || country_number_from_country_code
   end
 
   def record_country_number
-    @record.country_number if @record.respond_to?(:country_number) && !options[:ignore_record_country_number]
+    @record.country_number if @record.respond_to?(:country_number) && !options_value(:ignore_record_country_number)
   end
 
   def country_number_from_country_code
     PhonyRails.country_number_for(country_code)
   end
 
   def country_code
-    options[:country_code] || record_country_code
+    options_value(:country_code) || record_country_code
   end
 
   def record_country_code
-    @record.country_code if @record.respond_to?(:country_code) && !options[:ignore_record_country_code]
+    @record.country_code if @record.respond_to?(:country_code) && !options_value(:ignore_record_country_code)
   end
 
   def normalized_country_code
-    options[:normalized_country_code]
+    options_value(:normalized_country_code)
+  end
+
+  def options_value(option)
+    if options[option].is_a?(Symbol)
+      @record.send(options[option])
+    else
+      options[option]
+    end
   end
 end
 
 module ActiveModel
   module Validations