safeshield 1.6.4__py3-none-any.whl → 1.6.6__py3-none-any.whl

{safeshield-1.6.4.dist-info → safeshield-1.6.6.dist-info}/METADATA

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

{safeshield-1.6.4.dist-info → safeshield-1.6.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-safeshield-1.6.4.dist-info/licenses/LICENSE,sha256=YxHGBtuH0Vsy-KPvW2_afKE54XIrf1eipLF4v6kaybI,35276
+safeshield-1.6.6.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
@@ -12,11 +12,11 @@ validator/rules/array.py,sha256=7xwdXnthWZNDbD4lONgqtOf44OOQq1J6XexYm6BXea4,3512
 validator/rules/base.py,sha256=yhxQdGiiM-wY7VtRH-KRU-_wmw7RVJnmJcmayO1EqBk,5870
 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
-validator/rules/numeric.py,sha256=UgawwV_ZKiJ3Dano32UrSBC6Qe69zbiL69OyMDo91yY,8699
+validator/rules/numeric.py,sha256=aY-SU_fgfdm1Em5UFU1t1XbGw9s-FMVyJ5w6IuJ_Ad8,8831
 validator/rules/string.py,sha256=3wgrqAO4V97ZPMc97mwDV6vsNvs6oyJs-ciqQX-FLBs,6268
 validator/rules/utilities.py,sha256=pwo-uhBKDkIV2ZcdVQDBFYMc5ICsKswL904AayBLeBg,17080
 validator/services/__init__.py,sha256=zzKTmqL7v4niFGWHJBfWLqgJ0iTaW_69OzYZN8uInzQ,210
@@ -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.4.dist-info/METADATA,sha256=o4U6ffoKB60H_lc2k50jRS67BeECUuSHIgzRuKBR5hI,6664
-safeshield-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-safeshield-1.6.4.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
-safeshield-1.6.4.dist-info/RECORD,,
+safeshield-1.6.6.dist-info/METADATA,sha256=6Uf7VYaGL3WjE3E8M83Wy0YyQ4fU8fsq-beVKJ2fDfg,6664
+safeshield-1.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+safeshield-1.6.6.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
+safeshield-1.6.6.dist-info/RECORD,,

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)):

validator/rules/numeric.py

@@ -89,7 +89,7 @@ class GreaterThanRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            threshold = decimal.Decimal(params[0])
+            threshold = decimal.Decimal(self.get_field_value(params[0], params[0]))
             numeric_value = decimal.Decimal(str(value))
             return numeric_value > threshold
         except (decimal.InvalidOperation, TypeError, ValueError):
@@ -113,7 +113,7 @@ class GreaterThanOrEqualRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            threshold = decimal.Decimal(params[0])
+            threshold = decimal.Decimal(self.get_field_value(params[0], params[0]))
             numeric_value = decimal.Decimal(str(value))
             return numeric_value >= threshold
         except (decimal.InvalidOperation, TypeError, ValueError):
@@ -137,7 +137,7 @@ class LessThanRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            threshold = decimal.Decimal(params[0])
+            threshold = decimal.Decimal(self.get_field_value(params[0], params[0]))
             numeric_value = decimal.Decimal(str(value))
             return numeric_value < threshold
         except (decimal.InvalidOperation, TypeError, ValueError):
@@ -161,7 +161,7 @@ class LessThanOrEqualRule(Rule):
     
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
-            threshold = decimal.Decimal(params[0])
+            threshold = decimal.Decimal(self.get_field_value(params[0], params[0]))
             numeric_value = decimal.Decimal(str(value))
             return numeric_value <= threshold
         except (decimal.InvalidOperation, TypeError, ValueError):