safeshield 1.4.6__tar.gz → 1.4.8__tar.gz

{safeshield-1.4.6 → safeshield-1.4.8}/PKG-INFO

@@ -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 → safeshield-1.4.8}/safeshield.egg-info/PKG-INFO

@@ -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 → safeshield-1.4.8}/setup.py

@@ -7,7 +7,7 @@ def get_requirements():
 
 setup(
     name="safeshield",  # Nama package di PyPI
-    version="1.4.6",
+    version="1.4.8",
     packages=find_packages(),
     install_requires=get_requirements(),
     author="Wunsun Tarniho",

{safeshield-1.4.6 → safeshield-1.4.8}/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:

{safeshield-1.4.6 → safeshield-1.4.8}/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)