safeshield 1.4.9__py3-none-any.whl → 1.4.11__py3-none-any.whl

{safeshield-1.4.9.dist-info → safeshield-1.4.11.dist-info}/METADATA

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

{safeshield-1.4.9.dist-info → safeshield-1.4.11.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=RLcNBgGeNf9AUBzyGh9x7UigQBNXKgIJmp4Qsz9KTi8,1149
+validator/factory.py,sha256=SJ2iJmTnFS-4ccH-gzZl_7CAW7Z6YJkZbMImu-po80w,1163
 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
@@ -8,10 +8,10 @@ validator/database/detector.py,sha256=Vac7oVL26GjU6expGo01-6mgUtXqldr-jirzpYokZB
 validator/database/manager.py,sha256=XJM_I0WaWfZWV710duAc32p1gtiP2or-MAj75WPw1oM,6478
 validator/rules/__init__.py,sha256=z3Vk3R5CRgjeqyDWZxdofD2tBMTgdyYVuFmo1mKOTj4,830
 validator/rules/array.py,sha256=AqVoBR_chSqxPec14Av5KmR9NAByovXDNNu2oeId4-U,2528
-validator/rules/base.py,sha256=LWOSigqnn65wges6HjpHEpyoYyDJhbBSabm96t8CXEs,4388
+validator/rules/base.py,sha256=PadT5Ko3Zs_yr5EPxOfTw-IdS7uJKhGpaekF1k4tvYk,4359
 validator/rules/basic.py,sha256=LWYs4fPCA6_lTtOmtTgvjGqjVxxSdklj9fsCgSAMy2Y,4918
 validator/rules/boolean.py,sha256=vy6huFJ5JidpsoJ0WSvcydiU7a8aYFj225UswggSGAE,5748
-validator/rules/comparison.py,sha256=xkQ0xoqBjVlDSfgwTvruOAnXUmKlNt9kDjTcG5r4cFM,13473
+validator/rules/comparison.py,sha256=W22Gsafnu8zC0Ue-28PDB36fB8VDO3bMS5MDSg5VUHE,13368
 validator/rules/date.py,sha256=yolYaTIvQTN1LBje5SM8i7EmNzOxV_eUwnOokmqZrMs,5812
 validator/rules/files.py,sha256=c7deO8fEiFNCx4jq1B2sJXhxTqGzTVq4kK2EscSNhKI,10946
 validator/rules/format.py,sha256=Medw57PJwfElxA-DgxiZ5GHqvqPhUCQPFMGCGTDne8w,7070
@@ -20,12 +20,12 @@ validator/rules/string.py,sha256=p8ZQfd0XaWIjksg_8ta3f6PEnXlxjRzlSJx1GohZ7yk,523
 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_error_handler.py,sha256=K6fx5ttkBAGUi-2UfO2V_G7aWhJsY6zBjWnRIJW8Sgo,10363
 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.9.dist-info/LICENSE,sha256=qugtRyKckyaks6hd2xyxOFSOYM6au1N80pMXuMTPvC4,1090
-safeshield-1.4.9.dist-info/METADATA,sha256=bXDUx3M5GfMVvaE4XxCXpmOabzjD3RUTHqvGFFDgLcM,2313
-safeshield-1.4.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-safeshield-1.4.9.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
-safeshield-1.4.9.dist-info/RECORD,,
+safeshield-1.4.11.dist-info/LICENSE,sha256=qugtRyKckyaks6hd2xyxOFSOYM6au1N80pMXuMTPvC4,1090
+safeshield-1.4.11.dist-info/METADATA,sha256=UvpIGA-7Wq_JAG9c9PbQUHXZ9XG5Sk9YoTRBuoVY0vo,2314
+safeshield-1.4.11.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+safeshield-1.4.11.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
+safeshield-1.4.11.dist-info/RECORD,,

validator/factory.py

@@ -21,8 +21,8 @@ class RuleFactory:
             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)
+            def message(self, field: str, params: List[str]) -> str:
+                return message_func(field, params)
             
         cls._rules[name] = NewRule
         

validator/rules/base.py

@@ -16,7 +16,6 @@ class Rule(ABC):
         
     def __init_subclass__(cls, name=None):
         cls.rule_name = cls.pascal_to_snake(cls.__name__) if not hasattr(cls, '_name') else cls._name
-        print(cls.__name__)
         cls._register_rule_class()
         cls._generate_rule_methods()
     

validator/rules/comparison.py

@@ -27,7 +27,7 @@ class MinRule(Rule):
         return False
     
     def message(self, field: str, params: List[str]) -> str:
-        return f"The :attribute must be at least {params[0]}."
+        return f"The :attribute must be at least :min."
 
 class MaxRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
@@ -40,7 +40,6 @@ class MaxRule(Rule):
             # Handle Werkzeug/Flask FileStorage
             if hasattr(value, 'content_length'):  # Flask/Werkzeug
                 file_size = value.content_length
-                print(f"File size (content_length): {file_size}")
                 return file_size <= max_val
                 
             # Handle generic file objects with size attribute
@@ -85,13 +84,13 @@ class MaxRule(Rule):
     def message(self, field: str, params: List[str]) -> str:
         value = self.get_field_value(field)
         if value is None:
-            return f"The :attribute must not exceed {params[0]}"
+            return f"The :attribute must not exceed :max"
             
         # Check all possible file size attributes
         file_attrs = ['content_length', 'size', 'fileno']
         if any(hasattr(value, attr) for attr in file_attrs):
-            return f"File :attribute must not exceed {params[0]} bytes"
-        return f"The :attribute must not exceed {params[0]}"
+            return f"File :attribute must not exceed :max bytes"
+        return f"The :attribute must not exceed :max"
 
 class BetweenRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
@@ -237,7 +236,7 @@ class SameRule(Rule):
         return value == self.get_field_value(params[0]) 
     
     def message(self, field: str, params: List[str]) -> str:
-        return f"The :attribute and {params[0]} must match."
+        return f"The :attribute and :other must match."
 
 class DifferentRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
@@ -247,7 +246,7 @@ class DifferentRule(Rule):
         return str(value) != self.get_field_value(params[0]) 
     
     def message(self, field: str, params: List[str]) -> str:
-        return f"The :attribute and {params[0]} must be different."
+        return f"The :attribute and :other must be different."
 
 class InRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:

validator/services/rule_error_handler.py

@@ -105,7 +105,7 @@ class RuleErrorHandler:
             'required_if', 'required_unless', 
             'exclude_if', 'exclude_unless',
             'missing_if', 'missing_unless',
-            'present_if', 'present_unless'
+            'present_if', 'present_unless',
         }
 
     def _get_field_value_pairs(self) -> List[tuple]:
@@ -177,13 +177,6 @@ class RuleErrorHandler:
         }:
             return self._current_params
             
-        # Single field rules
-        if rule in {
-            'required_if_accepted', 'required_if_declined',
-            'prohibited_if_accepted', 'prohibited_if_declined'
-        }:
-            return [self._current_params[0]] if self._current_params else []
-            
         return []
 
     def _get_min_param(self) -> Optional[str]: