feat: #[validate(..., message_fn(???)] to #[validate(..., message_fn …

…= ???)].
yassun7010 · Jun 22, 2024 · 815c6ce · 815c6ce
1 parent 17c4d7e
commit 815c6ce
Show file tree

Hide file tree

Showing 16 changed files with 369 additions and 24 deletions.
diff --git a/docs/src/Attributes/custom_message.md b/docs/src/Attributes/custom_message.md
@@ -15,7 +15,7 @@ fn min_error_message(_params: &serde_valid::MinItemsError) -> String {
 
 #[derive(Validate)]
 struct Data (
-    #[validate(min_items = 4, message_fn(min_error_message))]
+    #[validate(min_items = 4, message_fn = min_error_message)]
     #[validate(max_items = 2, message = "this is max custom message.")]
     Vec<i32>,
 );

diff --git a/serde_valid/README.md b/serde_valid/README.md
@@ -144,7 +144,7 @@ fn min_error_message(_params: &serde_valid::MinItemsError) -> String {
 
 #[derive(Validate)]
 struct Data {
-    #[validate(min_items = 4, message_fn(min_error_message))]
+    #[validate(min_items = 4, message_fn = min_error_message)]
     #[validate(max_items = 2, message = "this is custom message.")]
     val: Vec<i32>,
 }

diff --git a/serde_valid/src/lib.rs b/serde_valid/src/lib.rs
@@ -144,7 +144,7 @@
 //!
 //! #[derive(Validate)]
 //! struct Data {
-//!     #[validate(min_items = 4, message_fn(min_error_message))]
+//!     #[validate(min_items = 4, message_fn = min_error_message)]
 //!     #[validate(max_items = 2, message = "this is custom message.")]
 //!     val: Vec<i32>,
 //! }

diff --git a/serde_valid/tests/deprecated_enumerate_test.rs b/serde_valid/tests/deprecated_enumerate_test.rs
@@ -163,7 +163,7 @@ mod test {
 
         #[derive(Validate)]
         struct TestStruct {
-            #[validate(enumerate(1, 2, 3), message_fn(error_message))]
+            #[validate(enumerate(1, 2, 3), message_fn = error_message)]
             val: i32,
         }
 

diff --git a/serde_valid/tests/deprecated_message_fn_test.rs b/serde_valid/tests/deprecated_message_fn_test.rs
@@ -0,0 +1,315 @@
+#[allow(deprecated)]
+mod test {
+
+    use serde_json::json;
+    use serde_valid::Validate;
+
+    use serde::Deserialize;
+
+    #[test]
+    fn deprecated_enumerate_custom_err_message_fn() {
+        fn error_message(_params: &serde_valid::error::EnumerateError) -> String {
+            "this is custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(enumerate(1, 2, 3), message_fn(error_message))]
+            val: i32,
+        }
+
+        let s = TestStruct { val: 4 };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                        "this is custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn enumerate_custom_err_message_fn() {
+        fn error_message(_params: &serde_valid::error::EnumerateError) -> String {
+            "this is custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(enumerate = [1, 2, 3], message_fn(error_message))]
+            val: i32,
+        }
+
+        let s = TestStruct { val: 4 };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                        "this is custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn items_custom_err_message_fn() {
+        #[inline]
+        fn min_error_message(_params: &serde_valid::MinItemsError) -> String {
+            "this is min custom message.".to_string()
+        }
+        #[inline]
+        fn max_error_message(_params: &serde_valid::MaxItemsError) -> String {
+            "this is max custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(min_items = 4, message_fn(min_error_message))]
+            #[validate(max_items = 2, message_fn(max_error_message))]
+            val: Vec<i32>,
+        }
+
+        let s = TestStruct { val: vec![1, 2, 3] };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+            "errors": [],
+            "properties": {
+                "val": {
+                    "errors": [
+                        "this is min custom message.",
+                        "this is max custom message."
+                    ]
+                }
+            }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn length_custom_err_message_fn() {
+        fn custom_min_error_message(_params: &serde_valid::MinLengthError) -> String {
+            "this is min custom message.".to_string()
+        }
+
+        fn custom_max_error_message(_params: &serde_valid::MaxLengthError) -> String {
+            "this is max custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(min_length = 5, message_fn(custom_min_error_message))]
+            #[validate(max_length = 3, message_fn(custom_max_error_message))]
+            val: String,
+        }
+
+        let s = TestStruct {
+            val: String::from("test"),
+        };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is min custom message.",
+                            "this is max custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn multiple_of_custom_err_message_fn() {
+        fn error_message(_params: &serde_valid::MultipleOfError) -> String {
+            "this is custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(multiple_of = 5, message_fn(error_message))]
+            val: i32,
+        }
+
+        let s = TestStruct { val: 14 };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn pattern_custom_err_message_fn() {
+        fn error_message(_params: &serde_valid::PatternError) -> String {
+            "this is custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(pattern = r"^\d{4}-\d{2}-\d{2}$", message_fn = error_message)]
+            val: String,
+        }
+
+        let s = TestStruct {
+            val: String::from("2020/09/10"),
+        };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn properties_custom_err_message_fn() {
+        fn min_custom_error_message(_params: &serde_valid::MinPropertiesError) -> String {
+            "this is min custom message.".to_string()
+        }
+
+        fn max_custom_error_message(_params: &serde_valid::MaxPropertiesError) -> String {
+            "this is max custom message.".to_string()
+        }
+
+        #[derive(Deserialize, Validate)]
+        struct TestStruct {
+            #[validate(min_properties = 3, message_fn(min_custom_error_message))]
+            #[validate(max_properties = 1, message_fn(max_custom_error_message))]
+            val: serde_json::Map<String, serde_json::Value>,
+        }
+
+        let s: TestStruct = serde_json::from_value(json!({
+            "val": {
+                "key1": "value1",
+                "key2": "value2",
+            }
+        }))
+        .unwrap();
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is min custom message.",
+                            "this is max custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn range_custom_err_message_fn() {
+        fn custom_min_error_message(_params: &serde_valid::MinimumError) -> String {
+            "this is min custom message.".to_string()
+        }
+
+        fn custom_max_error_message(_params: &serde_valid::MaximumError) -> String {
+            "this is max custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(minimum = 5, message_fn(custom_min_error_message))]
+            #[validate(maximum = 3, message_fn(custom_max_error_message))]
+            val: i32,
+        }
+
+        let s = TestStruct { val: 4 };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is min custom message.",
+                            "this is max custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+
+    #[test]
+    fn unique_items_custom_err_message_fn() {
+        fn error_message(_params: &serde_valid::UniqueItemsError) -> String {
+            "this is custom message.".to_string()
+        }
+
+        #[derive(Validate)]
+        struct TestStruct {
+            #[validate(unique_items, message_fn(error_message))]
+            val: Vec<i32>,
+        }
+
+        let s = TestStruct {
+            val: vec![1, 2, 3, 2],
+        };
+
+        assert_eq!(
+            s.validate().unwrap_err().to_string(),
+            json!({
+                "errors": [],
+                "properties": {
+                    "val": {
+                        "errors": [
+                            "this is custom message."
+                        ]
+                    }
+                }
+            })
+            .to_string()
+        );
+    }
+}
diff --git a/serde_valid/tests/enumerate_test.rs b/serde_valid/tests/enumerate_test.rs
@@ -161,7 +161,7 @@ fn enumerate_custom_err_message_fn() {
 
     #[derive(Validate)]
     struct TestStruct {
-        #[validate(enumerate = [1, 2, 3], message_fn(error_message))]
+        #[validate(enumerate = [1, 2, 3], message_fn = error_message)]
         val: i32,
     }
 

diff --git a/serde_valid/tests/items_test.rs b/serde_valid/tests/items_test.rs
@@ -179,8 +179,8 @@ fn items_custom_err_message_fn() {
 
     #[derive(Validate)]
     struct TestStruct {
-        #[validate(min_items = 4, message_fn(min_error_message))]
-        #[validate(max_items = 2, message_fn(max_error_message))]
+        #[validate(min_items = 4, message_fn = min_error_message)]
+        #[validate(max_items = 2, message_fn = max_error_message)]
         val: Vec<i32>,
     }
 

diff --git a/serde_valid/tests/length_test.rs b/serde_valid/tests/length_test.rs
@@ -310,8 +310,8 @@ fn length_custom_err_message_fn() {
 
     #[derive(Validate)]
     struct TestStruct {
-        #[validate(min_length = 5, message_fn(custom_min_error_message))]
-        #[validate(max_length = 3, message_fn(custom_max_error_message))]
+        #[validate(min_length = 5, message_fn = custom_min_error_message)]
+        #[validate(max_length = 3, message_fn = custom_max_error_message)]
         val: String,
     }
 

diff --git a/serde_valid/tests/multiple_of_test.rs b/serde_valid/tests/multiple_of_test.rs
@@ -149,7 +149,7 @@ fn multiple_of_custom_err_message_fn() {
 
     #[derive(Validate)]
     struct TestStruct {
-        #[validate(multiple_of = 5, message_fn(error_message))]
+        #[validate(multiple_of = 5, message_fn = error_message)]
         val: i32,
     }