Return config objects even from environment

+ enhanced typage tests

Docker-DCO-1.1-Signed-off-by: Mangled Deutz <[email protected]> (github: dmp42)

Author: Mangled Deutz

docker_registry/lib/config.py

@@ -33,6 +33,9 @@ def __repr__(self):
     def __dir__(self):
         return self._config.keys()
 
+    def keys(self):
+        return self._config.keys()
+
     # Python 2.6 and below need this
     @property
     def __members__(self):
@@ -48,9 +51,6 @@ def __getattr__(self, key):
             return None
             # raise exceptions.ConfigError("No such attribute: %s" % key)
         result = self._config[key]
-        # Dicts are rewrapped inside a Config object
-        if isinstance(result, dict):
-            return Config(result)
         # Strings starting with `_env:' get evaluated
         if isinstance(
                 result, compat.basestring) and result.startswith('_env:'):
@@ -63,6 +63,9 @@ def __getattr__(self, key):
                 raise exceptions.ConfigError(
                     'Config `%s` (value: `%s`) is not valid: %s' % (
                         varname, e, result))
+        # Dicts are rewrapped inside a Config object
+        if isinstance(result, dict):
+            result = Config(result)
         return result
 
     def __getitem__(self, key):

tests/fixtures/test_config.yaml

@@ -30,3 +30,4 @@ ENV:
     yetanothernonemptystring: _env:YETANOTHERNONEMPTYSTRING:'nonemptystring'
     bugger: _env:BUGGER:bug:me:endlessly
     array: _env:ARRAY:[one, two, three]
+    dict: _env:DICT

tests/test_config.py

@@ -64,6 +64,7 @@ def test_simple_types(self):
         assert conf.array[2] == 'three'
         assert len(conf.array) == 3
         assert conf.dict.two == 'valuetwo'
+        assert isinstance(conf.dict, config.Config)
 
     def test_env_defaults(self):
         global fakeenv
@@ -84,6 +85,7 @@ def test_env_defaults(self):
         assert conf.bugger == 'bug:me:endlessly'
         assert conf.array[2] == 'three'
         assert len(conf.array) == 3
+        assert conf.dict is None
 
     def test_env_overrides(self):
         global fakeenv
@@ -97,6 +99,7 @@ def test_env_overrides(self):
         fakeenv['NONEMPTYSTRING'] = '""'
         fakeenv['BUGGER'] = '"whatever:the:flush:"'
         fakeenv['ARRAY'] = '[one, again]'
+        fakeenv['DICT'] = '{"one": "oneagain", "two": "twoagain"}'
 
         conf = self.c.ENV
         assert conf.booltrue is False
@@ -117,6 +120,9 @@ def test_env_overrides(self):
         fakeenv['ISNONE'] = ''
         assert conf.isnone is None
 
+        assert isinstance(conf.dict, config.Config)
+        assert conf.dict.one == 'oneagain'
+
     def test_write(self):
         conf = self.c
         assert conf.something == 'else'