email_assessor 0.8.3 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78962333d6f1cd4adf5b69ecd450e347c067a69bd0867b591c37eddd89e1efd8
-  data.tar.gz: 3c8addeb187281929edbeb69c61364218466a13699c04b16ad88ac928fccc7ab
+  metadata.gz: c3d58f2ccff5295b5ca3a6a340906e4bf434ebe786e3c60018595ef28872070d
+  data.tar.gz: cba2edd82f57fa711dbc2a8e0d8762913be44a9b3853cea44dd67dc412f26a8e
 SHA512:
-  metadata.gz: 4c4af7254cbf9c82c9ac67bcda174f3a557ace08d52a8771af886ca633cc47ddaa6b7099085c7fbc343b0740777a426e2ce4595b125809cacac3123702c42d34
-  data.tar.gz: d2a8afe9bcd700139d0842798d76d38f7dfb41ae3084f38ffcc29932d98ebb312ed6bd8540209ce77d2e1e1957ea8bbe595498ca8e2d4978f66aa4ddce5b4b3d
+  metadata.gz: e7e563e8586f5fbcc4979957b259d0af04ce624d907110edc23b605bec5d7dcffa099f1889a8b15b3dff4c62b023527130029f584d4e1819c935b84271c3002c
+  data.tar.gz: 6432e40e499237ba0c4a0a1a94b095a74bdaf702d3d84f1aeeeea24248da4b344bee645dc6cf6e5bc1ed8a976b28f80fcc3daf7e95322c1aa4852e45c270c4af

data/lib/email_assessor/address.rb

@@ -5,7 +5,7 @@ require "mail"
 
 module EmailAssessor
   class Address
-    attr_accessor :address
+    attr_accessor :parsed
 
     PROHIBITED_DOMAIN_PREFIXES = [
       '.',
@@ -83,12 +83,16 @@ module EmailAssessor
       end
     end
 
-    def initialize(address)
+    def initialize(raw_address)
       @parse_error = false
-      @raw_address = address
+      @raw_address = raw_address
+      @address = nil
+      @valid = nil
+      @mx_servers = nil
+      @domain_tokens = nil
 
       begin
-        @address = Mail::Address.new(address)
+        @address = Mail::Address.new(raw_address)
       rescue Mail::Field::ParseError
         @parse_error = true
       end
@@ -99,12 +103,12 @@ module EmailAssessor
       return false if @parse_error
 
       @valid =
-        if address.domain && address.address == @raw_address
-          domain = address.domain
+        if @address.domain && @address.address == @raw_address
+          domain = @address.domain
 
           domain.include?('.') &&
             !domain.match?(self.class.prohibited_domain_regex) &&
-            !address.local.match?(self.class.prohibited_local_regex)
+            !@address.local.match?(self.class.prohibited_local_regex)
         else
           false
         end
@@ -127,7 +131,7 @@ module EmailAssessor
     end
 
     def domain_in_file?(filename)
-      valid? && EmailAssessor.domain_in_file?(address.domain, filename)
+      valid? && EmailAssessor.any_token_in_file?(domain_tokens, filename)
     end
 
     def valid_mx?
@@ -145,10 +149,16 @@ module EmailAssessor
 
     def mx_servers
       @mx_servers ||= Resolv::DNS.open do |dns|
-        mx_servers = dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
+        mx_servers = dns.getresources(@address.domain, Resolv::DNS::Resource::IN::MX)
         (mx_servers.any? && mx_servers) ||
-          dns.getresources(address.domain, Resolv::DNS::Resource::IN::A)
+          dns.getresources(@address.domain, Resolv::DNS::Resource::IN::A)
       end
     end
+
+    private
+
+    def domain_tokens
+      @domain_tokens ||= EmailAssessor.tokenize_domain(@address.domain)
+    end
   end
 end

data/lib/email_assessor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module EmailAssessor
-  VERSION = "0.8.3"
+  VERSION = "0.9.1"
 end

data/lib/email_assessor.rb

@@ -16,13 +16,26 @@ module EmailAssessor
   end
 
   def self.domain_in_file?(domain, file_name)
+    any_token_in_file?(tokenize_domain(domain), file_name)
+  end
+
+  def self.any_token_in_file?(domain_tokens, file_name)
     file_name ||= ""
-    domain = domain.downcase
 
     File.foreach(file_name, chomp: true).any? do |line|
-      # String#end_with? is used as a cheaper initial check but due to potential false positives
-      # (hotmail.com is valid but tmail.com is not) regex is also necessary.
-      domain.end_with?(line) && domain.match?(%r{\A(?:.*\.)?#{Regexp.escape(line)}\z}i)
+      domain_tokens.key?(line)
     end
   end
+
+  def self.tokenize_domain(domain)
+    parts = domain.downcase.split(".")
+    tokens = {}
+
+    parts.length.times do
+      tokens[parts.join(".")] = nil
+      parts.shift
+    end
+
+    tokens
+  end
 end