lib/truemail/validate/mx.rb in truemail-2.4.4 vs lib/truemail/validate/mx.rb in truemail-2.4.5

@@ -6,11 +6,10 @@
       ERROR = 'target host(s) not found'
       NULL_MX_RECORD = 'null_mx_record'
 
       def run
         return false unless Truemail::Validate::Regex.check(result)
-        result.domain = result.punycode_email[Truemail::RegexConstant::REGEX_DOMAIN_FROM_EMAIL, 1]
         return true if success(mx_lookup && domain_not_include_null_mx)
         mail_servers.clear && add_error(Truemail::Validate::Mx::ERROR)
         false
       end
 
@@ -51,10 +50,13 @@
       def mail_servers_found?
         !mail_servers.empty?
       end
 
       def domain
-        result.domain
+        @domain ||= begin
+          result.domain = result.email[Truemail::RegexConstant::REGEX_EMAIL_PATTERN, 3]
+          result.punycode_email[Truemail::RegexConstant::REGEX_EMAIL_PATTERN, 3]
+        end
       end
 
       def hosts_from_mx_records?
         fetch_target_hosts(mx_records(domain))
         mail_servers_found?