ramifice 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

ramifice/commons/tools.py

@@ -23,13 +23,12 @@ def from_mongo_doc(
     mongo_doc: dict[str, Any],
 ) -> Any:
     """Create object instance from Mongo document."""
-    obj = cls_model()
+    obj: Any = cls_model()
+    lang: str = translations.CURRENT_LOCALE
     for name, data in mongo_doc.items():
         field = obj.__dict__[name]
-        if "TextField" == field.field_type:
-            field.value = (
-                data[translations.CURRENT_LOCALE] if isinstance(field.value, dict) else None
-            )
+        if field.field_type == "TextField":
+            field.value = data.get(lang, "") if data is not None else None
         elif field.group == "pass":
             field.value = None
         else:
@@ -50,28 +49,28 @@ def mongo_doc_to_raw_doc(
         datetime to str
     """
     doc: dict[str, Any] = {}
-    current_locale = translations.CURRENT_LOCALE
+    lang: str = translations.CURRENT_LOCALE
     for f_name, t_name in field_name_and_type.items():
         value = mongo_doc[f_name]
         if value is not None:
-            if "TextField" == t_name:
-                value = value[current_locale] if isinstance(value, dict) else None
+            if t_name == "TextField":
+                value = value.get(lang, "") if value is not None else None
             elif "Date" in t_name:
                 if "Time" in t_name:
                     value = format_datetime(
                         datetime=value,
                         format="short",
-                        locale=current_locale,
+                        locale=lang,
                     )
                 else:
                     value = format_date(
                         date=value.date(),
                         format="short",
-                        locale=current_locale,
+                        locale=lang,
                     )
-            elif "IDField" == t_name:
+            elif t_name == "IDField":
                 value = str(value)
-            elif "PasswordField" == t_name:
+            elif t_name == "PasswordField":
                 value = None
         doc[f_name] = value
     return doc

ramifice/paladins/groups/text_group.py

@@ -87,11 +87,17 @@ class TextGroupMixin:
         if params["is_save"]:
             if is_text_field:
                 mult_lang_text: dict[str, str] = (
-                    params["curr_doc"][field_name] if params["is_update"] else {}
+                    params["curr_doc"][field_name]
+                    if params["is_update"]
+                    else (
+                        {lang: value for lang in translations.LANGUAGES}
+                        if isinstance(value, str)
+                        else {lang: value.get(lang, "") for lang in translations.LANGUAGES}
+                    )
                 )
                 if isinstance(value, dict):
-                    for lang, text in value.items():
-                        mult_lang_text[lang] = text
+                    for lang in translations.LANGUAGES:
+                        mult_lang_text[lang] = value.get(lang, "")
                 else:
                     mult_lang_text[translations.CURRENT_LOCALE] = value
                 value = mult_lang_text

ramifice/paladins/tools.py

@@ -8,18 +8,17 @@ from ..utils import errors, translations
 def ignored_fields_to_none(inst_model: Any) -> None:
     """Reset the values of ignored fields to None."""
     for _, field_data in inst_model.__dict__.items():
-        if not callable(field_data) and field_data.ignored and field_data.name != "_id":
+        if not callable(field_data) and field_data.ignored:
             field_data.value = None
 
 
 def refresh_from_mongo_doc(inst_model: Any, mongo_doc: dict[str, Any]) -> None:
     """Update object instance from Mongo document."""
+    lang: str = translations.CURRENT_LOCALE
     for name, data in mongo_doc.items():
         field = inst_model.__dict__[name]
-        if "TextField" == field.field_type:
-            field.value = (
-                data[translations.CURRENT_LOCALE] if isinstance(field.value, dict) else None
-            )
+        if field.field_type == "TextField":
+            field.value = data.get(lang, "") if data is not None else None
         elif field.group == "pass":
             field.value = None
         else:

{ramifice-0.4.3.dist-info → ramifice-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.4.3
+Version: 0.4.5
 Summary: ORM-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/
@@ -136,6 +136,7 @@ from datetime import datetime
 from pymongo import AsyncMongoClient
 from ramifice import model, translations, migration
 from ramifice.fields import (
+    BooleanField,
     DateField,
     EmailField,
     FileField,
@@ -193,13 +194,16 @@ class User:
             # If true, the value of this field is not saved in the database.
             ignored=True,
         )
+         self.is_admin = BooleanField(
+            label=gettext("Is Administrator?"),
+        )
 
     # Optional method.
     async def add_validation(self) -> dict[str, str]:
         """Additional validation of fields."""
         gettext = translations.gettext
         error_map: dict[str, str] = {}
-        if self.password != self.сonfirm_password:
+        if self.password.value != self.сonfirm_password.value:
             error_map["password"] = gettext("Passwords do not match!")
         return error_map
 
@@ -226,6 +230,7 @@ async def main():
     user.birthday.value = datetime(2000, 1, 25)
     user.password.value = "12345678"
     user.сonfirm_password.value = "12345678"
+    user.is_admin.value = True
 
     # Create User.
     if not await user.save():
@@ -238,8 +243,14 @@ async def main():
         user.print_err()
 
     print("User details:")
-    user_details = await User.find_one_to_raw_doc({"_id": user.id.value})
-    pprint.pprint(user_details)
+    user_details = await User.find_one_to_raw_doc(
+        # {"_id": user.id.value}
+        {f"username.{translations.CURRENT_LOCALE}": user.username.value}
+    )
+    if user_details is not None:
+        pprint.pprint(user_details)
+    else:
+        print("No User!")
 
     # Remove User.
     await user.delete(remove_files=False)

{ramifice-0.4.3.dist-info → ramifice-0.4.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ ramifice/commons/general.py,sha256=dy2GTpekLyshrNG68XV2dxNgwsS4QODtIcG-c6Xvalw,4
 ramifice/commons/indexes.py,sha256=hAcWKZ9MMgLbRtoQ6Af0b8r-PY0dbEYmMBl8z_d1DRo,3646
 ramifice/commons/many.py,sha256=KGt7licVJmLADvyPtH7-GbXHig-EnGFbnk7QKu3mfvQ,8214
 ramifice/commons/one.py,sha256=h9R-Ev-7h-xln4lp4SMJIIU9Cf9acqwjj4YYaML6uFg,5832
-ramifice/commons/tools.py,sha256=ND1s-wt2wf8KhriUrLdCAQ56e7GlxrFZ69GWSwgoocA,2386
+ramifice/commons/tools.py,sha256=zR-mmqqsfSWKF0lws1qMvCh-sauJa8pHX5GNJZdAjMI,2341
 ramifice/commons/unit_manager.py,sha256=IkWqXu1PHHal0aGfx6zme81iXPeygxPqEWO-u_8RXoI,4356
 ramifice/fields/__init__.py,sha256=yRfX7Tvpuh27Ggcx5u9e1RRYK7Wu59EVJYxxetmuP1w,1290
 ramifice/fields/bool_field.py,sha256=WWubSwsFJZu8b3MviDd2zXnNYOQaYw8toklFNSTVFLA,2072
@@ -53,7 +53,7 @@ ramifice/paladins/delete.py,sha256=tw50E98D5eFZ7gHGnh_8ztUB1LeTeWWKZvIcQqlgbF8,3
 ramifice/paladins/password.py,sha256=w1XWh3bsncH1VTVjCLxyKI2waxMvltwcsPWW3V9Ib84,3027
 ramifice/paladins/refrash.py,sha256=fw-9x_NKGzreipBt_F9KF6FTsYm9hSzfq4ubi1FHYrQ,1065
 ramifice/paladins/save.py,sha256=EG0_v-imCQPax2pJIAXPoQcSL99g8abY2EeGJMvXBW4,3864
-ramifice/paladins/tools.py,sha256=SCmESo8isvcy0yk43Rj1J5BZ1xSZbNV1KLhhBrzfezY,2687
+ramifice/paladins/tools.py,sha256=QxxwZILyBLcAiDUN48KE99c_cHVjG-VYilEsIinRhEU,2641
 ramifice/paladins/validation.py,sha256=gcEJXIEPu1g7Z54vl14YTs5rCmxOEYsgQH1usFfyy7k,1730
 ramifice/paladins/groups/__init__.py,sha256=hpqmWLsYAMvZHAbmMXluQSqLhkHOSTUAgLHyTM1LTYI,472
 ramifice/paladins/groups/bool_group.py,sha256=oJc9mw9KGrnK_Pj7uXixYYQAJphcXLr_xSQv3PMUlcU,792
@@ -65,7 +65,7 @@ ramifice/paladins/groups/img_group.py,sha256=RoD_QnW0F0DAzrGQmRi8jMZnWy2IomlFn6A
 ramifice/paladins/groups/num_group.py,sha256=6jT7nfIiVoQTlI2UdkcQOlHIDYjllFqSH7Nb87uJgzg,2274
 ramifice/paladins/groups/pass_group.py,sha256=YU5a-NwohEutoEx2N5JmGfg8uPiYiW0XJ8XYsOih6eA,1859
 ramifice/paladins/groups/slug_group.py,sha256=joBB5litljbv2h5JKEMzF71s_DKMWH6nzgThLiLZx2E,2307
-ramifice/paladins/groups/text_group.py,sha256=67gk-vEoZImifCqIzWYexc0Yj2__srFAUqmOHRhBgOk,4005
+ramifice/paladins/groups/text_group.py,sha256=rUWNaAPkTMMlRf6A-6nQAa4HCj6NBTjPKIYaEKSOUL4,4305
 ramifice/utils/__init__.py,sha256=xixHoOX4ja5jIUZemem1qn4k4aonv3G3Q76azQK_pkU,43
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/utils/fixtures.py,sha256=Krl31nNShEg6A15Q8WRDqIai0bPyaJuK8jEGt5ySzao,3114
@@ -79,7 +79,7 @@ ramifice/utils/mixins/add_valid.py,sha256=TLOObedzXNA9eCylfAVbVCqIKE5sV-P5AdIN7a
 ramifice/utils/mixins/hooks.py,sha256=33jvJRhfnJeL2Hd_YFXk3M_7wjqHaByU2wRjKyboL6s,914
 ramifice/utils/mixins/indexing.py,sha256=Z0427HoaVRyNmSNN8Fx0mSICgAKV-gDdu3iR5qYUEbs,329
 ramifice/utils/mixins/json_converter.py,sha256=WhigXyDAV-FfILaZuwvRFRIk0D90Rv3dG5t-mv5fVyc,1107
-ramifice-0.4.3.dist-info/METADATA,sha256=JSgLC_LmwUU-SwrQp7uEF5lQDn9xsAAUe_F08XHY1d0,21049
-ramifice-0.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.4.3.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.4.3.dist-info/RECORD,,
+ramifice-0.4.5.dist-info/METADATA,sha256=2gwEZsJJmFhhFAayDTWsB1kIKwWNmeadZVMt-4Fgwyc,21369
+ramifice-0.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.4.5.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.4.5.dist-info/RECORD,,