valid_email2 3.3.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b11e62f82282c1cc81c9698a17a44af5d2a0baec3dc9a1f147e8b9f6201885cd
-  data.tar.gz: 24b9024326e7f3ad965802c320901f2ecbd42cfcfc7c0b06e757f73767a6ae92
+  metadata.gz: 6e84cd1fd63d5212b95f59a0a5f690a741a359cc9b15e21ff1b2e531f13dc5df
+  data.tar.gz: d1625475d747e36ab893733330b5c5d359f059290d0c153ec6f4d3c5ad2c77f8
 SHA512:
-  metadata.gz: cbb94d6b281464231ef30464b775fcbe1d404a8651105b2fe4b488182bc3cdcce9b2140d0a24431db7570c302c85e353f16e4f4444cd4edda009645a64f54ed4
-  data.tar.gz: f5783382e56e570a02dd5abb0e7190d4f4e457a5b47e523bd21ddc4eab51fac7680811e2913e56e1db9ee1593f4c368c7f594558227ce635252c1a1e731a8484
+  metadata.gz: c5ba5da24f452053b31658e666f31e6b6ddf1607a59a2ed98b4e13f4f681838573ca8b3b02a29ecb2b8571d460cc1b7c08f96b1b59d91cdec5c02746a0774fbd
+  data.tar.gz: 1f446cae5d6ab54ad37ac56351f67519e48bf65468ebd2edc412afa8dce45d128ab2b5d0673f345eed84be61bc62300567c55b33089fc10f5d9a1c78012715b6

data/.travis.yml

@@ -3,21 +3,19 @@ language: ruby
 sudo: false
 
 rvm:
+  - 3.0
   - 2.7
   - 2.6
   - 2.5
-  - 2.4
 
 gemfile:
-  - gemfiles/activemodel3.gemfile
-  - gemfiles/activemodel4.gemfile
   - gemfiles/activemodel5.gemfile
   - gemfiles/activemodel6.gemfile
 
 jobs:
   exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/activemodel6.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/activemodel5.gemfile
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Version 3.6.1
+* Add new domain https://github.com/micke/valid_email2/pull/175
+* Pull new domains
+
+## Version 3.6.0
+* Add strict_mx validation https://github.com/micke/valid_email2/pull/173
+
+## Version 3.5.0
+* Disallow emails starting with a dot https://github.com/micke/valid_email2/pull/170
+* Add option to whitelist domains from MX check https://github.com/micke/valid_email2/pull/167
+* Remove false positives
+
+## Version 3.4.0
+* Disallow consecutive dots https://github.com/micke/valid_email2/pull/163
+* Add andyes.net https://github.com/micke/valid_email2/pull/162
+
+## Version 3.3.1
+* Fix some performance regressions (https://github.com/micke/valid_email2/pull/150)
+
 ## Version 3.3.0
 * Allow multiple addresses separated by comma (https://github.com/micke/valid_email2/pull/156)
 * Make prohibited_domain_characters_regex changeable (https://github.com/micke/valid_email2/pull/157)

data/README.md

@@ -43,10 +43,14 @@ class User < ActiveRecord::Base
 end
 ```
 
-To validate that the domain has a MX record:
+To validate that the domain has an MX record or A record:
 ```ruby
 validates :email, 'valid_email_2/email': { mx: true }
 ```
+To validate strictly that the domain has an MX record:
+```ruby
+validates :email, 'valid_email_2/email': { strict_mx: true }
+```
 
 To validate that the domain is not a disposable email (checks domain and MX server):
 ```ruby
@@ -58,11 +62,17 @@ To validate that the domain is not a disposable email (checks domain only, does
 validates :email, 'valid_email_2/email': { disposable_domain: true }
 ```
 
-To validate that the domain is not a disposable email or a disposable email but whitelisted (under config/whitelisted_email_domains.yml):
+To validate that the domain is not a disposable email or a disposable email (checks domain and MX server) but whitelisted (under config/whitelisted_email_domains.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
 ```
 
+To validate that the domain is not a disposable email or a disposable email (checks domain only, does not check MX server) but whitelisted (under config/whitelisted_email_domains.yml):
+
+```ruby
+validates :email, 'valid_email_2/email': { disposable_domain_with_whitelist: true }
+```
+
 To validate that the domain is not blacklisted (under config/blacklisted_email_domains.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { blacklist: true }
@@ -103,6 +113,7 @@ address = ValidEmail2::Address.new("lisinge@gmail.com")
 address.valid? => true
 address.disposable? => false
 address.valid_mx? => true
+address.valid_strict_mx? => true
 address.subaddressed? => false
 ```
 
@@ -114,6 +125,7 @@ Do so by adding this in your `spec_helper`:
 ```ruby
 config.before(:each) do
   allow_any_instance_of(ValidEmail2::Address).to receive(:valid_mx?).and_return(true)
+  allow_any_instance_of(ValidEmail2::Address).to receive(:valid_strict_mx?).and_return(true)
 end
 ```
 
@@ -128,11 +140,11 @@ end
 
 ## Requirements
 
-This gem requires Rails 3.2 or higher. It is tested against Rails 3, 4, 5 and 6 using:
-* Ruby-2.4
+This gem should work with Rails 3.2 or higher. It is tested against Rails 5 and 6 using:
 * Ruby-2.5
 * Ruby-2.6
 * Ruby-2.7
+* Ruby-3.0
 
 ## Upgrading to v3.0.0
 

data/config/disposable_email_domains.txt

@@ -3398,6 +3398,7 @@ androidsapps.co
 androidworld.tw
 andthen.us
 andy1mail.host
+andyes.net
 andynugraha.net
 andyyxc45.biz
 aneaproducciones.com
@@ -4173,6 +4174,7 @@ avuimkgtbgccejft901.ml
 avuimkgtbgccejft901.tk
 avumail.com
 avvmail.com
+avxrja.com
 aw.kikwet.com
 awahal0vk1o7gbyzf0.cf
 awahal0vk1o7gbyzf0.ga
@@ -5175,6 +5177,7 @@ bitwhites.top
 bitx.nl
 bitymails.us
 biuro-naprawcze.pl
+biyac.com
 biz.st
 bizalem.com
 bizalon.com
@@ -8178,6 +8181,7 @@ datauoso.com
 datawurld.com
 datazo.ca
 datchka.ru
+datenschutz.ru
 datingbio.info
 datingbit.info
 datingcloud.info
@@ -8613,6 +8617,7 @@ dietysuplementy.pl
 dieukydieuophonggiamso7.com
 diffamr.com
 diflucanrxmeds.com
+digdig.org
 digdown.xyz
 diggmail.club
 digibeat.pl
@@ -9222,6 +9227,7 @@ dsfgdsgmail.com
 dsfgdsgmail.net
 dsfgerqwexx.com
 dsgawerqw.com
+dsgvo.ru
 dshqughcoin9nazl.cf
 dshqughcoin9nazl.ga
 dshqughcoin9nazl.gq
@@ -10977,6 +10983,7 @@ familylist.ru
 familyright.ru
 familytoday.us
 fammix.com
+fanclub.pm
 fancycarnavalmasks.com
 fandamtastic.info
 fangoh.com
@@ -11327,6 +11334,7 @@ financehowtolearn.com
 financeideas.org
 financeland.com
 financetutorial.org
+finckl.com
 find-me-watch.com
 find.cy
 findbesthgh.com
@@ -11356,6 +11364,7 @@ fireflies.edu
 firemail.cc
 firemail.org.ua
 firemail.uz.ua
+firemailbox.club
 firematchvn.cf
 firematchvn.ga
 firematchvn.gq
@@ -11982,6 +11991,7 @@ fuirio.com
 fujitv.cf
 fujitv.ga
 fujitv.gq
+fukaru.com
 fukolpza.com.pl
 fuktard.co.in
 fullalts.cf
@@ -12049,6 +12059,7 @@ fuw65d.tk
 fuwa.be
 fuwa.li
 fuwamofu.com
+fuwari.be
 fux0ringduh.com
 fuzmail.info
 fvhnqf7zbixgtgdimpn.cf
@@ -12788,6 +12799,7 @@ gmailllll.ga
 gmaills.eu
 gmailmail.ga
 gmailmarina.com
+gmailnator.com
 gmailner.com
 gmailnew.com
 gmailom.co
@@ -12938,6 +12950,7 @@ golivejasmin.com
 gomail.in
 gomail.pgojual.com
 gomailbox.info
+gomaild.com
 gomaile.com
 gomailstar.xyz
 gomessage.ml
@@ -13224,6 +13237,7 @@ grr.la
 grruprkfj.pl
 grubybenekrayskiego.pl
 grubymail.com
+grugrug.ru
 grupatworczapik.pl
 gruz-m.ru
 gry-logiczne-i-liczbowe.pl
@@ -13579,6 +13593,7 @@ halkasor.com
 halofarmasi.com
 haltospam.com
 hamakdupajasia.com
+hamham.uk
 hammerdin.com
 hamsing.com
 hamtwer.biz
@@ -13812,6 +13827,7 @@ hefrent.tk
 hehesou.com
 hehmail.pl
 heihamail.com
+heisei.be
 helamakbeszesc.com
 hello.nl
 hello123.com
@@ -14162,6 +14178,7 @@ homlee.com
 homlee.mygbiz.com
 honeydresses.com
 honeydresses.net
+honeys.be
 hongfany.com
 hongpress.com
 honkimailc.info
@@ -14949,6 +14966,7 @@ ilovemyniggers.club
 ilovespam.com
 ilt.ctu.edu.gr
 iltmail.com
+iludir.com
 ilumail.com
 im-irsyad.tech
 im4ever.com
@@ -16364,6 +16382,7 @@ kadokawa.gq
 kadokawa.ml
 kadokawa.tk
 kadokawa.top
+kaengu.ru
 kafrem3456ails.com
 kaguya.tk
 kah.pw
@@ -16485,6 +16504,7 @@ kbbxowpdcpvkxmalz.tk
 kbdjvgznhslz.ga
 kbdjvgznhslz.ml
 kbdjvgznhslz.tk
+kbox.li
 kc-kenes.kz
 kc8pnm1p9.pl
 kchkch.com
@@ -18053,6 +18073,7 @@ louboutinshoessalejp.com
 louboutinshoesstoresjp.com
 louboutinshoesus.com
 louder1.bid
+loufad.com
 louis-vuitton-onlinestore.com
 louis-vuitton-outlet.com
 louis-vuitton-outletenter.com
@@ -18519,6 +18540,7 @@ magicedhardy.com
 magicmail.com
 magiconly.ru
 magicsubmitter.biz
+magim.be
 magneticmessagingbobby.com
 magnetik.com.ua
 magnomsolutions.com
@@ -19433,6 +19455,7 @@ maxmail.in
 maxmail.info
 maxpedia.ro
 maxprice.co
+maxresistance.com
 maxrollspins.co
 maxxdrv.ru
 mayaaaa.cf
@@ -19890,6 +19913,7 @@ miopaaswod.jino.ru
 mior.in
 mipodon.ga
 miraclegarciniareview.com
+mirai.re
 miraigames.net
 miranda1121.club
 mirbeauty.ru
@@ -20086,6 +20110,7 @@ mohmal.in
 mohmal.tech
 mohsenfb.com
 moijkh.com.uk
+moimoi.re
 mojastr.pl
 mojblogg.com
 mojewiki.com
@@ -20414,6 +20439,10 @@ mucincanon.com
 mudbox.ml
 muehlacker.tk
 muell.email
+muell.icu
+muell.monster
+muell.ru
+muell.xyz
 muellemail.com
 muellmail.com
 muellpost.de
@@ -22154,6 +22183,7 @@ ohmail.com
 ohtheprice.com
 ohxmail.com
 ohyesjysuis.fr
+oida.icu
 oidzc1zgxrktxdwdkxm.cf
 oidzc1zgxrktxdwdkxm.ga
 oidzc1zgxrktxdwdkxm.gq
@@ -22714,6 +22744,7 @@ oweiidfjjif.tk
 owemolexi.swiebodzin.pl
 owfcbxqhv.pl
 owh.ooo
+owleyes.ch
 owlpic.com
 owlymail.com
 own-tube.com
@@ -24591,6 +24622,7 @@ quintalaescondida.com
 quintania.top
 quitsmokinghelpfulguide.net
 quitsmokingmanyguides.net
+quossum.com
 ququb.com
 quuradminb.com
 quxppnmrn.pl
@@ -26124,6 +26156,7 @@ scannerchip.com
 scatmail.com
 scay.net
 scbox.one.pl
+schabernack.ru
 schachrol.com
 schackmail.com
 schafmail.de
@@ -26307,6 +26340,7 @@ segundamanozi.net
 seierra.com
 seishel-nedv.ru
 sejaa.lv
+sejkt.com
 sekcjajudo.pl
 sekoeuropa.pl
 selectam.ru
@@ -26744,6 +26778,7 @@ sify.com
 sign-up.website
 signaturefencecompany.com
 signings.ru
+sika3.com
 sikdar.site
 sikis18.org
 sikomo.cf
@@ -27632,6 +27667,7 @@ statusers.com
 statuspage.ga
 statx.ga
 stayfitforever.org
+stayhome.li
 stealbest.com
 stealthapps.org
 stealthypost.org
@@ -27880,6 +27916,7 @@ sumberkadalnya.com
 sumitra.ga
 sumitra.tk
 summerswimwear.info
+sumwan.com
 sunbuh.asia
 sunburning.ru
 sundaysuspense.space
@@ -28257,6 +28294,7 @@ tapchicuoihoi.com
 tapetoland.pl
 tapety-download.pl
 taphear.com
+tapi.re
 tapsitoaktl353t.ga
 tar00ih60tpt2h7.cf
 tar00ih60tpt2h7.ga
@@ -29162,6 +29200,7 @@ tomsshoesoutlet2u.com
 tomthen.org.ua
 tomymailpost.com
 tonermix.ru
+tonne.to
 tonngokhong.vn
 tonno.cf
 tonno.gq
@@ -29519,6 +29558,7 @@ tridalinbox.info
 triedbook.xyz
 trillianpro.com
 trimsj.com
+tripaco.com
 triparish.net
 tripolis.com
 tristanabestolaf.com
@@ -30315,6 +30355,7 @@ usamail.com
 usaonline.biz
 usapurse.com
 usareplicawatch.com
+usbc.be
 usbdirect.ca
 usbgadgetsusage.info
 usbmicrophone.org.uk
@@ -30738,6 +30779,7 @@ viagrawithoutadoctorprescription777.bid
 viajando.net
 viano.com
 viantakte.ru
+viatokyo.jp
 vibi4f1pc2xjk.cf
 vibi4f1pc2xjk.ga
 vibi4f1pc2xjk.gq
@@ -31026,7 +31068,6 @@ voyagebirmanie.net
 voyancegratuite10min.com
 voyeurseite.info
 vozmivtop.ru
-vp.com
 vp.ycare.de
 vpanel.ru
 vpc608a0.pl
@@ -31064,6 +31105,7 @@ vpstrk.com
 vr5gpowerv.com
 vradportal.com
 vraskrutke.biz
+vreagles.com
 vreeland.agencja-csk.pl
 vreemail.com
 vremonte24-store.ru
@@ -31423,7 +31465,6 @@ webcontact-france.eu
 webcool.club
 webdesign-guide.info
 webdesign-romania.net
-webdesignspecialist.com.au
 webdesigrsbio.gr
 webdespro.ru
 webdev-pro.ru
@@ -31539,6 +31580,7 @@ welleveningdress.net
 welleveningdresses.com
 welleveningdresses.net
 wellhungup.dynu.net
+wellick.ru
 wellnessintexas.info
 wellpromdresses.com
 wellpromdresses.net
@@ -31656,6 +31698,7 @@ wherenever.tk
 wheretoget-backlinks.com
 which-code.com
 whiffles.org
+whipjoy.com
 whiplashh.com
 whiskey.xray.ezbunko.top
 whiskeyalpha.webmailious.top
@@ -32328,6 +32371,7 @@ xdvsagsdg4we.ga
 xe2g.com
 xeames.net
 xeb9xwp7.tk
+xedmi.com
 xemaps.com
 xemne.com
 xenacareholdings.com
@@ -32378,6 +32422,7 @@ xhkss.net
 xijjfjoo.turystyka.pl
 xilopro.com
 xilor.com
+ximtyl.com
 xinbo.info
 xinbox.info
 xinfi.com.pl
@@ -32864,6 +32909,8 @@ yeamail.info
 yeastinfectionnomorenow.com
 yedi.org
 yeeeou.org.ua
+yeezus.ru
+yehudabx.com
 yejdnp45ie1to.cf
 yejdnp45ie1to.ga
 yejdnp45ie1to.gq
@@ -33101,6 +33148,7 @@ youtube2vimeo.info
 youveo.ch
 youwatchmovie.com
 youzend.net
+ype68.com
 ypmail.webarnak.fr.eu.org
 yppm0z5sjif.ga
 yppm0z5sjif.gq
@@ -33318,6 +33366,9 @@ zbtxx4iblkgp0qh.ga
 zbtxx4iblkgp0qh.gq
 zbtxx4iblkgp0qh.ml
 zbtxx4iblkgp0qh.tk
+zcai55.com
+zcai66.com
+zcai77.com
 zcash-cloud.com
 zchatz.ga
 zcqrgaogm.pl
@@ -33340,6 +33391,7 @@ zebra.email
 zebua.cf
 zebuaboy.cf
 zebuasadis.ml
+zefara.com
 zehnminuten.de
 zehnminutenmail.de
 zeinconsulting.info
@@ -33385,6 +33437,7 @@ zetfilmy.pl
 zetia.in
 zetmail.com
 zettransport.pl
+zevars.com
 zeveyuse.com
 zeveyuse.net
 zexeet9i5l49ocke.cf

data/lib/valid_email2.rb

@@ -7,23 +7,35 @@ module ValidEmail2
   WHITELIST_FILE  = "config/whitelisted_email_domains.yml"
   DISPOSABLE_FILE = File.expand_path('../config/disposable_email_domains.txt', __dir__)
 
-  def self.disposable_emails
-    @disposable_emails ||= File.open(DISPOSABLE_FILE){ |f| f.read }.split("\n")
-  end
+  class << self
+    def disposable_emails
+      @disposable_emails ||= load_file(DISPOSABLE_FILE)
+    end
 
-  def self.blacklist
-    @blacklist ||= if File.exist?(BLACKLIST_FILE)
-                     YAML.load_file(File.expand_path(BLACKLIST_FILE))
-                   else
-                     []
-                   end
-  end
+    def blacklist
+      @blacklist ||= load_if_exists(BLACKLIST_FILE)
+    end
+
+    def whitelist
+      @whitelist ||= load_if_exists(WHITELIST_FILE)
+    end
+
+    private
+
+    def load_if_exists(path)
+      File.exist?(path) ? load_file(path) : Set.new
+    end
 
-  def self.whitelist
-    @whitelist ||= if File.exist?(WHITELIST_FILE)
-                     YAML.load_file(File.expand_path(WHITELIST_FILE))
-                   else
-                     []
-                   end
+    def load_file(path)
+      # This method MUST return a Set, otherwise the
+      # performance will suffer!
+      if path.end_with?(".yml")
+        Set.new(YAML.load_file(path))
+      else
+        File.open(path, "r").each_line.each_with_object(Set.new) do |domain, set|
+          set << domain.tap(&:chomp!)
+        end
+      end
+    end
   end
 end

data/lib/valid_email2/address.rb

@@ -32,25 +32,22 @@ module ValidEmail2
     end
 
     def valid?
-      @valid ||= begin
-        return false if @parse_error
+      return @valid unless @valid.nil?
+      return false  if @parse_error
 
+      @valid = begin
         if address.domain && address.address == @raw_address
           domain = address.domain
 
           domain !~ self.class.prohibited_domain_characters_regex &&
-            # Domain needs to have at least one dot
-            domain =~ /\./ &&
-            # Domain may not have two consecutive dots
-            domain !~ /\.{2,}/ &&
-            # Domain may not start with a dot
-            domain !~ /^\./ &&
-            # Domain may not start with a dash
-            domain !~ /^-/ &&
-            # Domain name may not end with a dash
-            domain !~ /-\./ &&
-            # Address may not contain a dot directly before @
-            address.address !~ /\.@/
+            domain.include?('.') &&
+            !domain.include?('..') &&
+            !domain.start_with?('.') &&
+            !domain.start_with?('-') &&
+            !domain.include?('-.') &&
+            !address.local.include?('..') &&
+            !address.local.end_with?('.') &&
+            !address.local.start_with?('.')
         else
           false
         end
@@ -70,7 +67,7 @@ module ValidEmail2
     end
 
     def disposable_domain?
-      valid? && domain_is_in?(ValidEmail2.disposable_emails)
+      domain_is_in?(ValidEmail2.disposable_emails)
     end
 
     def disposable_mx_server?
@@ -88,6 +85,12 @@ module ValidEmail2
     def valid_mx?
       return false unless valid?
 
+      mx_or_a_servers.any?
+    end
+
+    def valid_strict_mx?
+      return false unless valid?
+
       mx_servers.any?
     end
 
@@ -122,7 +125,12 @@ module ValidEmail2
 
     def mx_servers
       @mx_servers ||= Resolv::DNS.open do |dns|
-        mx_servers = dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
+        dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
+      end
+    end
+
+    def mx_or_a_servers
+      @mx_or_a_servers ||= Resolv::DNS.open do |dns|
         (mx_servers.any? && mx_servers) ||
           dns.getresources(address.domain, Resolv::DNS::Resource::IN::A)
       end

data/lib/valid_email2/email_validator.rb

@@ -5,7 +5,7 @@ require "active_model/validations"
 module ValidEmail2
   class EmailValidator < ActiveModel::EachValidator
     def default_options
-      { regex: true, disposable: false, mx: false, disallow_subaddressing: false, multiple: false }
+      { regex: true, disposable: false, mx: false, strict_mx: false, disallow_subaddressing: false, multiple: false }
     end
 
     def validate_each(record, attribute, value)
@@ -37,6 +37,10 @@ module ValidEmail2
         error(record, attribute) && return if addresses.any? { |address| address.disposable? && !address.whitelisted? }
       end
 
+      if options[:disposable_domain_with_whitelist]
+        error(record, attribute) && return if addresses.any? { |address| address.disposable_domain? && !address.whitelisted? }
+      end
+
       if options[:blacklist]
         error(record, attribute) && return if addresses.any?(&:blacklisted?)
       end
@@ -44,6 +48,10 @@ module ValidEmail2
       if options[:mx]
         error(record, attribute) && return unless addresses.all?(&:valid_mx?)
       end
+
+      if options[:strict_mx]
+        error(record, attribute) && return unless addresses.all?(&:valid_strict_mx?)
+      end
     end
 
     def error(record, attribute)

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "3.3.0"
+  VERSION = "3.6.1"
 end

data/pull_mailchecker_emails.rb

@@ -8,7 +8,7 @@ require "net/http"
 whitelisted_emails = %w(
   onet.pl poczta.onet.pl fastmail.fm hushmail.com
   hush.ai hush.com hushmail.me naver.com qq.com example.com
-  yandex.net gmx.com gmx.es
+  yandex.net gmx.com gmx.es webdesignspecialist.com.au vp.com
 )
 
 existing_emails = File.open("config/disposable_email_domains.txt") { |f| f.read.split("\n") }

data/spec/benchmark_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Performance testing" do
+  let(:disposable_domain) { ValidEmail2.disposable_emails.first }
+
+  it "has acceptable lookup performance" do
+    address = ValidEmail2::Address.new("test@example.com")
+
+    # preload list and check size
+    expect(ValidEmail2.disposable_emails).to be_a(Set)
+    expect(ValidEmail2.disposable_emails.count).to be > 30000
+
+    # check lookup timing
+    expect { address.disposable_domain? }.to perform_under(0.0001).sample(10).times
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,15 @@
 $:.unshift File.expand_path("../lib",__FILE__)
 require "valid_email2"
 
+# Include and configure  benchmark
+require 'rspec-benchmark'
+RSpec.configure do |config|
+  config.include RSpec::Benchmark::Matchers
+end
+RSpec::Benchmark.configure do |config|
+  config.disable_gc = true
+end
+
 class TestModel
   include ActiveModel::Validations
 

data/spec/valid_email2_spec.rb

@@ -19,6 +19,10 @@ class TestUserMX < TestModel
   validates :email, 'valid_email_2/email': { mx: true }
 end
 
+class TestUserStrictMX < TestModel
+  validates :email, 'valid_email_2/email': { strict_mx: true }
+end
+
 class TestUserDisallowDisposable < TestModel
   validates :email, 'valid_email_2/email': { disposable: true }
 end
@@ -31,6 +35,10 @@ class TestUserDisallowDisposableWithWhitelist < TestModel
   validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
 end
 
+class TestUserDisallowDisposableDomainWithWhitelist < TestModel
+  validates :email, 'valid_email_2/email': { disposable_domain_with_whitelist: true }
+end
+
 class TestUserDisallowBlacklisted < TestModel
   validates :email, 'valid_email_2/email': { blacklist: true }
 end
@@ -87,13 +95,23 @@ describe ValidEmail2 do
       expect(user.valid?).to be_falsey
     end
 
-    it "is invalid if the domain contains emoticons" do
-      user = TestUser.new(email: "foo🙈@gmail.com")
-      expect(user.valid?).to be_falsy
+    it "is invalid if the address contains consecutive dots" do
+      user = TestUser.new(email: "foo..bar@gmail.com")
+      expect(user.valid?).to be_falsey
+    end
+
+    it "is invalid if the address starts with a dot" do
+      user = TestUser.new(email: ".foo@bar.com")
+      expect(user.valid?).to be_falsey
     end
 
-    it "is invalid if the domain contains .@ consecutively" do
-      user = TestUser.new(email: "foo.@gmail.com")
+    it "is invalid if the local part of the address ends with a dot" do
+      user = TestUser.new(email: "foo.@bar.com")
+      expect(user.valid?).to be_falsey
+    end
+
+    it "is invalid if the email contains emoticons" do
+      user = TestUser.new(email: "foo🙈@gmail.com")
       expect(user.valid?).to be_falsy
     end
 
@@ -170,8 +188,18 @@ describe ValidEmail2 do
       let(:whitelist_domain) { disposable_domain }
       let(:whitelist_file_path) { "config/whitelisted_email_domains.yml" }
 
+      # Some of the specs below need to explictly set the whitelist var or it 
+      # may be cached to an empty set
+      def set_whitelist
+        ValidEmail2.instance_variable_set(
+          :@whitelist, 
+          ValidEmail2.send(:load_if_exists, ValidEmail2::WHITELIST_FILE)
+        )
+      end
+
       after do
         FileUtils.rm(whitelist_file_path, force: true)
+        set_whitelist
       end
 
       it "is invalid if the domain is disposable and not in the whitelist" do
@@ -181,9 +209,22 @@ describe ValidEmail2 do
 
       it "is valid if the domain is disposable but in the whitelist" do
         File.open(whitelist_file_path, "w") { |f| f.write [whitelist_domain].to_yaml }
+        set_whitelist
         user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{whitelist_domain}")
+        expect(user.valid?).to be_truthy
+      end
+
+      it "is invalid if the domain is a disposable_domain and not in the whitelist" do
+        user = TestUserDisallowDisposableDomainWithWhitelist.new(email: "foo@#{whitelist_domain}")
         expect(user.valid?).to be_falsey
       end
+
+      it "is valid if the domain is a disposable_domain but in the whitelist" do
+        File.open(whitelist_file_path, "w") { |f| f.write [whitelist_domain].to_yaml }
+        set_whitelist
+        user = TestUserDisallowDisposableDomainWithWhitelist.new(email: "foo@#{whitelist_domain}")
+        expect(user.valid?).to be_truthy
+      end
     end
   end
 
@@ -216,6 +257,23 @@ describe ValidEmail2 do
     end
   end
 
+  describe "with strict mx validation" do
+    it "is valid if mx records are found" do
+      user = TestUserStrictMX.new(email: "foo@gmail.com")
+      expect(user.valid?).to be_truthy
+    end
+
+    it "is invalid if A records are found but no mx records are found" do
+      user = TestUserStrictMX.new(email: "foo@ghs.google.com")
+      expect(user.valid?).to be_falsey
+    end
+
+    it "is invalid if no mx records are found" do
+      user = TestUserStrictMX.new(email: "foo@subdomain.gmail.com")
+      expect(user.valid?).to be_falsey
+    end
+  end
+
   describe "with dotted validation" do
     it "is valid when address does not contain dots" do
       user = TestUserDotted.new(email: "johndoe@gmail.com")

data/valid_email2.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "pry"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 3.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +134,7 @@ files:
 - lib/valid_email2/email_validator.rb
 - lib/valid_email2/version.rb
 - pull_mailchecker_emails.rb
+- spec/benchmark_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb
 - valid_email2.gemspec
@@ -142,11 +157,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email
   blacklist
 test_files:
+- spec/benchmark_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb