roomorama-validates_email 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddcdbbde2feff111daaaa44a572a75862ed1dfbf
-  data.tar.gz: 89abaf46306e9a869477b2c112a2b4b4fd295da0
+  metadata.gz: b29f15f9211a9ba258a444d4eff61887241aa59e
+  data.tar.gz: d3a2a29717552ce7672eae767d7604e81eff08ac
 SHA512:
-  metadata.gz: 41f7888a01fda2d35e2586398f0db5d983ebc80c90a9ab8b28eff6d16cb5cb3fbe8baba91a6f6459ab88afb264d3d690e3da4ce4be8afef17ac6106d60408095
-  data.tar.gz: 2978e739dc792899c5969c6ee3429d0ee2ed829cd4595b47a62afe782e5dbedb18d5e26b209ce0ab0eb114b8331c123cab892fd4a18aa8f2224facd4e75b773d
+  metadata.gz: 2fe40360f5ca4d71b98781f5ccab75cb585bcb2b78607772509ba3c5ffa4dfb233b5df4a0baff60bcf86adf990eb39e83969d5b902ae786746c74fdf88654459
+  data.tar.gz: 80f447ef1f0c2694288d2b359c0c5f84608760e23df7d4d2b819619b3a9e318579f96dfcec84a7152d4c8505294bea9c78042b63d690d2ebe507237d12aac1fb

data/lib/validates_email/email_validator.rb

@@ -22,10 +22,13 @@ class EmailValidator < ActiveModel::EachValidator
   #
   def validate_each(record, attribute, value)
     if validates_email_format(value)
-      if options[:mailgun] && ENV['MAILGUN_PUBLIC_KEY'].present? && !validates_email_with_mailgun(value)
+      validate_mailgun = options[:mailgun] && options[:mailgun].respond_to?(:call) ? options[:mailgun].call(record) : options[:mailgun]
+      if validate_mailgun && ENV['MAILGUN_PUBLIC_KEY'].present? && !validates_email_with_mailgun(value)
         record.errors.add(attribute, options[:mailgun_message] || :invalid)
       end
-      if options[:mx] && !validates_email_domain(value, options[:mx])
+      validate_mx_condition = options[:mx] && options[:mx].is_a?(Hash) ? (options[:mx][:if].nil? ? true : options[:mx][:if]) : options[:mx]
+      validate_mx = validate_mx_condition && validate_mx_condition.respond_to?(:call) ? validate_mx_condition.call(record) : validate_mx_condition
+      if validate_mx && !validates_email_domain(value, options[:mx])
         record.errors.add(attribute, options[:mx_message] || :mx_invalid)
       end
     else

data/lib/validates_email/version.rb

@@ -1,3 +1,3 @@
 module ValidatesEmail
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roomorama-validates_email
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Donald Piret