lib/validators/phone_validator.rb in phonelib-0.6.14 vs lib/validators/phone_validator.rb in phonelib-0.6.15
- old
+ new
@@ -49,20 +49,20 @@
include Phonelib::Core
# Validation method
def validate_each(record, attribute, value)
return if options[:allow_blank] && value.blank?
- options[:extensions] ||= true
+ allowed_extensions = options.has_key?(:extensions) ? options[:extensions] : true
phone = parse(value, specified_country(record))
valid = if simple_validation?
phone.send(validate_method)
else
(phone_types(phone) & types).size > 0
end
# We default to not-allowing extensions for fax numbers
- if valid && options[:extensions] === false && !phone.extension.empty?
+ if valid && !allowed_extensions && !phone.extension.empty?
valid = false
end
record.errors.add(attribute, message, options) unless valid
end