configaroo 0.2.0__py3-none-any.whl → 0.2.2__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.2"

configaroo/configuration.py

@@ -18,6 +18,19 @@ ModelT = TypeVar("ModelT", bound=BaseModel)
 class Configuration(UserDict):
     """A Configuration is a dict-like structure with some conveniences"""
 
+    @classmethod
+    def from_dict(cls, data: dict[str, Any] | UserDict[str, Any] | Self) -> Self:
+        """Construct a Configuration from a dictionary
+
+        The dictionary is referenced directly, a copy isn't made
+        """
+        configuration = cls()
+        if isinstance(data, UserDict | Configuration):
+            configuration.data = data.data
+        else:
+            configuration.data = data
+        return configuration
+
     @classmethod
     def from_file(
         cls,
@@ -54,7 +67,7 @@ class Configuration(UserDict):
         """Make sure nested sections have type Configuration"""
         value = self.data[key]
         if isinstance(value, dict | UserDict | Configuration):
-            return Configuration(value)
+            return Configuration.from_dict(value)
         else:
             return value
 
@@ -67,11 +80,11 @@ class Configuration(UserDict):
                 f"'{type(self).__name__}' has no attribute or key '{key}'"
             )
 
-    def __contains__(self, key: str) -> bool:
+    def __contains__(self, key: object) -> bool:
         """Add support for dotted keys"""
         if key in self.data:
             return True
-        prefix, _, rest = key.partition(".")
+        prefix, _, rest = str(key).partition(".")
         try:
             return rest in self[prefix]
         except KeyError:
@@ -108,18 +121,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 +143,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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.2.0
+Version: 0.2.2
 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.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+configaroo/__init__.py,sha256=dP0lnXS0F6I-6DCLmJGyqiGAhel6dSqWtPbSnmFVe6k,371
+configaroo/configuration.py,sha256=Y942S_IHv4l0drxBH-babalNsKvnfcxEtTpjEt1DP6s,8239
+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.2.dist-info/licenses/LICENSE,sha256=rdeT6Y5bm0MUaERso7HRWpPj37Y1RD5li2lIQaMNJjc,1090
+configaroo-0.2.2.dist-info/METADATA,sha256=CYD1SBMhbkRAgR0WmBu4UxY7_KDv-wePze5RFfbRtRI,1789
+configaroo-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+configaroo-0.2.2.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
+configaroo-0.2.2.dist-info/RECORD,,

{configaroo-0.2.0.dist-info → configaroo-0.2.2.dist-info}/licenses/LICENSE

@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

configaroo-0.2.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-configaroo/__init__.py,sha256=RNKHr1va5QmIdwDkkiGTnF8rR7EJMZZRfPunREdKjE4,255
-configaroo/configuration.py,sha256=lEpOBf3qwRFAM0T9Ur9Og1fYy65PzIY6xs1xSNsrHEM,7492
-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,,