valid_email2 5.0.5 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521793d68b526dfac3faf2966f62eefe5b78ccb021c004f7b2157448a1f7b81d
-  data.tar.gz: 761ca49f96808213830e62c2bf7d61db39edb5457498c6e9192abd20063e6dfe
+  metadata.gz: ca51b0f797d9251b8a850e2d55640ea0c278128f29ebed57b8d1e0d426393b0f
+  data.tar.gz: e3d180928ccea8db43191a40df53c0b2f8a226452b30fa55e8ed3d4a32c39186
 SHA512:
-  metadata.gz: e8fa138e0cf2474732b12b8dde26d8d1e7d1ebf24dd3984acbf94e163ad131b4a09dfa06e316e9d93e6e2758badc63d05bb792ca255f23b6b880239dd7cde2ca
-  data.tar.gz: 53fc5f63e4832f6b025c7fd74c9bd14be9ab0a5eadac087d1cc020e5d7c5807e9f336d91f86dc5b7fe435520e70fdc77d2b477c60d51e25287ce7925b7b4aff0
+  metadata.gz: b0cdb4311843b16ee38ab13c774c8f9f4e75c6e208f2feca5e143d8abf465bfb29d0e6bf314e0789d18178620bac7c96c17c06fb61c5d4a32b5157ac8a584cf4
+  data.tar.gz: 3c8fc7f7ae71dcb32f290254678d98f1d15151c60ee15602d82765947faae76466609ac483c910f8ce0a3f403eaaab8126abf001b00311c2556ae58d40bbcb66

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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/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.0"
 end

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.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler