valid_email2 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e4a4d583c6ad8a5e3758c5dcb287616283dec67992ee006168697b80b092d8
-  data.tar.gz: 14a322e79fbe29504b89a25f5cab6667ed61e82379f35f440ea1c6f93c36dd66
+  metadata.gz: b11e62f82282c1cc81c9698a17a44af5d2a0baec3dc9a1f147e8b9f6201885cd
+  data.tar.gz: 24b9024326e7f3ad965802c320901f2ecbd42cfcfc7c0b06e757f73767a6ae92
 SHA512:
-  metadata.gz: 58de91a219767f5f27a5d8edd7d9eaa6a8cf65c614f00ea687acbf383b45d98158f5208f7dcd46f4d4a5ff7295ae28700dfa10c922707c50d8f460ea2257f53e
-  data.tar.gz: 9069d8f4b4f002e4464433daa648457400ff90c844bec3613305920d87964bdcb4124af4a5cb36b68d0bdfeb53937f9ffb990370a788e8848f7065fc149c136d
+  metadata.gz: cbb94d6b281464231ef30464b775fcbe1d404a8651105b2fe4b488182bc3cdcce9b2140d0a24431db7570c302c85e353f16e4f4444cd4edda009645a64f54ed4
+  data.tar.gz: f5783382e56e570a02dd5abb0e7190d4f4e457a5b47e523bd21ddc4eab51fac7680811e2913e56e1db9ee1593f4c368c7f594558227ce635252c1a1e731a8484

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 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)
+
+## Version 3.2.5
+* Remove false positives
+* Pull new domains
+
+## Version 3.2.4
+* Remove false positives
+
+## Version 3.2.3
+* Disallow backtick (\`) in domain
+* https://github.com/micke/valid_email2/pull/152
+* https://github.com/micke/valid_email2/pull/151
+
+## Version 3.2.2
+* Disallow quote (') in domain
+
 ## Version 3.2.1
 * Fix loading of blacklisted domains
 

data/README.md

@@ -4,7 +4,7 @@
 
 Validate emails with the help of the `mail` gem instead of some clunky regexp.
 Aditionally validate that the domain has a MX record.
-Optionally validate against a static [list of disposable email services](config/disposable_email_domains.yml).
+Optionally validate against a static [list of disposable email services](config/disposable_email_domains.txt).
 Optionally validate that the email is not subaddressed ([RFC5233](https://tools.ietf.org/html/rfc5233)).
 
 ### Why?
@@ -83,6 +83,11 @@ To validate create your own custom message:
 validates :email, 'valid_email_2/email': { message: "is not a valid email" }
 ```
 
+To allow multiple addresses separated by comma:
+```ruby
+validates :email, 'valid_email_2/email': { multiple: true }
+```
+
 All together:
 ```ruby
 validates :email, 'valid_email_2/email': { mx: true, disposable: true, disallow_subaddressing: true}

data/config/disposable_email_domains.txt

@@ -4181,6 +4181,9 @@ awahal0vk1o7gbyzf0.ml
 awahal0vk1o7gbyzf0.tk
 awatum.de
 awca.eu
+awdrt.com
+awdrt.net
+awdrt.org
 aweather.ru
 aweightlossguide.com
 awemail.com
@@ -4672,6 +4675,7 @@ beaniemania.net
 beanlignt.com
 bearegone.pro
 bearsarefuzzy.com
+beastmail.email
 beastrapleaks.blogspot.com
 beatelse.com
 beats-rock.com
@@ -7862,6 +7866,7 @@ cungmuachungnhom.com
 cungsuyngam.com
 cungtam.com
 cuoiz.com
+cuoly.com
 cuongvumarketingseo.com
 cupf6mdhtujxytdcoxh.cf
 cupf6mdhtujxytdcoxh.ga
@@ -9768,7 +9773,6 @@ edu.auction
 edu.dmtc.dev
 edu.hstu.eu.org
 edu.my
-edu.sg
 eduanswer.ru
 education.eu
 educationleaders-ksa.com
@@ -10118,6 +10122,7 @@ emailme.win
 emailmenow.info
 emailmiser.com
 emailmobile.net
+emailmonkey.club
 emailmynn.com
 emailmysr.com
 emailna.co
@@ -10347,6 +10352,7 @@ eo-z.com
 eoffice.top
 eomail.com
 eonmech.com
+eoopy.com
 eorbs.com
 eos2mail.com
 eotoplenie.ru
@@ -11396,6 +11402,8 @@ fitnessjockey.org
 fitnessmojo.org
 fitnessreviewsonline.com
 fitnesszbyszko.pl
+fitschool.be
+fitschool.space
 fittinggeeks.pl
 fitzgeraldforjudge.com
 five-club.com
@@ -12822,10 +12830,8 @@ gmmx.com
 gmojl.com
 gmsdfhail.com
 gmssail.com
-gmx.com
 gmx.dns-cloud.net
 gmx.dnsabr.com
-gmx.es
 gmx.fr.nf
 gmx1mail.top
 gmxip8vet5glx2n9ld.cf
@@ -15034,6 +15040,7 @@ inboxmail.world
 inboxmails.co
 inboxmails.net
 inboxproxy.com
+inboxsecure.info
 inboxstore.me
 incarnal.pl
 incestry.co.uk
@@ -15177,6 +15184,7 @@ instaindofree.com
 instaku-media.com
 instambox.com
 instance-email.com
+instant-email.org
 instant-job.com
 instant-mail.de
 instantblingmail.info
@@ -17263,6 +17271,7 @@ labas.com
 labetteraverouge.at
 labfortyone.tk
 labo.ch
+labomail.pro
 laboratortehnicadentara.ro
 laboriously.com
 labum.com
@@ -18795,6 +18804,7 @@ mailbox92.biz
 mailboxheaven.info
 mailboxint.info
 mailboxlife.net
+mailboxok.club
 mailboxonline.org
 mailboxrental.org
 mailboxxx.net
@@ -18984,6 +18994,7 @@ mailloading.com
 maillotdefoot.com
 mailly.xyz
 mailman.com
+mailmanbox.com
 mailmassa.info
 mailmate.com
 mailme.gq
@@ -19024,6 +19035,7 @@ mailnowapp.com
 mailnull.com
 mailo.cf
 mailo.tk
+mailolo.info
 mailonaut.com
 mailondandan.com
 mailone.es.vu
@@ -19054,6 +19066,7 @@ mailproxy.gm9.com
 mailpts.com
 mailpuppet.tk
 mailquack.com
+mailquack.info
 mailraccoon.com
 mailrard01.ga
 mailrazer.com
@@ -21561,6 +21574,7 @@ nomail.ga
 nomail.net
 nomail.nodns.xyz
 nomail.pw
+nomail.top
 nomail.xl.cx
 nomail2me.com
 nomailthankyou.com
@@ -23839,6 +23853,7 @@ privateclosets.com
 privateinvest.me
 privatemail.in
 privatemailinator.nl
+privateme.site
 privatemitel.cf
 privatemitel.ml
 privatesent.tk
@@ -23914,6 +23929,7 @@ prolagu.pro
 prolifepowerup.com
 promail.net
 promail.site
+promailerapp.com
 promails.xyz
 promdresses-short.com
 promenadahotel.pl
@@ -26757,6 +26773,7 @@ simple-mail-server.bid
 simplebox.email
 simpleemail.in
 simpleemail.info
+simpleinboxer.site
 simpleitsecurity.info
 simplemail.in
 simplemail.top
@@ -28469,6 +28486,7 @@ tempemailaddress.com
 tempemails.io
 tempinbox.co.uk
 tempinbox.com
+tempinbox.xyz
 tempm.cf
 tempm.com
 tempm.ga
@@ -29585,6 +29603,9 @@ tsukushiakihito.gq
 tt2dx90.com
 ttbbc.com
 ttdfytdd.ml
+ttirv.com
+ttirv.net
+ttirv.org
 ttoubdzlowecm7i2ua8.cf
 ttoubdzlowecm7i2ua8.ga
 ttoubdzlowecm7i2ua8.gq
@@ -30251,6 +30272,7 @@ url.gen.in
 urleur.com
 urltc.com
 urlwave.org
+urmailman.com
 urodzinydlaadzieci.pl
 uroetueptriwe.cz.cc
 uroid.com
@@ -32774,7 +32796,6 @@ yammyshop.com
 yandere.cu.cc
 yandex.ca
 yandex.comx.cf
-yandex.net
 yandexmail.cf
 yandexmail.ga
 yandexmail.gq

data/lib/valid_email2/address.rb

@@ -6,10 +6,18 @@ module ValidEmail2
   class Address
     attr_accessor :address
 
-    PROHIBITED_DOMAIN_CHARACTERS_REGEX = /[+!_\/\s]/
+    PROHIBITED_DOMAIN_CHARACTERS_REGEX = /[+!_\/\s'`]/
     DEFAULT_RECIPIENT_DELIMITER = '+'.freeze
     DOT_DELIMITER = '.'.freeze
 
