vtjson 2.2.4__tar.gz → 2.2.6__tar.gz

{vtjson-2.2.4/src/vtjson.egg-info → vtjson-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vtjson
-Version: 2.2.4
+Version: 2.2.6
 Summary: An easy to use validation library compatible with Python type annotations
 Author-email: Michel Van den Bergh <michel.vandenbergh@uhasselt.be>
 Project-URL: Homepage, https://github.com/vdbergh/vtjson
@@ -17,6 +17,7 @@ Requires-Dist: email_validator
 Requires-Dist: idna
 Requires-Dist: python-magic
 Requires-Dist: typing_extensions
+Dynamic: license-file
 
 # vtjson
 

{vtjson-2.2.4 → vtjson-2.2.6}/src/vtjson/vtjson.py

@@ -204,7 +204,7 @@ class SchemaError(Exception):
     pass
 
 
-__version__ = "2.2.4"
+__version__ = "2.2.6"
 
 
 @dataclass
@@ -1746,6 +1746,32 @@ class ip_address(compiled_schema):
         return ""
 
 
+class regex_pattern(compiled_schema):
+    """
+    Matches valid regular expression patterns
+    """
+
+    __name__: str
+
+    def __init__(self) -> None:
+        self.__name__ = "regex_pattern"
+
+    def __validate__(
+        self,
+        obj: object,
+        name: str = "object",
+        strict: bool = True,
+        subs: Mapping[str, object] = {},
+    ) -> str:
+        if not isinstance(obj, str):
+            return _wrong_type_message(obj, name, self.__name__)
+        try:
+            re.compile(obj)
+        except re.error as e:
+            return _wrong_type_message(obj, name, self.__name__, explanation=str(e))
+        return ""
+
+
 class url(compiled_schema):
     """
     Matches valid urls.
@@ -2175,6 +2201,7 @@ class _cond(compiled_schema):
 
 class cond(wrapper):
     """
+    Args is a list of tuples `(if_schema, then_schema)`.
     An object is successively validated against `if_schema1`, `if_schema2`,
     ... until a validation succeeds. When this happens the object should match
     the corresponding `then_schema`. If no `if_schema` succeeds then the
@@ -2243,8 +2270,9 @@ class _fields(compiled_schema):
 
 class fields(wrapper, Generic[StringKeyType]):
     """
-    Matches Python objects with attributes `field1, field2, ..., fieldN` whose
-    corresponding values should validate against `schema1, schema2, ...,
+    `d` is a dictionary `{"field1": schema1, ...}`.
+    This matches Python objects with attributes `field1, field2, ..., fieldN`
+    whose corresponding values should validate against `schema1, schema2, ...,
     schemaN` respectively.
     """
 
@@ -2306,16 +2334,16 @@ class _filter(compiled_schema):
             obj = self.filter(obj)
         except Exception as e:
             return (
-                f"Applying {self.filter_name} to {name} "
+                f"Applying {repr(self.filter_name)} to {name} "
                 f"(value: {_c(obj)}) failed: {str(e)}"
             )
         name = f"{self.filter_name}({name})"
-        return self.schema.__validate__(obj, name="object", strict=strict, subs=subs)
+        return self.schema.__validate__(obj, name=name, strict=strict, subs=subs)
 
 
 class filter(wrapper):
     """
-    Applies `callable` to the object and validates the result with `schema`.
+    Applies `filter` to the object and validates the result with `schema`.
     If the callable throws an exception then validation fails.
     """
 
@@ -2751,6 +2779,9 @@ class protocol(wrapper):
         if not isinstance(dict, bool):
             raise SchemaError("bool flag is not a bool")
 
+        if not hasattr(schema, "__annotations__"):
+            raise SchemaError("schema does not have type annotations")
+
         self.dict = dict
         self.schema = schema
 

{vtjson-2.2.4 → vtjson-2.2.6/src/vtjson.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vtjson
-Version: 2.2.4
+Version: 2.2.6
 Summary: An easy to use validation library compatible with Python type annotations
 Author-email: Michel Van den Bergh <michel.vandenbergh@uhasselt.be>
 Project-URL: Homepage, https://github.com/vdbergh/vtjson
@@ -17,6 +17,7 @@ Requires-Dist: email_validator
 Requires-Dist: idna
 Requires-Dist: python-magic
 Requires-Dist: typing_extensions
+Dynamic: license-file
 
 # vtjson
 

{vtjson-2.2.4 → vtjson-2.2.6}/tests/test_vtjson.py

@@ -96,6 +96,7 @@ from vtjson import (
     protocol,
     quote,
     regex,
+    regex_pattern,
     safe_cast,
     set_label,
     set_name,
@@ -964,7 +965,6 @@ class TestValidation(unittest.TestCase):
     def test_make_type(self) -> None:
         schema: object
         object_: object
-        global url
         schema = {"a": 1}
         t = make_type(schema, "example", debug=True)
         self.assertTrue(t.__name__ == "example")
@@ -1845,6 +1845,17 @@ class TestValidation(unittest.TestCase):
             validate(schema, object_)
         show(mc)
 
+    def test_regex_pattern(self) -> None:
+        schema: object
+        object_: object
+        schema = regex_pattern
+        with self.assertRaises(ValidationError) as mc:
+            object_ = "(("
+            validate(schema, object_)
+        show(mc)
+        object_ = ".*"
+        validate(schema, object_)
+
     def test_truncation(self) -> None:
         schema: object
         object_: object
@@ -2314,7 +2325,7 @@ class TestValidation(unittest.TestCase):
         if not vtjson.supports_structural:
             with self.assertRaises(SchemaError) as mc_:
                 schema = protocol(dummy)
-                validate(schema, "a")
+                compile(schema)
             show(mc_)
             return
 
@@ -2324,7 +2335,6 @@ class TestValidation(unittest.TestCase):
 
         with self.assertRaises(SchemaError) as mc_:
             schema = protocol({})
-            validate(schema, "a")
         show(mc_)
 
         schema = protocol(dummy)