safeshield 1.6.5__py3-none-any.whl → 1.6.8__py3-none-any.whl

{safeshield-1.6.5.dist-info → safeshield-1.6.8.dist-info}/METADATA

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

{safeshield-1.6.5.dist-info → safeshield-1.6.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-safeshield-1.6.5.dist-info/licenses/LICENSE,sha256=YxHGBtuH0Vsy-KPvW2_afKE54XIrf1eipLF4v6kaybI,35276
+safeshield-1.6.8.dist-info/licenses/LICENSE,sha256=YxHGBtuH0Vsy-KPvW2_afKE54XIrf1eipLF4v6kaybI,35276
 validator/__init__.py,sha256=udxDzUicPfxBOAQvzsnl3pHur9VUppKbWMgg35hpiww,244
 validator/exceptions.py,sha256=y2v7CaXmeGFHWcnigtLl4U-sFta_jMiXkGKXWIIVglY,366
-validator/factory.py,sha256=SJ2iJmTnFS-4ccH-gzZl_7CAW7Z6YJkZbMImu-po80w,1163
+validator/factory.py,sha256=P9D-qbXmhY6LjZZSTKNRNK2YuRmjE7aKIEJud6pWMrk,1175
 validator/core/__init__.py,sha256=ZcqlXJSk03i_CVzmIN-nVe1UOyvwwO5jhbEj7f62Y_o,59
 validator/core/validator.py,sha256=cflLhGo_rS6Zh61X7lZfr0q-xR0bBHfylGudZ1uTn7o,12765
 validator/database/__init__.py,sha256=O-cB6-MhNapJ3iwe5jvifbMfr1dPjXLtEdfNTKIu0hc,171
@@ -9,10 +9,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=7xwdXnthWZNDbD4lONgqtOf44OOQq1J6XexYm6BXea4,3512
-validator/rules/base.py,sha256=yhxQdGiiM-wY7VtRH-KRU-_wmw7RVJnmJcmayO1EqBk,5870
+validator/rules/base.py,sha256=fFc12nUmaPWzoDFvikn7aFQiRsK5zoP5Ld4qBK9fHDE,5871
 validator/rules/basic.py,sha256=8k-REzsSyknhNuw0vPKMxtovvJBVlyZDihXXVznRQpM,6420
 validator/rules/boolean.py,sha256=UuSO9BdBMR5l6sB3dgZqoqOVjqu47yjFrmJ7xylTVKs,5452
-validator/rules/comparison.py,sha256=BnufmgCkSqzUjSFWvlsKN8auOCKTBs7Pxy5i9rwSQs8,15564
+validator/rules/comparison.py,sha256=BnPPPkf_5TiWNbWX-HzYtpqMpeWWKF2vaj5yXoxMpjc,15863
 validator/rules/date.py,sha256=k27U3e08OPZoXyEX0Yj86ZfjCUuhLy4eBmqYbyc4Jn4,7292
 validator/rules/files.py,sha256=3Q0KoadDKqNIiVlBR7b5b-XBs4gOg3ZFu7wU7SrdqWQ,12280
 validator/rules/format.py,sha256=u_BhPQwW30JYHwZIjHD0ZX449csgTPPCJOeoXaQr4M4,7361
@@ -25,7 +25,7 @@ validator/services/rule_error_handler.py,sha256=l4jA6WtTRBNGytVA_nSwJpbix_viNWhq
 validator/services/rule_preparer.py,sha256=7HSMuSGGgaYWv8dt_m7pL5MQkJcTwFBH9gfmCZwzt8U,5284
 validator/utils/__init__.py,sha256=Yzo-xv285Be-a233M4duDdYtscuHiuBbPSX_C8yViJI,20
 validator/utils/string.py,sha256=0YACzeEaWNEOR9_7O9A8D1ItIbtWfOJ8IfrzcB8VMYA,515
-safeshield-1.6.5.dist-info/METADATA,sha256=OVljqH15_ZEVenjySC6L7oWe2Kc-tSPnvftfSfiD35U,6664
-safeshield-1.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-safeshield-1.6.5.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
-safeshield-1.6.5.dist-info/RECORD,,
+safeshield-1.6.8.dist-info/METADATA,sha256=Eldu5ERyxn2ivKtDZSX2GADh3l-KpnPkfmk1cAlFdaU,6664
+safeshield-1.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+safeshield-1.6.8.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
+safeshield-1.6.8.dist-info/RECORD,,

validator/factory.py

@@ -19,10 +19,10 @@ class RuleFactory:
             _name = name
             
             def validate(self, field: str, value: Any, params: List[str]) -> bool:
-                return validate_func(field, value, params)
+                return validate_func(self, field, value, params)
             
             def message(self, field: str, params: List[str]) -> str:
-                return message_func(field, params)
+                return message_func(self, field, params)
             
         cls._rules[name] = NewRule
         

validator/rules/base.py

@@ -90,7 +90,7 @@ class Rule(ABC):
     
     def replacements(self, field, value) -> Dict[str, str]:
         """Default replacements for all rules"""
-        return {':attribute': self._get_display_name(field), 'value': value }
+        return {':attribute': self._get_display_name(field), ':value': value }
     
     def _get_display_name(self, fields: str) -> str:
         single_input = isinstance(fields, str)

validator/rules/comparison.py

@@ -10,13 +10,17 @@ class MinRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            min_val = float(params[0])
+            min_val = float(self.get_field_value(params[0], params[0]))
         except ValueError:
             return False
+        
+        try:
+            numeric_value = float(value)
+            return min_val < numeric_value
+        except ValueError:
+            pass
             
-        if isinstance(value, (int, float)):
-            return value >= min_val
-        elif isinstance(value, str):
+        if isinstance(value, str):
             try:
                 return len(value) >= min_val
             except ValueError:
@@ -42,7 +46,10 @@ class MaxRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            max_val = float(params[0])
+            try:
+                max_val = float(self.get_field_value(params[0], params[0]))
+            except ValueError:
+                return False
             
             # Handle Werkzeug/Flask FileStorage
             if hasattr(value, 'content_length'):  # Flask/Werkzeug
@@ -66,8 +73,11 @@ class MaxRule(Rule):
                     pass
 
             # Numeric validation
-            if isinstance(value, (int, float)):
-                return value <= max_val
+            try:
+                numeric_value = float(value)
+                return numeric_value <= max_val
+            except ValueError:
+                pass
                 
             # String/collection length validation
             if isinstance(value, (str, list, dict, set, tuple)):