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

ramifice/models/model.py

@@ -188,3 +188,12 @@ class Model(metaclass=ABCMeta):
                 elif group == "id":
                     value = ObjectId(value)
             self.__dict__[name].value = value
+
+    # --------------------------------------------------------------------------
+    def get_clean_data(self) -> dict[str, Any]:
+        """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-0.8.15.dist-info → ramifice-0.8.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.15
+Version: 0.8.16
 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,23 +188,21 @@ 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
+        # Get clean data
+        cd: dict[str, Any] = self.get_clean_data()
 
-        if re.match(r"^[a-zA-Z0-9_]+$", username) is None:
+        # Check username
+        if re.match(r"^[a-zA-Z0-9_]+$", cd["username"]) is None:
             error_map["username"] = gettext("Allowed chars: %s") % "a-z A-Z 0-9 _"
 
-        if id is None and (password != сonfirm_password):
+        # Check password
+        if cd["id"] is None and (cd["password"] != cd["сonfirm_password"]):
             error_map["password"] = gettext("Passwords do not match!")
         return error_map
 
@@ -255,6 +254,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.16.dist-info}/RECORD

@@ -45,7 +45,7 @@ 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=Q2FG0zBNCIPEQZXLEj_l2kB-6LT0acFKoBVU7hYiDPE,7717
 ramifice/paladins/__init__.py,sha256=I2FzvCrp6upv_GPLfDqaVLwIT6-3Dp_K9i51tFUXDuc,673
 ramifice/paladins/check.py,sha256=mxvnHR9EG7eQrGOE7wph1lCUq3jf2RF0Ovhhtz7W3g8,6974
 ramifice/paladins/delete.py,sha256=Ynew5zvEBRJNmss5I8hSIp7KgBHpSvDEJCwOfMH5MUU,3723
@@ -78,7 +78,7 @@ ramifice/utils/mixins/add_valid.py,sha256=vYq4wGdpfA4iLMts7G0NvDALZBwupOScsajDFW
 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.16.dist-info/METADATA,sha256=ySscCHH2SOY5PCObHgagtPdTrzdwQSeQNYCaj-8GRxU,20961
+ramifice-0.8.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.8.16.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.8.16.dist-info/RECORD,,