scruby 2.7.1__py3-none-any.whl → 2.7.2__py3-none-any.whl

scruby/db.py

@@ -46,7 +46,7 @@ class Scruby(
         #
         if __debug__:
             if ScrubyModel not in class_model.__bases__:
-                msg = "Scruby => Argument `class_model` does not contain the base class `ScrubyModel`."
+                msg = "Argument `class_model` does not contain the base class `ScrubyModel`."
                 raise AssertionError(msg)
             if "key" not in self.key_list:
                 msg = f"Model: {class_model.__name__} => The `key` field is missing."

scruby/models/crypt_model.py

@@ -34,7 +34,7 @@ class CryptModel(BaseModel):
     ]
 
     def hash_raw_password(self, password: str | SecretStr) -> str:
-        """Takes a string and converts it to a hash.
+        """Takes the raw password string and converts it into a hash.
 
         Uses the bcrypt library.
 
@@ -54,7 +54,7 @@ class CryptModel(BaseModel):
         return hashed_bytes.decode("utf-8")
 
     def set_password(self, password: str | SecretStr) -> None:
-        """Converts the value to a hash and adds it to the password field.
+        """Converts the raw password to a hash and adds it to the password field.
 
         Uses the bcrypt library.
 
@@ -64,10 +64,16 @@ class CryptModel(BaseModel):
         Returns:
             None
         """
-        assert isinstance(password, (str, SecretStr)), "Valid type: str | SecretStr"
+        assert isinstance(password, (str, SecretStr)), "Valid type: str | SecretStr."
+        #
+        # Throw an exception if the password is present
+        if bool(self.password):
+            msg = "The password already exists. To update it, use the `update_password` method."
+            raise ValueError(msg)
         #
         hashed_password = self.hash_raw_password(password)
-        # To temporarily bypass the `frozen=True` limitation
+        # Set user password.
+        # Hint: To temporarily bypass the `frozen=True` limitation.
         object.__setattr__(self, "password", hashed_password)  # noqa: PLC2801
 
     def password_is_valid(self, password: str | SecretStr) -> bool:
@@ -82,7 +88,7 @@ class CryptModel(BaseModel):
         Returns:
             True if the passwords are the same and False if they are not the same.
         """
-        assert isinstance(password, (str, SecretStr)), "Valid type: str | SecretStr"
+        assert isinstance(password, (str, SecretStr)), "Valid type: str | SecretStr."
         #
         if not bool(self.password):
             return False
@@ -107,15 +113,23 @@ class CryptModel(BaseModel):
             ValueError: If the current password cannot be updated because it is missing.
             ValueError: If the old password does not match the current one.
         """
-        assert isinstance(old_password, (str, SecretStr)), "Valid type: str | SecretStr"
-        assert isinstance(new_password, (str, SecretStr)), "Valid type: str | SecretStr"
+        if __debug__:
+            if not isinstance(old_password, (str, SecretStr)):
+                msg = "Argument: `old_password` => Valid type: str | SecretStr."
+                raise AssertionError(msg)
+            if not isinstance(new_password, (str, SecretStr)):
+                msg = "Argument: `new_password` => Valid type: str | SecretStr."
+                raise AssertionError(msg)
         #
         # Throw an exception if the current password is missing
-        if self.password is None:
-            msg = "The current password cannot be updated because it is missing"
+        if not bool(self.password):
+            msg = "The current password cannot be updated because it is missing."
             raise ValueError(msg)
         # Throw an exception if the old password does not match the current one
         if not self.password_is_valid(old_password):
-            raise ValueError("Old password doesn't match")
+            raise ValueError("Old password doesn't match.")
+        # Pre-reset the password to default state.
+        # Hint: To temporarily bypass the `frozen=True` limitation.
+        object.__setattr__(self, "password", None)  # noqa: PLC2801
         # Replace the current password with a new one
         self.set_password(new_password)

{scruby-2.7.1.dist-info → scruby-2.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scruby
-Version: 2.7.1
+Version: 2.7.2
 Summary: Asynchronous library for building and managing a hybrid database, by scheme of key-value.
 Project-URL: Bug Tracker, https://github.com/kebasyaty/scruby/issues
 Project-URL: Changelog, https://github.com/kebasyaty/scruby/blob/v2/CHANGELOG.md

{scruby-2.7.1.dist-info → scruby-2.7.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ scruby/__init__.py,sha256=rHX2oQahEBft6ZDh1lLE2YxP5ZoMfP4m7PBBUfEGuJw,1399
 scruby/aggregation.py,sha256=NBFxQqyRqUG2KIuD9fbl4uzSHJWTaskjiZ1YNBa-Zbo,3575
 scruby/cache.py,sha256=DRcTdQbh1DhTQDGK5oC_mZrjcQg6g06vJ1e61RfNX94,3864
 scruby/config.py,sha256=clGj5_CyHEejmQUvtV0fD9PoQoPeYoh0Wge_i2BIMsg,5255
-scruby/db.py,sha256=QlIiGJYgbVO2jKTglvrkUQVtONLQeBpkIyeUQS2xTEU,8433
+scruby/db.py,sha256=J1WldCYoWtNTo1T6QGQ4n0rVYR6D8Kv6oesOBUejn60,8423
 scruby/errors.py,sha256=lTWiHzyO5Es9Nkf7quODJjONGn6ifcL95qlpA4epQQM,1386
 scruby/meta.py,sha256=6HPgqqlKH7Vo6ibyGzxR3DzNcnc_DmjaP5q8s6kl4yA,1230
 scruby/migration.py,sha256=mmJkqVBd_eoufWD8YsRq09VCZFZzEwfxsU1gtvJnjvU,1730
@@ -17,10 +17,10 @@ scruby/mixins/find.py,sha256=YlK8L5R5qnjooDR_WDkd6ckPgE8dNTTee31S4P8-Wuo,10504
 scruby/mixins/keys.py,sha256=sd8vcM0YXouVwwgsQwtYFaV3RyAEfygpPf4a77_hN6A,11305
 scruby/mixins/update.py,sha256=TyxvxB-gNijlfzTmhwrq0ydvu0C3R-RihW5h5tJ96bM,4964
 scruby/models/__init__.py,sha256=Xqk48ZYWzmrygqoi7R9O8dJdd40ochwTg-vmCDkZUY8,418
-scruby/models/crypt_model.py,sha256=wkZkAuzMI0DmEplR1uHgR4fXpnZpttJvfuRjB2IzLL8,3866
+scruby/models/crypt_model.py,sha256=6ia-fZzvPh0fxDIkBXp1m3E538xtjeI0OoxaY25tnNE,4564
 scruby/models/scruby_model.py,sha256=u9uAF1_aBvaooSeKPzQRmVYHPy4XWusLX85xfzc6oVM,608
-scruby-2.7.1.dist-info/METADATA,sha256=kEb3VJ_wAi4qaAPOKswLKPkuWplBQAeCO9-VEQCDbBQ,15272
-scruby-2.7.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-scruby-2.7.1.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-scruby-2.7.1.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
-scruby-2.7.1.dist-info/RECORD,,
+scruby-2.7.2.dist-info/METADATA,sha256=2thGMIKe3ytqOQgHERbvC5ef74T_0JDozEjpJ8QgX1I,15272
+scruby-2.7.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+scruby-2.7.2.dist-info/licenses/GPL-3.0-LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+scruby-2.7.2.dist-info/licenses/MIT-LICENSE,sha256=mS0Wz0yGNB63gEcWEnuIb_lldDYV0sjRaO-o_GL6CWE,1074
+scruby-2.7.2.dist-info/RECORD,,