configaroo 0.2.1__tar.gz → 0.2.2__tar.gz

{configaroo-0.2.1 → configaroo-0.2.2}/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.1 → configaroo-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.2.1
+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.1 → configaroo-0.2.2}/README.md

@@ -7,4 +7,4 @@ Configaroo is a light configuration package for Python that offers the following
 - Override key configuration settings with environment variables
 - Validate a configuration based on a Pydantic model
 - Convert the type of configuration values based on a Pydantic model
-- Dynamically format certain configuration values
+- Dynamically format certain configuration values

{configaroo-0.2.1 → configaroo-0.2.2}/pyproject.toml

@@ -40,6 +40,7 @@ build = ["build>=1.2.2.post1", "twine>=6.1.0"]
 dev = [
     "bumpver>=2024.1130",
     "ipython>=8.36.0",
+    "pre-commit>=4.2.0",
     "pytest>=8.3.5",
     "ruff>=0.11.11",
     "tomli-w>=1.2.0",
@@ -50,7 +51,7 @@ dev = [
 version = { attr = "configaroo.__version__" }
 
 [tool.bumpver]
-current_version = "v0.2.1"
+current_version = "v0.2.2"
 version_pattern = "vMAJOR.MINOR.PATCH"
 commit_message  = "bump version {old_version} -> {new_version}"
 tag_message     = "{new_version}"

{configaroo-0.2.1 → configaroo-0.2.2}/src/configaroo/__init__.py

@@ -14,4 +14,4 @@ __all__ = [
     "UnsupportedLoaderError",
 ]
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"

{configaroo-0.2.1 → configaroo-0.2.2}/src/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:

{configaroo-0.2.1 → configaroo-0.2.2}/src/configaroo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.2.1
+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.1 → configaroo-0.2.2}/tests/test_configuration.py

@@ -72,6 +72,24 @@ def test_update_preserves_type(config):
     assert isinstance(config, Configuration)
 
 
+def test_update_changes_values(config):
+    """Test that an update adds or changes values"""
+    updated_config = config | {"number": 14, "new": "brand new!"}
+    assert updated_config.number == 14
+    assert updated_config.new == "brand new!"
+
+    config.update({"number": 14, "new": "brand new!"})
+    assert config.number == 14
+    assert config.new == "brand new!"
+
+
+def test_update_nested_values(config):
+    """Test that a nested section can be updated"""
+    config.nested.deep.update({"sea": "Mjoesa", "depth": 456})
+    assert config.nested.deep.sea == "Mjoesa"
+    assert config.nested.deep.depth == 456
+
+
 def test_dump_to_dict(config):
     """Test that dumping to a dictionary unwraps nested sections"""
     config_dict = config.to_dict()