ramifice 0.8.14__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/utils/errors.py

@@ -4,7 +4,7 @@
 class RamificeException(Exception):
     """Ramifice - Root Exception for Ramifice."""
 
-    def __init__(self, *args, **kwargs) -> None:  # type: ignore[no-untyped-def] # noqa: D107
+    def __init__(self, *args, **kwargs) -> None:  # type: ignore[no-untyped-def]# noqa: D107
         super().__init__(*args, **kwargs)
 
 
@@ -35,7 +35,7 @@ class DoesNotMatchRegexError(RamificeException):
 class NoModelsForMigrationError(RamificeException):
     """Ramifice - Exception raised if no Models for migration."""
 
-    def __init__(self):  # type: ignore[no-untyped-def] # noqa: D107
+    def __init__(self) -> None:  # noqa: D107
         self.message = "No Models for Migration!"
         super().__init__(self.message)
 

ramifice/utils/migration.py

@@ -43,7 +43,7 @@ class Migration:
         # Raise the exception if there are no models for migration.
         if len(self.model_list) == 0:
             logger.critical("No Models for Migration!")
-            raise NoModelsForMigrationError()  # type: ignore[no-untyped-call]
+            raise NoModelsForMigrationError()
 
     async def reset(self) -> None:
         """Ramifice - Reset the condition of the models in a super collection.

ramifice/utils/mixins/__init__.py

@@ -1,5 +1,12 @@
 """Ramifice - Set of mixins for Models and Fields."""
 
+__all__ = (
+    "AddValidMixin",
+    "HooksMixin",
+    "IndexMixin",
+    "JsonMixin",
+)
+
 from ramifice.utils.mixins.add_valid import AddValidMixin
 from ramifice.utils.mixins.hooks import HooksMixin
 from ramifice.utils.mixins.indexing import IndexMixin

{ramifice-0.8.14.dist-info → ramifice-0.8.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.14
+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/
@@ -62,6 +62,11 @@ Description-Content-Type: text/markdown
       <a href="https://docs.astral.sh/ruff/" alt="Code style: Ruff"><img src="https://img.shields.io/badge/code%20style-Ruff-FDD835.svg" alt="Code style: Ruff"></a>
       <a href="https://github.com/kebasyaty/ramifice" alt="PyPI implementation"><img src="https://img.shields.io/pypi/implementation/ramifice" alt="PyPI implementation"></a>
       <a href="https://github.com/kebasyaty/ramifice" alt="GitHub repository"><img src="https://img.shields.io/badge/--ecebeb?logo=github&logoColor=000000" alt="GitHub repository"></a>
+      <br>
+      <a href="https://pypi.org/project/ramifice"><img src="https://img.shields.io/pypi/format/ramifice" alt="Format"></a>
+      <a href="https://github.com/kebasyaty/ramifice"><img src="https://img.shields.io/github/languages/top/kebasyaty/ramifice" alt="Top"></a>
+      <a href="https://github.com/kebasyaty/ramifice"><img src="https://img.shields.io/github/repo-size/kebasyaty/ramifice" alt="Size"></a>
+      <a href="https://github.com/kebasyaty/ramifice"><img src="https://img.shields.io/github/last-commit/kebasyaty/ramifice/main" alt="Last commit"></a>
     </p>
     <p align="center">
       Ramifice is built around <a href="https://pypi.org/project/pymongo/" alt="PyMongo">PyMongo</a>.
@@ -127,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
 
@@ -145,7 +151,7 @@ class User:
     """Model of User."""
 
     def fields(self) -> None:
-        """For adding fields."""
+        """Adding fields."""
         # For custom translations.
         gettext = translations.gettext
         # ngettext = translations.ngettext
@@ -182,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
 
@@ -250,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.14.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
@@ -67,18 +67,18 @@ ramifice/paladins/groups/slug_group.py,sha256=QCO0ry0-E7bO9tsD4NajPMMbB0chGmuLyz
 ramifice/paladins/groups/text_group.py,sha256=2CyhZxQgFDv-uGRKIxgngB15_BfgPmhxp4N_X7WXsSQ,4538
 ramifice/utils/__init__.py,sha256=wdOon9X-38jYpgOy1qyN-u7IzbGEXXuXudnzj5xFQGI,54
 ramifice/utils/constants.py,sha256=VFvzFaOfzzhfoLMrI9nH9Dz_P5ktI8cOdqTINFHUEo4,2624
-ramifice/utils/errors.py,sha256=S23nvSwxkNR7W5ByE8HssQSrSfWoEY_Ftn4iOtCU68c,2977
+ramifice/utils/errors.py,sha256=L_eZttzoLvv5_ukCan7vTmCbYcSbuGfOvfd4q4Cy17s,2953
 ramifice/utils/fixtures.py,sha256=R6lHvNp5hvA6Bryom2XNu3CvT-zwXpBGH8AZa3gRC1Q,3357
-ramifice/utils/migration.py,sha256=ZOAiv-9hJbmm5zZt69G3Y4kMGV4EyG4sDbwR0Ta0WAo,11562
+ramifice/utils/migration.py,sha256=IZ3MFJD2n61uJ0Nl90Ll28GJwjUJf_2IOVbATTHDS_A,11529
 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=1W6HoabjN73crpzJ_rmhI10KM9C2RbPZn5Em6Gi9Aig,283
+ramifice/utils/mixins/__init__.py,sha256=fTsjH8h4OGvFC4zGawLLbU2i-c2OBdPftC3A-ZT5Pbw,379
 ramifice/utils/mixins/add_valid.py,sha256=vYq4wGdpfA4iLMts7G0NvDALZBwupOScsajDFWCmmYg,472
 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.14.dist-info/METADATA,sha256=l8x1wfwuS1w3fEOaVN5_aQEVZufoWWkgO8yeQA_dBUc,20361
-ramifice-0.8.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.8.14.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.8.14.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,,