From cea3e93a84e44e9d42a10eeaecb30a4cd8c8bc33 Mon Sep 17 00:00:00 2001
From: Alessandro Molina <alessandro@molina.fyi>
Date: Mon, 18 Mar 2024 01:03:04 +0100
Subject: [PATCH] Add RequireValue validation helper

---
 tg/validation.py | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/tg/validation.py b/tg/validation.py
index 2db317d4..169da4aa 100644
--- a/tg/validation.py
+++ b/tg/validation.py
@@ -158,9 +158,44 @@ def __init__(self, func, msg=lazy_ugettext('Invalid'), default=None):
         self._default = default
 
     def to_python(self, value, state=None):
-        value = value or self._default
+        if RequireValue.is_empty(value):
+            if self._default is None:
+                raise TGValidationError(self._msg, value)
+            return self._default
 
         try:
             return self._func(value)
         except:
             raise TGValidationError(self._msg, value)
+
+
+class RequireValue(object):
+    """Mark a value as required during validation.
+
+    This is meant to be used when a value is required,
+    but not conversion needs to happen.
+    This is usually common for string values.
+
+    In case conversion has to happen, use :class:`Convert`
+    which will already fail if no value is provided.
+
+    Example::
+
+        @expose()
+        @validate({
+            'num': RequireValue('you must provide a number')
+        }, error_handler=insert_number)
+        def post_pow2(self, num):
+            return str(num*num)
+    """
+    def __init__(self, msg=lazy_ugettext('Required')):
+        self._msg = msg
+
+    @staticmethod
+    def is_empty(value):
+        return value in (None, '', b'', [], {}, tuple())
+
+    def to_python(self, value, state=None):
+        if self.is_empty(value):
+            raise TGValidationError(self._msg, value)
+        return value