safeshield 1.4.6__py3-none-any.whl → 1.4.8__py3-none-any.whl

{safeshield-1.4.6.dist-info → safeshield-1.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: safeshield
-Version: 1.4.6
+Version: 1.4.8
 Summary: Library for Help Validation Control
 Home-page: https://github.com/WunsunTarniho/py-guard
 Author: Wunsun Tarniho

{safeshield-1.4.6.dist-info → safeshield-1.4.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 validator/__init__.py,sha256=udxDzUicPfxBOAQvzsnl3pHur9VUppKbWMgg35hpiww,244
 validator/exceptions.py,sha256=y2v7CaXmeGFHWcnigtLl4U-sFta_jMiXkGKXWIIVglY,366
-validator/factory.py,sha256=JruOF0Mumk5PPqendNsO5TN4ZmPEGBNS7Nivly4_oUc,772
+validator/factory.py,sha256=lrbgjwvP0Ao8B16FYrybY21Zni-PD240-A19KcppFKI,1129
 validator/core/__init__.py,sha256=ZcqlXJSk03i_CVzmIN-nVe1UOyvwwO5jhbEj7f62Y_o,59
 validator/core/validator.py,sha256=la-kzp82iCii2bq4hV76F-7datWPb27vmyHvpg2itR0,12726
 validator/database/__init__.py,sha256=O-cB6-MhNapJ3iwe5jvifbMfr1dPjXLtEdfNTKIu0hc,171
@@ -17,15 +17,15 @@ validator/rules/files.py,sha256=c7deO8fEiFNCx4jq1B2sJXhxTqGzTVq4kK2EscSNhKI,1094
 validator/rules/format.py,sha256=Medw57PJwfElxA-DgxiZ5GHqvqPhUCQPFMGCGTDne8w,7070
 validator/rules/numeric.py,sha256=nkYVc8VtrWJ3Kt7JDLPsbg7ZaN3F0zJMnbf8Y5gxNsk,6824
 validator/rules/string.py,sha256=p8ZQfd0XaWIjksg_8ta3f6PEnXlxjRzlSJx1GohZ7yk,5237
-validator/rules/utilities.py,sha256=x6ZgCuJ7Ywf6jxqp3rwxwgouGe0d6M66UM-GnIvsy6w,12603
+validator/rules/utilities.py,sha256=dLbmSvaTdC2kK7_6V1MrPmtXr5u6YvJKnHMJSByslKk,12236
 validator/services/__init__.py,sha256=zzKTmqL7v4niFGWHJBfWLqgJ0iTaW_69OzYZN8uInzQ,210
 validator/services/rule_conflict.py,sha256=T3IhWLmZsRUccJ4oFO-OKRjrc5Xt7r71kktxjjj2IA8,9505
 validator/services/rule_error_handler.py,sha256=K6vq-pdVd5e4Xw7cpTguORy3VPWUJQa3PoeZZcDwTY8,10643
 validator/services/rule_preparer.py,sha256=4khRjdely_0Z5mxFwf1bKIid076_xDuNh2XBO_fGerE,4706
 validator/utils/__init__.py,sha256=Yzo-xv285Be-a233M4duDdYtscuHiuBbPSX_C8yViJI,20
 validator/utils/string.py,sha256=0YACzeEaWNEOR9_7O9A8D1ItIbtWfOJ8IfrzcB8VMYA,515
-safeshield-1.4.6.dist-info/LICENSE,sha256=qugtRyKckyaks6hd2xyxOFSOYM6au1N80pMXuMTPvC4,1090
-safeshield-1.4.6.dist-info/METADATA,sha256=3CXu9WPr8LMva7FxwelctlWpw7hPZce0uTweNGrnGz8,2313
-safeshield-1.4.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-safeshield-1.4.6.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
-safeshield-1.4.6.dist-info/RECORD,,
+safeshield-1.4.8.dist-info/LICENSE,sha256=qugtRyKckyaks6hd2xyxOFSOYM6au1N80pMXuMTPvC4,1090
+safeshield-1.4.8.dist-info/METADATA,sha256=AHQH2beR_iP4UKchFmWZOyjrZJ_WPz7kjFNLGDMxU9c,2313
+safeshield-1.4.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+safeshield-1.4.8.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
+safeshield-1.4.8.dist-info/RECORD,,

validator/factory.py

@@ -1,5 +1,5 @@
 # factory.py
-from typing import Type, Dict, List
+from typing import Type, Dict, List, Any
 from validator.rules import all_rules
 from validator.rules.base import Rule
 
@@ -14,8 +14,17 @@ class RuleFactory:
             raise ValueError(f"Unknown validation rule: {rule_name}")
     
     @classmethod
-    def register_rule(cls, name: str, rule_class: Type[Rule]):
-        cls._rules[name] = rule_class
+    def register_rule(cls, name: str, validate_func: callable, message_func: callable):
+        class NewRule(Rule):
+            _name = name
+            
+        def validate(self, field: str, value: Any, params: List[str]) -> bool:
+            return validate_func(field, value, params)
+        
+        def message(self, field: str) -> str:
+            return message_func(field, self.params)
+            
+        cls._rules[name] = NewRule
         
     @classmethod
     def has_rule(cls, rule_name: str) -> bool:

validator/rules/utilities.py

@@ -264,23 +264,6 @@ class MissingWithAllRule(MissingRule):
         
         return True
     
-class IncludeIfRule(ExcludeRule):
-    def validate(self, field: str, value: Any, params: List[str]) -> bool:
-        if len(params) == 1 and callable(params[0]):
-            condition_met = params[0](self.validator.data)
-        elif len(params) == 1 and isinstance(params[0], bool):
-            condition_met = params[0]
-        else:
-            conditions = list(zip(params[::2], params[1::2]))
-            condition_met = all(
-                str(self.get_field_value(f)) == str(v) 
-                for f, v in conditions
-            )
-        
-        if not condition_met:
-            return super().validate(field, value, params)
-        return True
-    
 class ExcludeIfRule(ExcludeRule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         if len(params) == 1 and callable(params[0]):
@@ -300,12 +283,19 @@ class ExcludeIfRule(ExcludeRule):
 
 class ExcludeUnlessRule(ExcludeRule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
-        conditions = [(f.strip(), v.strip()) for f, v in zip(params[::2], params[1::2])]
+        all_conditions_met = False
         
-        all_conditions_met = all(
-            self.get_field_value(f) == v 
-            for f, v in conditions
-        )
+        if len(params) == 1 and callable(params[0]):
+            all_conditions_met = params[0](self.validator.data)
+        elif len(params) == 1 and isinstance(params[0], bool):
+            all_conditions_met = params[0]
+        else:
+            conditions = [(f.strip(), v.strip()) for f, v in zip(params[::2], params[1::2])]
+            
+            all_conditions_met = all(
+                self.get_field_value(f) == v 
+                for f, v in conditions
+            )
         
         if not all_conditions_met:
             return super().validate(field, value, params)