ramifice 0.8.15__py3-none-any.whl → 0.8.17__py3-none-any.whl

ramifice/models/model.py

@@ -188,3 +188,14 @@ class Model(metaclass=ABCMeta):
                 elif group == "id":
                     value = ObjectId(value)
             self.__dict__[name].value = value
+
+    # --------------------------------------------------------------------------
+    def get_clean_data(self) -> tuple[dict[str, Any], dict[str, str]]:
+        """Get clean data."""
+        clean_data: dict[str, Any] = {}
+
+        for name, data in self.__dict__.items():
+            if not callable(data):
+                clean_data[name] = data.value
+
+        return (clean_data, {})

ramifice/paladins/check.py

@@ -65,7 +65,7 @@ class CheckMixin(
 
         result_map: dict[str, Any] = {}
         # Errors from additional validation of fields.
-        error_map: dict[str, str] = await self.add_validation() or {}
+        error_map: dict[str, str] = await self.add_validation()
         # Get Model collection.
         if collection is None:
             collection = constants.MONGO_DATABASE[cls_model.META["collection_name"]]

ramifice/utils/mixins/add_valid.py

@@ -10,5 +10,4 @@ class AddValidMixin(metaclass=ABCMeta):
 
     async def add_validation(self) -> dict[str, str]:
         """Ramifice - Additional validation of fields."""
-        error_map: dict[str, str] = {}
-        return error_map
+        return {}

{ramifice-0.8.15.dist-info → ramifice-0.8.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.15
+Version: 0.8.17
 Summary: ORM-pseudo-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/
@@ -132,6 +132,7 @@ It is recommended to look at examples [here](https://github.com/kebasyaty/ramifi
 ```python
 import re
 import asyncio
+from typing import Any
 from datetime import datetime
 import pprint
 
@@ -187,25 +188,20 @@ class User:
             ignored=True,
         )
 
-
-    # Optional method.
+    # Optional method
     async def add_validation(self) -> dict[str, str]:
         """Additional validation of fields."""
         gettext = translations.gettext
-        error_map: dict[str, str] = {}
-
-        # Get clean data.
-        id = self.id.value
-        username = self.username.value
-        password = self.password.value
-        сonfirm_password = self.сonfirm_password.value
+        cd, err_map = self.get_clean_data()
 
-        if re.match(r"^[a-zA-Z0-9_]+$", username) is None:
-            error_map["username"] = gettext("Allowed chars: %s") % "a-z A-Z 0-9 _"
+        # Check username
+        if re.match(r"^[a-zA-Z0-9_]+$", cd["username"]) is None:
+            err_map["username"] = gettext("Allowed chars: %s") % "a-z A-Z 0-9 _"
 
-        if id is None and (password != сonfirm_password):
-            error_map["password"] = gettext("Passwords do not match!")
-        return error_map
+        # Check password
+        if cd["_id"] is None and (cd["password"] != cd["сonfirm_password"]):
+            err_map["password"] = gettext("Passwords do not match!")
+        return err_map
 
 
 async def main():
@@ -255,6 +251,9 @@ async def main():
     # (if necessary)
     # await User.collection().drop()
 
+    # Close connection.
+    await client.close()
+
 
 if __name__ == "__main__":
     asyncio.run(main())

{ramifice-0.8.15.dist-info → ramifice-0.8.17.dist-info}/RECORD

@@ -45,9 +45,9 @@ ramifice/fields/general/number_group.py,sha256=jspiA9hWiU_hNhXbTku2rZG3UezrhEVBG
 ramifice/fields/general/text_group.py,sha256=hYVX4-ipD2_eyj-WpHIHnFrpQevySaVd4twffUsrOLo,1164
 ramifice/models/__init__.py,sha256=y5jRhSzcPuEVUWr1u--o1GyjFb7irlf5Rn2gPvQ3IPg,26
 ramifice/models/decorator.py,sha256=PX6b8DTP_Qz1SjyPcZ1vGDS4AGRZ6ZD8z8y6497j-DM,6685
-ramifice/models/model.py,sha256=m19E7h3Fv2F7oDotc1z_n_NglFN7KmXOrNL0r4Jg_y4,7352
+ramifice/models/model.py,sha256=ufBWkAHvZjP3kN9x-VMPVq7k6vHhxcTvECV-BvaP6dc,7750
 ramifice/paladins/__init__.py,sha256=I2FzvCrp6upv_GPLfDqaVLwIT6-3Dp_K9i51tFUXDuc,673
-ramifice/paladins/check.py,sha256=mxvnHR9EG7eQrGOE7wph1lCUq3jf2RF0Ovhhtz7W3g8,6974
+ramifice/paladins/check.py,sha256=L7mYsN5qp6ZlGiyPBQK1jw4GN03aIh8QpbbdK6-n6S4,6968
 ramifice/paladins/delete.py,sha256=Ynew5zvEBRJNmss5I8hSIp7KgBHpSvDEJCwOfMH5MUU,3723
 ramifice/paladins/password.py,sha256=hdEfSwz0a9FJ5IIYpyD9bmV_kNGvXP4OV5Ea-V0Yx98,3341
 ramifice/paladins/refrash.py,sha256=0qst0ii2ThH-VJduSI1zgkuZQGLnR8IiIu5rTVxzM9U,1254
@@ -74,11 +74,11 @@ ramifice/utils/tools.py,sha256=LZyA715HnkNO7TcBu4Ia29A6Ko3n-F2BRULzIyNKt9o,3279
 ramifice/utils/translations.py,sha256=Jh0nzwcn3bhUU2TjPAQboe3_pkVyhYQYdeINyC5SQo8,4701
 ramifice/utils/unit.py,sha256=ToBeu92tzOY32fuzLdxScNeYXvGIDr0nx7yTv2DShVo,2604
 ramifice/utils/mixins/__init__.py,sha256=fTsjH8h4OGvFC4zGawLLbU2i-c2OBdPftC3A-ZT5Pbw,379
-ramifice/utils/mixins/add_valid.py,sha256=vYq4wGdpfA4iLMts7G0NvDALZBwupOScsajDFWCmmYg,472
+ramifice/utils/mixins/add_valid.py,sha256=00eIBlgsUU1TfDo1rUQT5zw7_Iv9IubORTbzuKoVB5o,425
 ramifice/utils/mixins/hooks.py,sha256=h8coNstWWHI4VwPgpjx0NWTj93-5NDAGtav0VFh-fk4,1031
 ramifice/utils/mixins/indexing.py,sha256=WVLxmkLKg-C_LHn2hq6LJuOkSr9eS-XUUvCMgK-pKYo,387
 ramifice/utils/mixins/json_converter.py,sha256=qBqFYol3Pbq1kX33EWB6FsYUL3AGSdYNtQE97HQ9jy4,1225
-ramifice-0.8.15.dist-info/METADATA,sha256=vQ7R_-JH-IBtlnJYLSNYMVM0jCmS25dLfvJNOrimQdM,20928
-ramifice-0.8.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.8.15.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.8.15.dist-info/RECORD,,
+ramifice-0.8.17.dist-info/METADATA,sha256=gXiqJfKJX6s5dpHEir2eZeU82lhZPdUP9Osf74Ba6BI,20884
+ramifice-0.8.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.8.17.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.8.17.dist-info/RECORD,,