configaroo 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

configaroo/__init__.py

@@ -1,10 +1,17 @@
 """Bouncy configuration handling"""
 
-from configaroo.configuration import Configuration  # noqa
-from configaroo.exceptions import (  # noqa
+from configaroo.configuration import Configuration
+from configaroo.exceptions import (
     ConfigarooException,
     MissingEnvironmentVariableError,
     UnsupportedLoaderError,
 )
 
-__version__ = "0.2.0"
+__all__ = [
+    "Configuration",
+    "ConfigarooException",
+    "MissingEnvironmentVariableError",
+    "UnsupportedLoaderError",
+]
+
+__version__ = "0.2.1"

configaroo/configuration.py

@@ -108,18 +108,20 @@ class Configuration(UserDict):
                 )
         return self
 
-    def parse_dynamic(self, extra: dict[str, Any] | None = None) -> Self:
+    def parse_dynamic(
+        self, extra: dict[str, Any] | None = None, _include_self: bool = True
+    ) -> Self:
         """Parse dynamic values of the form {section.key}"""
         cls = type(self)
         variables = (
-            self.to_flat_dict()
+            (self.to_flat_dict() if _include_self else {})
             | {"project_path": _find_pyproject_toml()}
             | ({} if extra is None else extra)
         )
-        return cls(
+        parsed = cls(
             {
                 key: (
-                    value.parse_dynamic(extra=variables)
+                    value.parse_dynamic(extra=variables, _include_self=False)
                     if isinstance(value, Configuration)
                     else _incomplete_format(value, variables)
                     if isinstance(value, str)
@@ -128,6 +130,10 @@ class Configuration(UserDict):
                 for key, value in self.items()
             }
         )
+        if parsed == self:
+            return parsed
+        # Continue parsing until no more replacements are made.
+        return parsed.parse_dynamic(extra=extra, _include_self=_include_self)
 
     def validate_model(self, model: Type[BaseModel]) -> Self:
         """Validate the configuration against the given model."""

{configaroo-0.2.0.dist-info → configaroo-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.2.0
+Version: 0.2.1
 Summary: Bouncy handling of configuration files
 Author-email: Geir Arne Hjelle <geirarne@gmail.com>
 Maintainer-email: Geir Arne Hjelle <geirarne@gmail.com>

{configaroo-0.2.0.dist-info → configaroo-0.2.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-configaroo/__init__.py,sha256=RNKHr1va5QmIdwDkkiGTnF8rR7EJMZZRfPunREdKjE4,255
-configaroo/configuration.py,sha256=lEpOBf3qwRFAM0T9Ur9Og1fYy65PzIY6xs1xSNsrHEM,7492
+configaroo/__init__.py,sha256=-rsRqALc9-loy4qWJQHYE6QG0rZ1gwYjIUPy72DbsZg,371
+configaroo/configuration.py,sha256=a39w6uHJMrc8pDbHZJX0dr8DVZ6gMFbFSLUlEPCMCdw,7779
 configaroo/exceptions.py,sha256=1h-6hV7VqqKaRFnu539pjsO0ESSNDibt2kUeF7jAM2M,374
 configaroo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 configaroo/loaders/__init__.py,sha256=-6GAR4g7vYW7Zagq9Ev479kpkfY7kbvDl4JPXd4wQQ0,756
 configaroo/loaders/json.py,sha256=6gs_ZegUEe70vb6uSJfKBos7UjfuJnyWgPE_kjDQISw,258
 configaroo/loaders/toml.py,sha256=ZVbHutZ7V-Z_jf2aHjV18jwaqCXumlr06j48rojHcBM,264
-configaroo-0.2.0.dist-info/licenses/LICENSE,sha256=2cbzsB4lU8qOO8fO1XVNJD7XPxzPhaWXm6U9DenSc0s,1089
-configaroo-0.2.0.dist-info/METADATA,sha256=JfEO1NNJw5qCXIB64Uf1fqdipAlnpkKCpLYpEbfJZGU,1789
-configaroo-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-configaroo-0.2.0.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
-configaroo-0.2.0.dist-info/RECORD,,
+configaroo-0.2.1.dist-info/licenses/LICENSE,sha256=2cbzsB4lU8qOO8fO1XVNJD7XPxzPhaWXm6U9DenSc0s,1089
+configaroo-0.2.1.dist-info/METADATA,sha256=0Od55T9MEvRBhi4JHllAU2S0U9NBl0T99yA2Axsf0wk,1789
+configaroo-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+configaroo-0.2.1.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
+configaroo-0.2.1.dist-info/RECORD,,