email_assessor 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28e8db711b1571f9f105f0e341b8798bf557edcdd21bfa9af93b97a2fc6e7989
-  data.tar.gz: 697a161767368eed35a1cf12eaca2fc9c129b6e27f4ab48a4bd07362597a678c
+  metadata.gz: 8b030fd55305340114adc5f313d216c398b15097ed82d97c1ae19ab29a8bb371
+  data.tar.gz: f28a6570204c3af6fa87ddf9ed4954b6ae2f03e53f30d74ccbdaeb1316424c63
 SHA512:
-  metadata.gz: ac12ac0944a707a72b3d7f507b016c0d4dad6cd3cd924c1f229178e8dd806cff1e2bdf4eca887566c2271c15ea4a9210f02b2f6e24e26d768c85e47e73104fdb
-  data.tar.gz: fd148a7343b485d42f320c0e7fcc2265a636f2973faacf3e928d5315c39e8b909c970809c6ebd07b3d929484a2239b33be3c7b2bb38ef0aeb0bd3648e2288db4
+  metadata.gz: a6e6cdf6bc76dcd825ab27f721b489b54143d08fb1dc692c9727afa11bbef658fa678135be3bd0803e0e986789aee8a9a74a240ba7b1154c094d876ca154aa07
+  data.tar.gz: 0b8c0b930ba5c0e9a26afb30a6f142336782db311a0ea6ca36476c288f717143c443045a54c3357a711c875ede73995be16c8966d948f4d2fd646278691b4e99

data/lib/email_assessor/address.rb

@@ -111,11 +111,23 @@ module EmailAssessor
     end
 
     def disposable?
-      valid? && EmailAssessor.domain_is_disposable?(address.domain)
+      domain_in_file?(EmailAssessor::DISPOSABLE_DOMAINS_FILE_NAME)
     end
 
     def blacklisted?
-      valid? && EmailAssessor.domain_is_blacklisted?(address.domain)
+      domain_in_file?(EmailAssessor::BLACKLISTED_DOMAINS_FILE_NAME)
+    end
+
+    def educational?
+      domain_in_file?(EmailAssessor::EDUCATIONAL_DOMAINS_FILE_NAME)
+    end
+
+    def fastpass?
+      domain_in_file?(EmailAssessor::FASTPASS_DOMAINS_FILE_NAME)
+    end
+
+    def domain_in_file?(filename)
+      valid? && EmailAssessor.domain_in_file?(address.domain, filename)
     end
 
     def valid_mx?

data/lib/email_assessor/email_validator.rb

@@ -5,31 +5,74 @@ require "active_model/validations"
 
 class EmailValidator < ActiveModel::EachValidator
   def default_options
-    { regex: true, disposable: false, mx: false }
+    { regex: true, disposable: false, mx: false, fastpass: true }
   end
 
   def validate_each(record, attribute, value)
     return unless value.present?
-    options = default_options.merge(self.options)
+
+    options = default_options.merge!(self.options)
 
     address = EmailAssessor::Address.new(value)
 
     error(record, attribute) && return unless address.valid?
 
+    # Skip all domain blocklist checks for fastpass domains.
+    # The goal is to skip needless validation for common "good" domains such as Gmail, Yahoo, and Outlook.
+    # The fastpass domain list is configurable via vendor/fastpass_domains.txt
+    validate_domain(record, attribute, address, options) unless options[:fastpass] && address.fastpass?
+
+    # Exit early if validate_domain found a validation error
+    return if record.errors.key?(attribute)
+
+    if options[:mx]
+      error(record, attribute, error_type(:mx, options)) && return unless address.valid_mx?
+    end
+  end
+
+  private
+
+  def error(record, attribute, type = options[:message] || :invalid)
+    record.errors.add(attribute, type)
+  end
+
+  def error_type(validator, options)
+    option_value = options[validator]
+
+    if option_value.is_a?(String) || option_value.is_a?(Symbol)
+      return option_value
+    end
+
+    options[:message] || :invalid
+  end
+
+  def validate_domain(record, attribute, address, options)
     if options[:disposable]
-      error(record, attribute) && return if address.disposable?
+      error(record, attribute, error_type(:disposable, options)) && return if address.disposable?
     end
 
     if options[:blacklist]
-      error(record, attribute) && return if address.blacklisted?
+      error(record, attribute, error_type(:blacklist, options)) && return if address.blacklisted?
     end
 
-    if options[:mx]
-      error(record, attribute) && return unless address.valid_mx?
+    if options[:educational]
+      error(record, attribute, error_type(:educational, options)) && return if address.educational?
     end
-  end
 
-  def error(record, attribute)
-    record.errors.add(attribute, options[:message] || :invalid)
+    # if options[:domain_not_in]
+    #   matched_blocklist = options[:domain_not_in].select do |entry|
+    #     unless entry.key?(:blocklist)
+    #       fail "domain_not_in entries must be in format { blocklist: \"filename\"[, message: symbol|string] }"
+    #     end
+
+    #     next unless address.domain_in_blocklist?(entry[:blocklist])
+
+    #     error(record, attribute, entry[:message])
+
+    #     true
+    #   end
+
+    #   return if matched_blocklist
+    # end
   end
 end

data/lib/email_assessor/version.rb

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

data/lib/email_assessor.rb

@@ -3,6 +3,8 @@ require "email_assessor/email_validator"
 
 module EmailAssessor
   DISPOSABLE_DOMAINS_FILE_NAME = File.expand_path("../../vendor/disposable_domains.txt", __FILE__)
+  FASTPASS_DOMAINS_FILE_NAME = File.expand_path("../../vendor/fastpass_domains.txt", __FILE__)
+  EDUCATIONAL_DOMAINS_FILE_NAME = File.expand_path("../../vendor/educational_domains.txt", __FILE__)
   BLACKLISTED_DOMAINS_FILE_NAME = File.expand_path("vendor/blacklisted_domains.txt")
 
   def self.domain_is_disposable?(domain)

data/spec/email_assessor_spec.rb

@@ -17,10 +17,15 @@ class TestUserDisallowBlacklisted < TestModel
   validates :email, email: { blacklist: true }
 end
 
+class TestUserDisallowEducational < TestModel
+  validates :email, email: { educational: :no_educational }
+end
+
 describe EmailAssessor do
   let(:plain_user) { TestUser.new(email: "") }
   let(:disposable_user) { TestUserDisallowDisposable.new(email: "foo@gmail.com") }
   let(:blacklist_user) { TestUserDisallowBlacklisted.new(email: "foo@gmail.com") }
+  let(:educational_user) { TestUserDisallowEducational.new(email: "foo@gmail.com") }
   let(:mx_user) { TestUserMX.new(email: "foo@gmail.com") }
 
   let(:blacklisted_domains_file_name) { described_class::BLACKLISTED_DOMAINS_FILE_NAME }
@@ -29,6 +34,9 @@ describe EmailAssessor do
   let(:disposable_domains_file_name) { described_class::DISPOSABLE_DOMAINS_FILE_NAME }
   let(:disposable_domain) { File.open(disposable_domains_file_name, &:readline).chomp }
 
+  let(:educational_domains_file_name) { described_class::EDUCATIONAL_DOMAINS_FILE_NAME }
+  let(:educational_domain) { File.open(educational_domains_file_name, &:readline).chomp }
+
   describe "basic validation" do
     subject(:user) { plain_user }
 
@@ -161,6 +169,31 @@ describe EmailAssessor do
     end
   end
 
+  describe "educational domains" do
+    subject(:user) { educational_user }
+
+    it "is valid when email domain is not in the educational blocklist" do
+      is_expected.to be_valid
+    end
+
+    it "is invalid when email domain is in the educational blocklist" do
+      user.email = "foo@#{educational_domain}"
+      is_expected.to be_invalid
+    end
+
+    it "is invalid when email is in the educational blocklist regardless of case" do
+      user.email = "foo@#{educational_domain.upcase}"
+      is_expected.to be_invalid
+    end
+
+    it "is invalid when email domain is in the educational blocklist regardless of subdomain" do
+      user.email = "foo@abc123.#{educational_domain}"
+      is_expected.to be_invalid
+      expect(user.errors.added?(:email, :no_educational)).to be_truthy
+    end
+  end
+
+
   describe "mx lookup" do
     subject(:user) { mx_user }