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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: safeshield
-Version: 1.6.8
+Version: 1.6.11
 Summary: Library for Help Validation Control
 Home-page: https://github.com/WunsunTarniho/py-guard
 Author: Wunsun Tarniho
@@ -21,11 +21,10 @@ Requires-Dist: Pillow==11.2.1
 Requires-Dist: psycopg2-binary==2.9.9
 Requires-Dist: python-dotenv==1.1.1
 Requires-Dist: python_dateutil==2.9.0.post0
-Requires-Dist: setuptools==75.8.2
 Requires-Dist: SQLAlchemy==2.0.41
 Requires-Dist: Werkzeug==1.0.1
 Requires-Dist: dnspython==2.4.2
-Requires-Dist: idna==3.4
+Requires-Dist: idna==3.6
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

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

@@ -1,4 +1,4 @@
-safeshield-1.6.8.dist-info/licenses/LICENSE,sha256=YxHGBtuH0Vsy-KPvW2_afKE54XIrf1eipLF4v6kaybI,35276
+safeshield-1.6.11.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=P9D-qbXmhY6LjZZSTKNRNK2YuRmjE7aKIEJud6pWMrk,1175
@@ -13,7 +13,7 @@ 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=BnPPPkf_5TiWNbWX-HzYtpqMpeWWKF2vaj5yXoxMpjc,15863
-validator/rules/date.py,sha256=k27U3e08OPZoXyEX0Yj86ZfjCUuhLy4eBmqYbyc4Jn4,7292
+validator/rules/date.py,sha256=yQkwS5F06BnfiDrnydQv1XRnLLsFT1LCF3fOYJNVa2s,7697
 validator/rules/files.py,sha256=3Q0KoadDKqNIiVlBR7b5b-XBs4gOg3ZFu7wU7SrdqWQ,12280
 validator/rules/format.py,sha256=u_BhPQwW30JYHwZIjHD0ZX449csgTPPCJOeoXaQr4M4,7361
 validator/rules/numeric.py,sha256=aY-SU_fgfdm1Em5UFU1t1XbGw9s-FMVyJ5w6IuJ_Ad8,8831
@@ -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.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,,
+safeshield-1.6.11.dist-info/METADATA,sha256=RZEu6iMoRK3nfpu-FSvSx7ftLdcnE6ZQ2sd66QdmtlM,6630
+safeshield-1.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+safeshield-1.6.11.dist-info/top_level.txt,sha256=iUtV3dlHOIiMfLuY4pruY00lFni8JzOkQ3Nh1II19OE,10
+safeshield-1.6.11.dist-info/RECORD,,

validator/rules/date.py

@@ -4,13 +4,30 @@ from datetime import datetime
 import zoneinfo
 from dateutil.parser import parse
 
+def parse_date(value):
+    formats = [
+        "%Y-%m-%d",      
+        "%d/%m/%Y",    
+        "%m/%d/%Y",
+        "%d-%m-%Y", 
+        "%m-%d-%Y",
+    ]
+    
+    for fmt in formats:
+        try:
+            return datetime.strptime(value, fmt)
+        except ValueError:
+            continue
+    
+    raise ValueError(f"Unable to parse date: {value}")
+
 class DateRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         if not isinstance(value, str):
             return False
             
         try:
-            parse(value)
+            parse_date(value)
             return True
         except ValueError:
             return False
@@ -25,7 +42,7 @@ class DateEqualsRule(Rule):
         
         try:
             if isinstance(value, str):
-                date1 = parse(value)
+                date1 = parse_date(value)
             elif isinstance(value, datetime):
                 date1 = value
             else:
@@ -34,7 +51,7 @@ class DateEqualsRule(Rule):
             params = list(params)
             params[0] = self.get_field_value(params[0], params[0])
             
-            date2 = parse(params[0])
+            date2 = parse_date(params[0])
             return date1 == date2
         except ValueError as e:
             return False
@@ -57,7 +74,7 @@ class AfterRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
             if isinstance(value, str):
-                date_value = parse(value)
+                date_value = parse_date(value)
             elif isinstance(value, datetime):
                 date_value = value
             else:
@@ -66,7 +83,7 @@ class AfterRule(Rule):
             
             params = list(params)# Parse comparison date
             params[0] = self.get_field_value(params[0], params[0])
-            compare_date = parse(params[0])
+            compare_date = parse_date(params[0])
             
             return date_value > compare_date
             
@@ -91,7 +108,7 @@ class AfterOrEqualRule(Rule):
     def validate(self, field: str, value: Any, params: List[str]) -> bool:
         try:
             if isinstance(value, str):
-                date_value = parse(value)
+                date_value = parse_date(value)
             elif isinstance(value, datetime):
                 date_value = value
             else:
@@ -99,7 +116,7 @@ class AfterOrEqualRule(Rule):
             
             params = list(params)
             params[0] = self.get_field_value(params[0], params[0])
-            compare_date = parse(params[0])
+            compare_date = parse_date(params[0])
             
             return date_value >= compare_date
             
@@ -126,7 +143,7 @@ class BeforeRule(Rule):
     
         try:
             if isinstance(value, str):
-                date_value = parse(value)
+                date_value = parse_date(value)
             elif isinstance(value, datetime):
                 date_value = value
             else:
@@ -134,7 +151,7 @@ class BeforeRule(Rule):
             
             params = list(params)
             params[0] = self.get_field_value(params[0], params[0])
-            compare_date = parse(params[0])
+            compare_date = parse_date(params[0])
             
             return date_value < compare_date
             
@@ -161,7 +178,7 @@ class BeforeOrEqualRule(Rule):
         
         try:
             if isinstance(value, str):
-                date_value = parse(value)
+                date_value = parse_date(value)
             elif isinstance(value, datetime):
                 date_value = value
             else:
@@ -169,11 +186,9 @@ class BeforeOrEqualRule(Rule):
             
             params = list(params)
             params[0] = self.get_field_value(params[0], params[0])
-            compare_date = parse(params[0])
-            
+            compare_date = parse_date(params[0])
             return date_value <= compare_date
-            
-        except (ValueError, TypeError):
+        except (ValueError, TypeError) as e:
             return False
     
     def message(self, field: str, params: List[str]) -> str: