safeshield 1.6.5__tar.gz → 1.6.8__tar.gz

{safeshield-1.6.5/safeshield.egg-info → safeshield-1.6.8}/PKG-INFO

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

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

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

{safeshield-1.6.5 → safeshield-1.6.8}/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
         

{safeshield-1.6.5 → safeshield-1.6.8}/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)

{safeshield-1.6.5 → safeshield-1.6.8}/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)):