safeshield 1.6.4__tar.gz → 1.6.6__tar.gz

{safeshield-1.6.4/safeshield.egg-info → safeshield-1.6.6}/PKG-INFO

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

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

@@ -10,7 +10,7 @@ def get_requirements():
 
 setup(
     name="safeshield",
-    version="1.6.4",
+    version="1.6.6",
     packages=find_packages(),
     install_requires=get_requirements(),
     author="Wunsun Tarniho",

{safeshield-1.6.4 → safeshield-1.6.6}/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)):

{safeshield-1.6.4 → safeshield-1.6.6}/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):