valid_email2 5.0.5 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521793d68b526dfac3faf2966f62eefe5b78ccb021c004f7b2157448a1f7b81d
-  data.tar.gz: 761ca49f96808213830e62c2bf7d61db39edb5457498c6e9192abd20063e6dfe
+  metadata.gz: 925627af7072ddf7e2f82482253520d9bef1111e605317106afbf84b951c5a57
+  data.tar.gz: 7eb5251aa7f5cf9e2bcd24c63f23fb45ea6770581d8e1ceebf00933f64f24498
 SHA512:
-  metadata.gz: e8fa138e0cf2474732b12b8dde26d8d1e7d1ebf24dd3984acbf94e163ad131b4a09dfa06e316e9d93e6e2758badc63d05bb792ca255f23b6b880239dd7cde2ca
-  data.tar.gz: 53fc5f63e4832f6b025c7fd74c9bd14be9ab0a5eadac087d1cc020e5d7c5807e9f336d91f86dc5b7fe435520e70fdc77d2b477c60d51e25287ce7925b7b4aff0
+  metadata.gz: 3f02e361ed0c985a4f770a09222fef9179de6a9f01995ac84c57ae6b9a843172afaf80116d01dc1ad9a9b5959dfcc6a089ce5b2ea2d6340701308b8e3b8a9817
+  data.tar.gz: f05c620994e0aaf353dfc4227cc317d20d2bd9be59e1b85ba4ab70db5d0cf0522ed939dab7fff625ad5701c710da33f037ba37e44123d9f1989b14b3faa64980

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 5.1.1
+* Remove false positives [#223](https://github.com/micke/valid_email2/issues/223)
+
+## Version 5.1.0
+* Allow dynamic validaton error messages [#221](https://github.com/micke/valid_email2/pull/221)
+
 ## Version 5.0.5
 * Remove false positive duck.com
 

data/config/disposable_email_domains.txt

@@ -8565,7 +8565,6 @@
 8a818.club
 8a9itx.online
 8aj.net
-8alias.com
 8americain.fr
 8angue9wtjv4dwa9.com
 8avz.net
@@ -8708,7 +8707,6 @@
 8rskf3xpyq.ml
 8rskf3xpyq.tk
 8rygn.com
-8shield.net
 8t0sznngp6aowxsrj.cf
 8t0sznngp6aowxsrj.ga
 8t0sznngp6aowxsrj.gq
@@ -45553,7 +45551,6 @@ drakeslansdowne.com
 drakor.pro
 drakorfor.me
 draktar.online
-dralias.com
 dralselahi.com
 dram.network
 drama.tw

data/lib/valid_email2/email_validator.rb

@@ -66,7 +66,9 @@ module ValidEmail2
     end
 
     def error(record, attribute)
-      record.errors.add(attribute, options[:message] || :invalid)
+      message = options[:message].respond_to?(:call) ? options[:message].call : options[:message]
+
+      record.errors.add(attribute, message || :invalid)
     end
   end
 end

data/lib/valid_email2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal:true
 
 module ValidEmail2
-  VERSION = "5.0.5"
+  VERSION = "5.1.1"
 end

data/pull_mailchecker_emails.rb

@@ -13,7 +13,7 @@ whitelisted_emails = %w(
   zoho.com zoho.in simplelogin.com simplelogin.fr simplelogin.co
   simplelogin.io aleeas.com slmails.com silomails.com slmail.me
   passinbox.com passfwd.com passmail.com passmail.net
-  duck.com mozmail.com
+  duck.com mozmail.com dralias.com 8alias.com 8shield.net
 )
 
 existing_emails = File.open("config/disposable_email_domains.txt") { |f| f.read.split("\n") }

data/spec/valid_email2_spec.rb

@@ -47,6 +47,14 @@ class TestUserMessage < TestModel
   validates :email, 'valid_email_2/email': { message: "custom message" }
 end
 
+class TestUserMessageWithLambda < TestModel
+  validates :email, 'valid_email_2/email': { message: -> { "custom message lambda" } }
+end
+
+class TestUserMessageWithProc < TestModel
+  validates :email, 'valid_email_2/email': { message: Proc.new { "custom message proc" } }
+end
+
 class TestUserMultiple < TestModel
   validates :email, 'valid_email_2/email': { multiple: true }
 end
@@ -188,11 +196,11 @@ 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 
+      # 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, 
+          :@whitelist,
           ValidEmail2.send(:load_if_exists, ValidEmail2::WHITELIST_FILE)
         )
       end
@@ -308,11 +316,29 @@ describe ValidEmail2 do
     end
   end
 
-  describe "with custom error message" do
-    it "supports settings a custom error message" do
-      user = TestUserMessage.new(email: "fakeemail")
-      user.valid?
-      expect(user.errors.full_messages).to include("Email custom message")
+  context "when message is present" do
+    describe "with custom error message" do
+      it "supports settings a custom error message" do
+        user = TestUserMessage.new(email: "fakeemail")
+        user.valid?
+        expect(user.errors.full_messages).to include("Email custom message")
+      end
+    end
+
+    describe "with custom error message lambda" do
+      it "supports settings a custom error message lambda" do
+        user = TestUserMessageWithLambda.new(email: "fakeemail")
+        user.valid?
+        expect(user.errors.full_messages).to include("Email custom message lambda")
+      end
+    end
+
+    describe "with custom error message proc" do
+      it "supports settings a custom error message proc" do
+        user = TestUserMessageWithProc.new(email: "fakeemail")
+        user.valid?
+        expect(user.errors.full_messages).to include("Email custom message proc")
+      end
     end
   end
 

metadata

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