valid_email2 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4846126777b929a2c98071c1a37d123f862f27cb
-  data.tar.gz: 34855d8b778cdf6a2b37d367ad3c0bad450d13e9
+  metadata.gz: 92a77a86b9cfbe45f43ed7e3b09a2a93ed8a86c6
+  data.tar.gz: 81e19c05fb443aad512cf4baa2e9db27d26aed79
 SHA512:
-  metadata.gz: 85bfaea5ddd6e2d71d271f5c4cc6c5fda4b13c1e297d19357e496a6daaccf39d6b95dcf73e7b91177b26cf414ebb7a16a9e141a09fa270fd9d80c50f8d427e58
-  data.tar.gz: 8cbf2ca1cc79031ccdf1c5fa37131993dc2dab391191df74356a65ce8a3c07e13c398a7e0d52ff6bba55abc72688c775cdf0561c33dcffaea99e182af0b1d942
+  metadata.gz: d716cf815c183d18534823e6aece0053a05d4a1dd1d9b7a308891a7bc46be0f28f75a9e9b957fe1bbb94474b27f11660c83e777605e96a5966de37925908d6c3
+  data.tar.gz: 458d3b946e5d84a4ab83c677698a9d1a81cad2a169a36d93e4ed1daf859894a1b0802f97478326d8f6071234fcd378aabc9169467e6b940763016d88c82253f0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 2.2.2
+Remove false-positive 163.com (https://github.com/lisinge/valid_email2/issues/105)
+
 ## Version 2.2.1
 Fix regression where `ValidEmail2::Address.new` couldn't handle the address
 being nil (https://github.com/lisinge/valid_email2/issues/102)

data/README.md

@@ -5,7 +5,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](vendor/disposable_emails.yml).
-
+Optionally validate that the email is not subaddressed ([RFC5233](https://tools.ietf.org/html/rfc5233)).
 
 ### Why?
 
@@ -58,9 +58,14 @@ To validate that the domain is not blacklisted (under vendor/blacklist.yml):
 validates :email, 'valid_email_2/email': { blacklist: true }
 ```
 
+To validate that email is not subaddressed:
+```ruby
+validates :email, 'valid_email_2/email': { disallow_subaddressing: true }
+```
+
 All together:
 ```ruby
-validates :email, 'valid_email_2/email': { mx: true, disposable: true }
+validates :email, 'valid_email_2/email': { mx: true, disposable: true, disallow_subaddressing: true}
 ```
 
 > Note that this gem will let an empty email pass through so you will need to
@@ -73,6 +78,7 @@ address = ValidEmail2::Address.new("lisinge@gmail.com")
 address.valid? => true
 address.disposable? => false
 address.valid_mx? => true
+address.subaddressed? => false
 ```
 
 ### Test environment

data/lib/valid_email2/address.rb

@@ -7,6 +7,7 @@ module ValidEmail2
     attr_accessor :address
 
     ALLOWED_DOMAIN_CHARACTERS_REGEX = /\A[a-z0-9\-.]+\z/i
+    DEFAULT_RECIPIENT_DELIMITER = '+'.freeze
 
     def initialize(address)
       @parse_error = false
@@ -39,6 +40,10 @@ module ValidEmail2
       end
     end
 
+    def subaddressed?
+      valid? && address.local.include?(DEFAULT_RECIPIENT_DELIMITER)
+    end
+
     def disposable?
       valid? && domain_is_in?(ValidEmail2.disposable_emails)
     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 }
+      { regex: true, disposable: false, mx: false, disallow_subaddressing: false }
     end
 
     def validate_each(record, attribute, value)
@@ -16,6 +16,10 @@ module ValidEmail2
 
       error(record, attribute) && return unless address.valid?
 
+      if options[:disallow_subaddressing]
+        error(record, attribute) && return if address.subaddressed?
+      end
+
       if options[:disposable]
         error(record, attribute) && return if address.disposable?
       end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/spec/valid_email2_spec.rb

@@ -4,6 +4,10 @@ class TestUser < TestModel
   validates :email, 'valid_email_2/email': true
 end
 
+class TestUserSubaddressing < TestModel
+  validates :email, 'valid_email_2/email': {disallow_subaddressing: true}
+end
+
 class TestUserMX < TestModel
   validates :email, 'valid_email_2/email': { mx: true }
 end
@@ -115,4 +119,52 @@ describe ValidEmail2 do
       expect(email.valid?).to be_falsy
     end
   end
+
+  describe "subaddressed emails" do
+
+    describe "::Address::DEFAULT_RECIPIENT_DELIMITER" do
+      it "should be recipient delimiter ('+')" do
+        expect(ValidEmail2::Address::DEFAULT_RECIPIENT_DELIMITER).to eq('+')
+      end
+    end
+
+    describe "::Address#subaddressed?" do
+      it "should be true when address local part contains a recipient delimiter ('+')" do
+        email = ValidEmail2::Address.new("foo+1@gmail.com")
+        expect(email.subaddressed?).to be_truthy
+      end
+
+      it "should be false when address local part contains a recipient delimiter ('+')" do
+        email = ValidEmail2::Address.new("foo@gmail.com")
+        expect(email.subaddressed?).to be_falsey
+      end
+    end
+
+    describe "user validation" do
+      context "subaddressing is allowed (default)" do
+        it "should be valid when address local part does not contain a recipient delimiter ('+')" do
+          user = TestUser.new(email: "foo@gmail.com")
+          expect(user.valid?).to be_truthy
+        end
+
+        it "should be valid when address local part contains a recipient delimiter ('+')" do
+          user = TestUser.new(email: "foo+1@gmail.com")
+          expect(user.valid?).to be_truthy
+        end
+      end
+
+      context "subaddressing is forbidden" do
+        it "should be valid when address local part does not contain a recipient delimiter ('+')" do
+          user = TestUserSubaddressing.new(email: "foo@gmail.com")
+          expect(user.valid?).to be_truthy
+        end
+
+        it "should be invalid when address local part contains a recipient delimiter ('+')" do
+          user = TestUserSubaddressing.new(email: "foo+1@gmail.com")
+          expect(user.valid?).to be_falsey
+        end
+      end
+    end
+
+  end
 end

data/vendor/disposable_emails.yml

@@ -68,7 +68,6 @@
 - 14n.co.uk
 - 15qm-mail.red
 - 15qm.com
-- 163.com
 - 188.com
 - 189.cn
 - 1ce.us
@@ -883,6 +882,7 @@
 - ckaazaza.tk
 - ckiso.com
 - cko.kr
+- ckoie.com
 - cl-cl.org
 - cl.gl
 - cl0ne.net
@@ -2597,6 +2597,7 @@
 - loadby.us
 - loan101.pro
 - loaoa.com
+- loapq.com
 - localserv.no-ip.org
 - locanto1.club
 - locantofuck.top
@@ -4046,6 +4047,7 @@
 - sogetthis.com
 - sohai.ml
 - sohu.com
+- soioa.com
 - soisz.com
 - solar-impact.pro
 - solvemail.info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler