clear-skies 1.19.6__py3-none-any.whl → 1.19.8__py3-none-any.whl

{clear_skies-1.19.6.dist-info → clear_skies-1.19.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.19.6
+Version: 1.19.8
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.19.6.dist-info → clear_skies-1.19.8.dist-info}/RECORD

@@ -159,7 +159,9 @@ clearskies/input_outputs/exceptions/cli_input_error.py,sha256=kOFU8aLTLmeTL_AKDs
 clearskies/input_outputs/exceptions/cli_not_found.py,sha256=JBBuZA9ZwdkPhd3a0qaGgEPQrxh1fehy4R3ZaV2gWXU,39
 clearskies/input_outputs/input_output.py,sha256=vYKn9SE5erS4LuOhhAsXqaOEsGXwZ1NJ4v85KN1Xg6A,4501
 clearskies/input_outputs/wsgi.py,sha256=9p82eJP5FUAI6jbIojvydG3_9gncX7vcUACQMyRN9x4,3142
-clearskies/input_requirements/__init__.py,sha256=7PVLuq60-LjO4wteZMiHTS3z8QWNdspnQQlzh-sohMc,1456
+clearskies/input_requirements/__init__.py,sha256=vIqm8KDiomQSxT7WjogFi1yOOrsVrNMb5GKlfw5USNk,1836
+clearskies/input_requirements/after.py,sha256=TXy8bIVz_77a8oJuohPwoM5E--AOVWsOSjjh5PpA2Ys,1544
+clearskies/input_requirements/before.py,sha256=iLg-Hub9iW2eP19s5fkPrA9TCT_-DTm5KoxgA8ho0-k,1547
 clearskies/input_requirements/in_the_future_at_least.py,sha256=PLVp_2Yv-1ScKnajlc9hjG7qYZhadKXHNTkRP7WKUdo,739
 clearskies/input_requirements/in_the_future_at_most.py,sha256=L5Oz47KAHv5WL6Nu2vGkql6q8Ha9IKJMj-uxQkyuIdc,737
 clearskies/input_requirements/in_the_past_at_least.py,sha256=ES0SgtADHcu7HZDdvIFyD9vpYTnrd4hBi03OShqUZg4,735
@@ -197,7 +199,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.19.6.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.6.dist-info/METADATA,sha256=-DjicQ4vxHg6QBQ-JmqHq6Jj5ffO09Umuv93ExJ7gr0,1366
-clear_skies-1.19.6.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.6.dist-info/RECORD,,
+clear_skies-1.19.8.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.8.dist-info/METADATA,sha256=ItzA59xKexgK8-N_kyD459-tDdgUy3Yji5lJptXLbik,1366
+clear_skies-1.19.8.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.8.dist-info/RECORD,,

clearskies/input_requirements/__init__.py

@@ -1,5 +1,7 @@
 import datetime
 
+from .after import After
+from .before import Before
 from ..binding_config import BindingConfig
 from .minimum_length import MinimumLength
 from .maximum_length import MaximumLength
@@ -13,11 +15,19 @@ from .in_the_past_at_most import InThePastAtMost
 from .time_delta import TimeDelta
 
 
-def minimum_length(minimum_length):
+def after(other_column_name: str, allow_equal: bool = False):
+    return BindingConfig(After, other_column_name=other_column_name, allow_equal=allow_equal)
+
+
+def before(other_column_name: str, allow_equal: bool = False):
+    return BindingConfig(Before, other_column_name=other_column_name, allow_equal=allow_equal)
+
+
+def minimum_length(minimum_length: int):
     return BindingConfig(MinimumLength, minimum_length)
 
 
-def maximum_length(maximum_length):
+def maximum_length(maximum_length: int):
     return BindingConfig(MaximumLength, maximum_length)
 
 

clearskies/input_requirements/after.py

@@ -0,0 +1,36 @@
+from .requirement import Requirement
+import datetime
+import dateparser
+
+
+class After(Requirement):
+    def configure(self, other_column_name: str, allow_equal: bool = False):
+        self.other_column_name = other_column_name
+        self.allow_equal = allow_equal
+
+    def check(self, model, data):
+        # we won't check anything for missing values (columns should be required if that is an issue)
+        if not data.get(self.column_name):
+            return ""
+        my_value = data[self.column_name]
+        other_value = data.get(self.other_column_name, model.__getitem__(self.other_column_name))
+        # again, no checks for non-values
+        if not other_value:
+            return ""
+
+        my_value_as_date = dateparser.parse(data[self.column_name])
+        if not my_value_as_date:
+            return f"'{self.column_name}' was not a valid date."
+
+        if type(other_value) != str and type(other_value) != datetime.datetime:
+            return f"'{other_column_name}' was not a valid date."
+        other_value_as_date = dateparser.parse(other_value) if type(other_value) == str else other_value
+        if not other_value_as_date:
+            return f"'{self.other_column_name}' was not a valid date."
+
+        if my_value_as_date == other_value_as_date:
+            return "" if self.allow_equal else f"'{self.column_name}' must be after '{self.other_column_name}'"
+
+        if my_value_as_date < other_value_as_date:
+            return f"'{self.column_name}' must be after '{self.other_column_name}'"
+        return ""

clearskies/input_requirements/before.py

@@ -0,0 +1,36 @@
+from .requirement import Requirement
+import datetime
+import dateparser
+
+
+class Before(Requirement):
+    def configure(self, other_column_name: str, allow_equal: bool = False):
+        self.other_column_name = other_column_name
+        self.allow_equal = allow_equal
+
+    def check(self, model, data):
+        # we won't check anything for missing values (columns should be required if that is an issue)
+        if not data.get(self.column_name):
+            return ""
+        my_value = data[self.column_name]
+        other_value = data.get(self.other_column_name, model.__getitem__(self.other_column_name))
+        # again, no checks for non-values
+        if not other_value:
+            return ""
+
+        my_value_as_date = dateparser.parse(data[self.column_name])
+        if not my_value_as_date:
+            return f"'{self.column_name}' was not a valid date."
+
+        if type(other_value) != str and type(other_value) != datetime.datetime:
+            return f"'{other_column_name}' was not a valid date."
+        other_value_as_date = dateparser.parse(other_value) if type(other_value) == str else other_value
+        if not other_value_as_date:
+            return f"'{self.other_column_name}' was not a valid date."
+
+        if my_value_as_date == other_value_as_date:
+            return "" if self.allow_equal else f"'{self.column_name}' must be before '{self.other_column_name}'"
+
+        if my_value_as_date > other_value_as_date:
+            return f"'{self.column_name}' must be before '{self.other_column_name}'"
+        return ""