ramifice 0.8.18__py3-none-any.whl → 0.8.20__py3-none-any.whl

ramifice/__init__.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Ramifice - ORM-like API MongoDB for Python language."""
+"""ORM-pseudo-like API MongoDB for Python language."""
 
 __all__ = (
+    "NamedTuple",
     "model",
     "translations",
     "Migration",
@@ -23,6 +24,8 @@ __all__ = (
 
 import logging
 
+from xloft import NamedTuple
+
 from ramifice.models.decorator import model
 from ramifice.utils import translations
 from ramifice.utils.migration import Migration

ramifice/models/decorator.py

@@ -13,9 +13,6 @@ from ramifice.models.model import Model
 from ramifice.paladins import QPaladinsMixin
 from ramifice.utils.constants import REGEX
 from ramifice.utils.errors import DoesNotMatchRegexError, PanicError
-from ramifice.utils.mixins.add_valid import AddValidMixin
-from ramifice.utils.mixins.hooks import HooksMixin
-from ramifice.utils.mixins.indexing import IndexMixin
 
 logger = logging.getLogger(__name__)
 
@@ -91,9 +88,6 @@ def model(
                 Model,
                 QPaladinsMixin,
                 QCommonsMixin,
-                AddValidMixin,
-                IndexMixin,
-                HooksMixin,
             ),
             attrs,
         )

ramifice/models/model.py

@@ -9,6 +9,7 @@ import orjson
 from babel.dates import format_date, format_datetime
 from bson.objectid import ObjectId
 from dateutil.parser import parse
+from xloft import NamedTuple
 
 from ramifice.fields import DateTimeField, IDField
 from ramifice.utils import translations
@@ -190,12 +191,14 @@ class Model(metaclass=ABCMeta):
             self.__dict__[name].value = value
 
     # --------------------------------------------------------------------------
-    def get_clean_data(self) -> tuple[dict[str, Any], dict[str, str]]:
+    def get_clean_data(self) -> tuple[NamedTuple, NamedTuple]:
         """Get clean data."""
         clean_data: dict[str, Any] = {}
+        error_map: dict[str, Any] = {}
 
         for name, data in self.__dict__.items():
             if not callable(data):
                 clean_data[name] = data.value
+                error_map[name] = None
 
-        return (clean_data, {})
+        return (NamedTuple(**clean_data), NamedTuple(**error_map))

ramifice/paladins/__init__.py

@@ -2,8 +2,11 @@
 
 __all__ = ("QPaladinsMixin",)
 
+from ramifice.paladins.add_valid import AddValidMixin
 from ramifice.paladins.check import CheckMixin
 from ramifice.paladins.delete import DeleteMixin
+from ramifice.paladins.hooks import HooksMixin
+from ramifice.paladins.indexing import IndexMixin
 from ramifice.paladins.password import PasswordMixin
 from ramifice.paladins.refrash import RefrashMixin
 from ramifice.paladins.save import SaveMixin
@@ -17,6 +20,9 @@ class QPaladinsMixin(
     DeleteMixin,
     RefrashMixin,
     ValidationMixin,
+    AddValidMixin,
+    HooksMixin,
+    IndexMixin,
 ):
     """Ramifice - Paladins - Model instance methods."""
 

ramifice/{utils/mixins → paladins}/add_valid.py

@@ -4,10 +4,12 @@ __all__ = ("AddValidMixin",)
 
 from abc import ABCMeta
 
+from xloft import NamedTuple
+
 
 class AddValidMixin(metaclass=ABCMeta):
     """Ramifice - Contains an abstract method for additional validation of fields."""
 
-    async def add_validation(self) -> dict[str, str]:
+    async def add_validation(self) -> NamedTuple:
         """Ramifice - Additional validation of fields."""
-        return {}
+        return NamedTuple()

ramifice/utils/mixins/__init__.py

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

{ramifice-0.8.18.dist-info → ramifice-0.8.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.18
+Version: 0.8.20
 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/
@@ -8,7 +8,7 @@ Project-URL: Repository, https://github.com/kebasyaty/ramifice
 Project-URL: Source, https://github.com/kebasyaty/ramifice
 Project-URL: Bug Tracker, https://github.com/kebasyaty/ramifice/issues
 Project-URL: Changelog, https://github.com/kebasyaty/ramifice/blob/v0/CHANGELOG.md
-Author-email: Gennady Kostyunin <kebasyaty@gmail.com>
+Author-email: kebasyaty <kebasyaty@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
 Keywords: mongo,mongodb,orm,pymongo,ramifice
@@ -35,6 +35,7 @@ Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: python-slugify>=8.0.4
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: termcolor>=3.1.0
+Requires-Dist: xloft>=0.1.6
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -137,7 +138,12 @@ from datetime import datetime
 import pprint
 
 from pymongo import AsyncMongoClient
-from ramifice import model, translations, Migration
+from ramifice import (
+    NamedTuple,
+    model,
+    translations,
+    Migration,
+)
 from ramifice.fields import (
     ImageField,
     PasswordField,
@@ -189,18 +195,18 @@ class User:
         )
 
     # Optional method
-    async def add_validation(self) -> dict[str, str]:
+    async def add_validation(self) -> NamedTuple:
         """Additional validation of fields."""
         gettext = translations.gettext
         cd, err = self.get_clean_data()
 
         # Check username
-        if re.match(r"^[a-zA-Z0-9_]+$", cd["username"]) is None:
-            err["username"] = gettext("Allowed chars: %s") % "a-z A-Z 0-9 _"
+        if re.match(r"^[a-zA-Z0-9_]+$", cd.username) is None:
+            err.update("username", gettext("Allowed chars: %s") % "a-z A-Z 0-9 _")
 
         # Check password
-        if cd["_id"] is None and (cd["password"] != cd["сonfirm_password"]):
-            err["password"] = gettext("Passwords do not match!")
+        if cd._id is None and (cd.password != cd.сonfirm_password):
+            err.update("password", gettext("Passwords do not match!"))
 
         return err
 

{ramifice-0.8.18.dist-info → ramifice-0.8.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ramifice/__init__.py,sha256=Xejr_t4cimFFNKS6xXvAeLRue1vTB5kZWGeYbHXDUDw,1116
+ramifice/__init__.py,sha256=eMxD1xjSRQ_DU1BSs9FSgt--Xs4rKdsHgY2h2lhvq7M,1163
 ramifice/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramifice/commons/__init__.py,sha256=F5tnz0bz7IcwOT9wkPmyWL7cDDUI1BUVSfC73G56dfs,567
 ramifice/commons/general.py,sha256=HuErflr-dZ2pWhaSy81IGllFfGxlj8yrdnaAEGUtK3M,5554
@@ -44,11 +44,14 @@ ramifice/fields/general/file_group.py,sha256=SmF8OHKXsyZtWr90n8iCAXBXFQrjRV2HdDc
 ramifice/fields/general/number_group.py,sha256=jspiA9hWiU_hNhXbTku2rZG3UezrhEVBGopNgooJ4ig,813
 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=ufBWkAHvZjP3kN9x-VMPVq7k6vHhxcTvECV-BvaP6dc,7750
-ramifice/paladins/__init__.py,sha256=I2FzvCrp6upv_GPLfDqaVLwIT6-3Dp_K9i51tFUXDuc,673
+ramifice/models/decorator.py,sha256=f9PGmU927BkIOirtloGs3R3IhjiL8P3_0KgCkAqDz_A,6429
+ramifice/models/model.py,sha256=M-pYUqzOhvzZEc2tfPy5fNDdrtIC2mFvajV3q2CpOfc,7887
+ramifice/paladins/__init__.py,sha256=_8eJ6dAr_omSAU6VUZQjxty0V52ExBPReyUFToDX4PQ,881
+ramifice/paladins/add_valid.py,sha256=Yxo8LfJMxcAsY-ooZV1cLwFsfjxV5MPR0ebnWpyo4oE,463
 ramifice/paladins/check.py,sha256=L7mYsN5qp6ZlGiyPBQK1jw4GN03aIh8QpbbdK6-n6S4,6968
 ramifice/paladins/delete.py,sha256=Ynew5zvEBRJNmss5I8hSIp7KgBHpSvDEJCwOfMH5MUU,3723
+ramifice/paladins/hooks.py,sha256=h8coNstWWHI4VwPgpjx0NWTj93-5NDAGtav0VFh-fk4,1031
+ramifice/paladins/indexing.py,sha256=WVLxmkLKg-C_LHn2hq6LJuOkSr9eS-XUUvCMgK-pKYo,387
 ramifice/paladins/password.py,sha256=hdEfSwz0a9FJ5IIYpyD9bmV_kNGvXP4OV5Ea-V0Yx98,3341
 ramifice/paladins/refrash.py,sha256=0qst0ii2ThH-VJduSI1zgkuZQGLnR8IiIu5rTVxzM9U,1254
 ramifice/paladins/save.py,sha256=Tv6TP4Hv0sNIk_aSzLrS6f6kH29A8cFn-f_bzCqP71M,3748
@@ -73,12 +76,9 @@ ramifice/utils/migration.py,sha256=IZ3MFJD2n61uJ0Nl90Ll28GJwjUJf_2IOVbATTHDS_A,1
 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=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/__init__.py,sha256=1i7Vy8JkgyUqJei9fWD62O65SPpRD0i8Gh7S66PLyLQ,145
 ramifice/utils/mixins/json_converter.py,sha256=qBqFYol3Pbq1kX33EWB6FsYUL3AGSdYNtQE97HQ9jy4,1225
-ramifice-0.8.18.dist-info/METADATA,sha256=NKDPQCc_IzbwiTH9TWzEbyYQnDlnahYPrTa-22Rf574,20869
-ramifice-0.8.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.8.18.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.8.18.dist-info/RECORD,,
+ramifice-0.8.20.dist-info/METADATA,sha256=cDyvgANexkXTP2GLfcmuGF55aYlcU-Sh2lOa-Bv3xPk,20918
+ramifice-0.8.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.8.20.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.8.20.dist-info/RECORD,,