+    def self.prohibited_domain_characters_regex
+      @prohibited_domain_characters_regex ||= PROHIBITED_DOMAIN_CHARACTERS_REGEX
+    end
+
+    def self.prohibited_domain_characters_regex=(val)
+      @prohibited_domain_characters_regex = val
+    end
+
     def initialize(address)
       @parse_error = false
       @raw_address = address
@@ -30,7 +38,7 @@ module ValidEmail2
         if address.domain && address.address == @raw_address
           domain = address.domain
 
-          domain !~ PROHIBITED_DOMAIN_CHARACTERS_REGEX &&
+          domain !~ self.class.prohibited_domain_characters_regex &&
             # Domain needs to have at least one dot
             domain =~ /\./ &&
             # Domain may not have two consecutive dots

data/lib/valid_email2/email_validator.rb

@@ -5,43 +5,44 @@ require "active_model/validations"
 module ValidEmail2
   class EmailValidator < ActiveModel::EachValidator
     def default_options
-      { regex: true, disposable: false, mx: false, disallow_subaddressing: false }
+      { regex: true, disposable: false, mx: false, disallow_subaddressing: false, multiple: false }
     end
 
     def validate_each(record, attribute, value)
       return unless value.present?
       options = default_options.merge(self.options)
 
-      address = ValidEmail2::Address.new(value)
+      value_spitted = options[:multiple] ? value.split(',').map(&:strip) : [value]
+      addresses = value_spitted.map { |v| ValidEmail2::Address.new(v) }
 
-      error(record, attribute) && return unless address.valid?
+      error(record, attribute) && return unless addresses.all?(&:valid?)
 
       if options[:disallow_dotted]
-        error(record, attribute) && return if address.dotted?
+        error(record, attribute) && return if addresses.any?(&:dotted?)
       end
 
       if options[:disallow_subaddressing]
-        error(record, attribute) && return if address.subaddressed?
+        error(record, attribute) && return if addresses.any?(&:subaddressed?)
       end
 
       if options[:disposable]
-        error(record, attribute) && return if address.disposable?
+        error(record, attribute) && return if addresses.any?(&:disposable?)
       end
 
       if options[:disposable_domain]
-        error(record, attribute) && return if address.disposable_domain?
+        error(record, attribute) && return if addresses.any?(&:disposable_domain?)
       end
 
       if options[:disposable_with_whitelist]
-        error(record, attribute) && return if address.disposable? && !address.whitelisted?
+        error(record, attribute) && return if addresses.any? { |address| address.disposable? && !address.whitelisted? }
       end
 
       if options[:blacklist]
-        error(record, attribute) && return if address.blacklisted?
+        error(record, attribute) && return if addresses.any?(&:blacklisted?)
       end
 
       if options[:mx]
-        error(record, attribute) && return unless address.valid_mx?
+        error(record, attribute) && return unless addresses.all?(&:valid_mx?)
       end
     end
 

data/lib/valid_email2/version.rb

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

data/pull_mailchecker_emails.rb

@@ -8,6 +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
 )
 
 existing_emails = File.open("config/disposable_email_domains.txt") { |f| f.read.split("\n") }

data/spec/valid_email2_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "fileutils"
 
 class TestUser < TestModel
   validates :email, 'valid_email_2/email': true
@@ -38,6 +39,10 @@ class TestUserMessage < TestModel
   validates :email, 'valid_email_2/email': { message: "custom message" }
 end
 
+class TestUserMultiple < TestModel
+  validates :email, 'valid_email_2/email': { multiple: true }
+end
+
 describe ValidEmail2 do
 
   let(:disposable_domain) { ValidEmail2.disposable_emails.first }
@@ -59,8 +64,8 @@ describe ValidEmail2 do
       expect(user.valid?).to be_falsey
     end
 
-    it "is invalid if email contains invalid characters" do
-      %w[+ _ !].each do |invalid_character|
+    %w[+ _ ! / \  ' `].each do |invalid_character|
+      it "is invalid if email contains a \"#{invalid_character}\" character" do
         user = TestUser.new(email: "foo@google#{invalid_character}yahoo.com")
         expect(user.valid?).to be_falsey
       end
@@ -243,6 +248,20 @@ describe ValidEmail2 do
     end
   end
 
+  describe "with multiple addresses" do
+    it "tests each address for it's own" do
+      user = TestUserMultiple.new(email: "foo@gmail.com, bar@gmail.com")
+      expect(user.valid?).to be_truthy
+    end
+
+    context 'when one address is invalid' do
+      it "fails for all" do
+        user = TestUserMultiple.new(email: "foo@gmail.com, bar@123")
+        expect(user.valid?).to be_falsey
+      end
+    end
+  end
+
   describe "#dotted?" do
     it "is true when address local part contains a dot delimiter ('.')" do
       email = ValidEmail2::Address.new("john.doe@gmail.com")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Micke Lisinge
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ homepage: https://github.com/micke/valid_email2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email
   blacklist