valid_email2 3.0.5 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3579df33c2e2b6f61deb537f9b53429419c8e3eeee9c2f7983c73587b7831d4e
-  data.tar.gz: a8438e557f74f5ca789e1d45de65a2e7202232f9b69b34d4639946f55eb504bc
+  metadata.gz: 6b1b27babaa4cb566d2b63dc25f726f534ad05fb9364d21c52c44c775ce12218
+  data.tar.gz: 735df3dc625cebce4bda35547a4d3b6e8e558fc2133872c8b678e51a4891c073
 SHA512:
-  metadata.gz: f1a23d4278a946a56bb105839a3b4b6e4cc87830d160d7ca7ed6c82e3ae28638be3d6eb0868af73862cd0819099f36163eb42c5496ffd066c16cd547271fd907
-  data.tar.gz: 9c513901af108ac87275cb162eb832be8205c095b2da12486c67f479e08fdc5c113129c7dc2432058c2a4e88c487ad70fee44af87f2fa27f1cb33ff3fbb4abf8
+  metadata.gz: f4d6da63e2f4f1894605a1b83f0c92300d8fe3d8a558d09f670d890d38ef3efbf3f59dfdd49f1bda9696ddad73c0ee5b9fd33ca742f7293524cb29e83c96b57f
+  data.tar.gz: e74ea532d0510bdd0c9c8ddcc53e88aebc384d3ea4bafe475c28a754518f90103873c814134acb2cc942720a5f889ff349a142b5164e842d81bc67a08816ce1a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 3.1.0
+* Performance improvements https://github.com/micke/valid_email2/pull/137
+
 ## Version 3.0.5
 * Addresses with a dot before the @ is not valid https://github.com/micke/valid_email2/pull/136
 

data/lib/valid_email2.rb

@@ -7,14 +7,14 @@ module ValidEmail2
   WHITELIST_FILE = "config/whitelisted_email_domains.yml"
 
   def self.disposable_emails
-    @disposable_emails ||= YAML.load_file(
+    @disposable_emails ||= load_file(
       File.expand_path('../config/disposable_email_domains.yml', __dir__)
     )
   end
 
   def self.blacklist
     @blacklist ||= if File.exist?(BLACKLIST_FILE)
-                     YAML.load_file(File.expand_path(BLACKLIST_FILE))
+                     load_file(File.expand_path(BLACKLIST_FILE))
                    else
                      []
                    end
@@ -22,9 +22,13 @@ module ValidEmail2
 
   def self.whitelist
     @whitelist ||= if File.exist?(WHITELIST_FILE)
-                     YAML.load_file(File.expand_path(WHITELIST_FILE))
+                     load_file(File.expand_path(WHITELIST_FILE))
                    else
                      []
                    end
   end
+
+  def self.load_file(path)
+    Set.new(YAML.load_file(path))
+  end
 end

data/lib/valid_email2/address.rb

@@ -72,9 +72,12 @@ module ValidEmail2
 
     def domain_is_in?(domain_list)
       address_domain = address.domain.downcase
-      domain_list.any? { |domain|
-        address_domain.end_with?(domain) && address_domain =~ /\A(?:.+\.)*?#{domain}\z/
-      }
+      return true if domain_list.include?(address_domain)
+
+      i = address_domain.index('.')
+      return false unless i
+
+      return domain_list.include?(address_domain[(i+1)..-1])
     end
 
     def mx_server_is_in?(domain_list)

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "3.0.5"
+  VERSION = "3.1.0"
 end

data/spec/valid_email2_spec.rb

@@ -31,6 +31,9 @@ class TestUserMessage < TestModel
 end
 
 describe ValidEmail2 do
+
+  let(:disposable_domain) { ValidEmail2.disposable_emails.first }
+
   describe "basic validation" do
     subject(:user) { TestUser.new(email: "") }
 
@@ -88,13 +91,18 @@ describe ValidEmail2 do
       expect(user.valid?).to be_truthy
     end
 
+    it "is valid if it just ends with a disposable domain" do
+      user = TestUserDisallowDisposable.new(email: "foo@nondisposable-0-mail.com")
+      expect(user.valid?).to be_truthy
+    end
+
     it "is invalid if it's a disposable email" do
-      user = TestUserDisallowDisposable.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
+      user = TestUserDisallowDisposable.new(email: "foo@#{disposable_domain}")
       expect(user.valid?).to be_falsey
     end
 
     it "is invalid if the domain is a subdomain of a disposable domain" do
-      user = TestUserDisallowDisposable.new(email: "foo@bar.#{ValidEmail2.disposable_emails.first}")
+      user = TestUserDisallowDisposable.new(email: "foo@bar.#{disposable_domain}")
       expect(user.valid?).to be_falsey
     end
 
@@ -119,7 +127,7 @@ describe ValidEmail2 do
     end
 
     describe "with whitelisted emails" do
-      let(:whitelist_domain) { ValidEmail2.disposable_emails.first }
+      let(:whitelist_domain) { disposable_domain }
       let(:whitelist_file_path) { "config/whitelisted_email_domains.yml" }
 
       after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler