clear-skies 1.19.27__py3-none-any.whl → 1.19.29__py3-none-any.whl

{clear_skies-1.19.27.dist-info → clear_skies-1.19.29.dist-info}/METADATA

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

{clear_skies-1.19.27.dist-info → clear_skies-1.19.29.dist-info}/RECORD

@@ -55,8 +55,8 @@ clearskies/backends/memory_backend.py,sha256=6Ts_NtP9S_QisvpNcQKO0CUqhCRAuL3d5LZ
 clearskies/backends/restful_api_advanced_search_backend.py,sha256=uiR4SEKhLNmczYJEAkVMIdPWxQc4YWSp-_WzcSL7DEo,5480
 clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2n0-4H4kvs,2204
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
-clearskies/column_types/__init__.py,sha256=QHEFFd3wRXvaOR7uZk-bpVLlLoTiN3D4S8sBU9rFwCE,4330
-clearskies/column_types/audit.py,sha256=smgAnDzNS5n3_1ESeyqn6KDv_1k6gOYRqrFb8S2_TrQ,9143
+clearskies/column_types/__init__.py,sha256=u9M34F9t5jsCHpE-_6MpoSqFh3WJyfHe8wF9UlMzFj0,4464
+clearskies/column_types/audit.py,sha256=2YcrZVVElpOUdmxYTQ_6CshL1HVou6fz65dOOs_b8Gw,9659
 clearskies/column_types/belongs_to.py,sha256=tH1tbTOfjifSNuVjO-KbMF7GiUIoLfcDItrrS3TGGM8,11044
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
@@ -77,6 +77,7 @@ clearskies/column_types/integer.py,sha256=dGIluusPmhLRNg7PplOJLbQI2AXojqRBUHt8ek
 clearskies/column_types/json.py,sha256=TbZkdwCoZYhbALUxof2jENGfaq2i5TlcyBcmo7XzDGQ,652
 clearskies/column_types/many_to_many.py,sha256=Yu5wmMkVqRteMrH_8uSZK-bM_IrfDyv6AFb92iJ1FZs,11984
 clearskies/column_types/many_to_many_with_data.py,sha256=NOYjZedeLIWVyDV4BTRyNmhkNHZzx6SkHLFbL-VqHQU,7769
+clearskies/column_types/phone.py,sha256=aUKshuknqcklA0LhUAdIgCslmAXXnWtXln1q5js8Eh8,1611
 clearskies/column_types/select.py,sha256=1oBslTJ_7QCjlFeEcwJVRL-ED4sXwCESVFRAOonvG2I,297
 clearskies/column_types/string.py,sha256=XbHC31TmlW0k86cvdVJBDyowU8Xis6Te6R0rPLXgLpI,863
 clearskies/column_types/updated.py,sha256=FNyRK-PS6lgFQ9QN2VrcIZP2g5EHGhll6pf-MgqMH7s,566
@@ -202,7 +203,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.27.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.27.dist-info/METADATA,sha256=c9j9MWbb37TZ3JJzWLD9Tdr0eCocVDkNTyDCl-CeEf4,1712
-clear_skies-1.19.27.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.27.dist-info/RECORD,,
+clear_skies-1.19.29.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.29.dist-info/METADATA,sha256=_9U68Hm392uXjqQs-x5bGay9azxktjOnXlxfs_LIsbk,1712
+clear_skies-1.19.29.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.29.dist-info/RECORD,,

clearskies/column_types/__init__.py

@@ -19,6 +19,7 @@ from .integer import Integer
 from .json import JSON
 from .many_to_many import ManyToMany
 from .many_to_many_with_data import ManyToManyWithData
+from .phone import Phone
 from .select import Select
 from .string import String
 from .updated import Updated
@@ -110,6 +111,10 @@ def many_to_many_with_data(name, **kwargs):
     return build_column_config(name, ManyToManyWithData, **kwargs)
 
 
+def phone(name, **kwargs):
+    return build_column_config(name, Phone, **kwargs)
+
+
 def select(name, **kwargs):
     return build_column_config(name, Select, **kwargs)
 
@@ -171,6 +176,8 @@ __all__ = [
     "ManyToMany",
     "many_to_many_with_data",
     "ManyToManyWithData",
+    "phone",
+    "Phone",
     "select",
     "Select",
     "string",

clearskies/column_types/audit.py

@@ -131,9 +131,14 @@ class Audit(has_many.HasMany):
             for key in new_data.keys():
                 if key in exclude_columns:
                     continue
+                if key in parent_columns:
+                    column_data = parent_columns[key].to_json(model)
+                else:
+                    column_data = {key: new_data[key]}
+
                 create_data = {
                     **create_data,
-                    **parent_columns[key].to_json(model),
+                    **column_data,
                 }
                 if key in mask_columns and key in create_data:
                     create_data[key] = "****"
@@ -154,11 +159,19 @@ class Audit(has_many.HasMany):
                 continue
             from_data = {
                 **from_data,
-                **parent_columns[column].to_json(old_model),
+                **(
+                    parent_columns[column].to_json(old_model)
+                    if column in parent_columns
+                    else {column: old_data.get(column)}
+                ),
             }
             to_data = {
                 **to_data,
-                **parent_columns[column].to_json(model),
+                **(
+                    parent_columns[column].to_json(model)
+                    if column in parent_columns
+                    else {column: model._data.get(column)}
+                ),
             }
             if column in mask_columns and column in to_data:
                 to_data[column] = "****"
@@ -187,7 +200,7 @@ class Audit(has_many.HasMany):
                 continue
             final_data = {
                 **final_data,
-                **parent_columns[key].to_json(model),
+                **(parent_columns[key].to_json(model) if key in parent_columns else {key: model.data.get(key)}),
             }
 
         for key in mask_columns:

clearskies/column_types/phone.py

@@ -0,0 +1,48 @@
+from .string import String
+import re
+
+
+class Phone(String):
+    my_configs = [
+        "usa_only",
+    ]
+
+    def __init__(self, di):
+        super().__init__(di)
+
+    def to_backend(self, data):
+        if self.name not in data:
+            return data
+
+        # phone numbers are stored as only digits.
+        return {**data, **{self.name: re.sub(r"\D", "", data[self.name])}}
+
+    def input_error_for_value(self, value, operator=None):
+        if type(value) != str:
+            return f"Value must be a string for {self.name}"
+
+        # we'll allow spaces, dashes, parenthesis, dashes, and plus signs.
+        # if there is anything else then it's not a valid phone number.
+        # However, we don't do more detailed validation, because I'm too lazy to
+        # figure out what is and is not a valid phone number, especially when
+        # you get to the world of international numbers.
+        if re.search(r"[^\d \-()+]", value):
+            return "Invalid phone number"
+
+        # for some final validation (especially US numbers) work only with the digits.
+        value = re.sub(r"\D", "", value)
+
+        if len(value) > 15:
+            return "Invalid phone number"
+
+        # we can't be too short unless we're doing a fuzzy search
+        if len(value) < 10 and operator and operator.lower() != "like":
+            return "Invalid phone number"
+
+        if self.config("usa_only", silent=True):
+            if len(value) > 11:
+                return "Invalid phone number"
+            if value[0] == "1" and len(value) != 11:
+                return "Invalid phone number"
+
+        return ""