valid_email2 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25558db10878c68df0f39fbcdfe498f8d07d8c70730b268e2ef702e4f8533449
-  data.tar.gz: e1834303a708a8ed08821bf3d1e5e5539b9fe200450f174ab5cfc33530868779
+  metadata.gz: c276bf084cb4c9815f285bea9a4e3074ef7e6f60751517e006421d4dff33d21d
+  data.tar.gz: 950da4a70ea385e7acab48193168a91874acd54520f295cba9c8d28f7fa3d875
 SHA512:
-  metadata.gz: 3ec00e12a9f657e1ef25e5caed08d893f20036b35b02f8a8b8d69c694377e5ab6c5255345ff68dec61e4ab1e5f78fdb6a5f931255837cba43173055adabe79e0
-  data.tar.gz: 3f3b6508a61121802b957e3a31d3032d2eab37776dda9586bf4dd43d3a9d21207b4c952b4c0dbbe0b63b1f1c19959b445472b2e89003f8e1ef54a2129b52380c
+  metadata.gz: bfd46b264bd9ded9820c279a62e02fb61bada67a7d62555a80cf094e6abd6d94d488f754a7837a67103476cfad3fd82f5f6443e49b9cdb29b1864a04fb381910
+  data.tar.gz: f31d60651d05f90e7ce63f8f2feab0f24eb37752dca65e63b29bd9d14782779b5ee6b824e77de12c590da6aa118aa73536ff4cdcad9be062576818ef9d99af86

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 2.3.0
+Add whitelist feature (https://github.com/lisinge/valid_email2/pull/119)  
+Update disposable emails (https://github.com/lisinge/valid_email2/pull/116)
+
 ## Version 2.2.3
 Update disposable emails #113
 Remove false positives (yandex.com, naver.com, com.ar)

data/README.md

@@ -53,6 +53,11 @@ To validate that the domain is not a disposable email:
 validates :email, 'valid_email_2/email': { disposable: true }
 ```
 
+To validate that the domain is not a disposable email or a disposable email but whitelisted (under vendor/whitelist.yml):
+```ruby
+validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
+```
+
 To validate that the domain is not blacklisted (under vendor/blacklist.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { blacklist: true }

data/lib/valid_email2/address.rb

@@ -48,6 +48,10 @@ module ValidEmail2
       valid? && domain_is_in?(ValidEmail2.disposable_emails)
     end
 
+    def whitelisted?
+      domain_is_in?(ValidEmail2.whitelist)
+    end
+
     def blacklisted?
       valid? && domain_is_in?(ValidEmail2.blacklist)
     end

data/lib/valid_email2/email_validator.rb

@@ -24,6 +24,10 @@ module ValidEmail2
         error(record, attribute) && return if address.disposable?
       end
 
+      if options[:disposable_with_whitelist]
+        error(record, attribute) && return if address.disposable? && !address.whitelisted?
+      end
+
       if options[:blacklist]
         error(record, attribute) && return if address.blacklisted?
       end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "2.2.3"
+  VERSION = "2.3.0"
 end

data/lib/valid_email2.rb

@@ -9,4 +9,9 @@ module ValidEmail2
     blacklist_file = "vendor/blacklist.yml"
     @@blacklist ||= File.exists?(blacklist_file) ? YAML.load_file(File.expand_path(blacklist_file)) : []
   end
+
+  def self.whitelist
+    whitelist_file = "vendor/whitelist.yml"
+    @@whitelist ||= File.exists?(whitelist_file) ? YAML.load_file(File.expand_path(whitelist_file)) : []
+  end
 end

data/spec/valid_email2_spec.rb

@@ -16,6 +16,10 @@ class TestUserDisallowDisposable < TestModel
   validates :email, 'valid_email_2/email': { disposable: true }
 end
 
+class TestUserDisallowDisposableWithWhitelist < TestModel
+  validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
+end
+
 class TestUserDisallowBlacklisted < TestModel
   validates :email, 'valid_email_2/email': { blacklist: true }
 end
@@ -82,6 +86,22 @@ describe ValidEmail2 do
       user = TestUserDisallowDisposable.new(email: "foo@example.com")
       expect(user.valid?).to be_truthy
     end
+
+    describe "with whitelisted emails" do
+      it "should be invalid when the domain is in the list of disposable and there is no whitelist" do
+        user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
+        expect(user.valid?).to be_falsey
+      end
+
+      it "should be valid when the domain is in the list of disposable but it is in the whitelist" do
+        whitelist_domain = ValidEmail2.disposable_emails.first
+        whitelist_file_path = "vendor/whitelist.yml"
+        File.open(whitelist_file_path, "w") {|f| f.write whitelist_domain.to_yaml }
+        user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{whitelist_domain}")
+        expect(user.valid?).to be_falsey
+        File.delete(whitelist_file_path)
+      end
+    end
   end
 
   describe "blacklisted emails" do

data/vendor/disposable_emails.yml

@@ -3576,6 +3576,7 @@
 - nutpa.net
 - nuts2trade.com
 - nwldx.com
+- nwytg.com
 - ny7.me
 - nypato.com
 - o.cfo2go.ro

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email