valid_email2 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0c608a5b413d559c4458934aaeea9def9d9172c60331e0e8c105423bc6c621
-  data.tar.gz: d16b5cd998cd2223a51931a3552068e7f5cbc6bcce0e5946c4f848d9d2b53e4f
+  metadata.gz: ca51b0f797d9251b8a850e2d55640ea0c278128f29ebed57b8d1e0d426393b0f
+  data.tar.gz: e3d180928ccea8db43191a40df53c0b2f8a226452b30fa55e8ed3d4a32c39186
 SHA512:
-  metadata.gz: 7a3629ba5e3ab86b8a327c076145ad9d64325f669076da2dcc69433a5e598bd8cfaa67b5903da96f839f4cb63e5917ce8ee1f144b316b62d2ec3ef6c376ceb25
-  data.tar.gz: e199405c917b6963fc371fa9b5ffb30c08818ec911d6a6e5bcce4be1f1529c462240a48e9805bc9ce17326b363494be80f4d18600262b4bede94d82106b9d6a7
+  metadata.gz: b0cdb4311843b16ee38ab13c774c8f9f4e75c6e208f2feca5e143d8abf465bfb29d0e6bf314e0789d18178620bac7c96c17c06fb61c5d4a32b5157ac8a584cf4
+  data.tar.gz: 3c8fc7f7ae71dcb32f290254678d98f1d15151c60ee15602d82765947faae76466609ac483c910f8ce0a3f403eaaab8126abf001b00311c2556ae58d40bbcb66

data/CHANGELOG.md

@@ -1,5 +1,14 @@
+## 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
+
 ## Version 5.0.4
-* Remove false positives
+* Remove false positives:
+  * https://github.com/micke/valid_email2/pull/212
+  * https://github.com/micke/valid_email2/pull/213
+  * https://github.com/micke/valid_email2/pull/215
 
 ## Version 5.0.3
 * Remove false positive mail.com [#210](https://github.com/micke/valid_email2/issues/210)

data/config/disposable_email_domains.txt

@@ -46278,7 +46278,6 @@ dubukim.me
 dubzone.com
 ducatimotorclubdenver.com
 duck.9amail.top
-duck.com
 duck2.club
 duckbao.com
 duckcover.com

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.4"
+  VERSION = "5.1.0"
 end

data/pull_mailchecker_emails.rb

@@ -10,7 +10,10 @@ whitelisted_emails = %w(
   hush.ai hush.com hushmail.me naver.com qq.com example.com
   yandex.net gmx.com gmx.es webdesignspecialist.com.au vp.com
   onit.com asics.com freemail.hu 139.com mail2world.com slmail.me
-  zoho.com zoho.in
+  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
 )
 
 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.4
+  version: 5.1.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler