fix Dict.all() method behavior

Author: rande

ioc/extra/flask/di.py

@@ -43,7 +43,7 @@ def configure_app_config(self, config, container_builder):
             'SESSION_COOKIE_HTTPONLY':       True,
             'SESSION_COOKIE_SECURE':         False,
             'MAX_CONTENT_LENGTH':            None,
-            'SEND_FILE_MAX_AGE_DEFAULT':     12 * 60 * 60, # 12 hours
+            'SEND_FILE_MAX_AGE_DEFAULT':     12 * 60 * 60,  # 12 hours
             'TRAP_BAD_REQUEST_ERRORS':       False,
             'TRAP_HTTP_EXCEPTIONS':          False,
             'PREFERRED_URL_SCHEME':          'http',
@@ -57,7 +57,7 @@ def configure_app_config(self, config, container_builder):
         for name, value in defaults.items():
             container_builder.parameters.set('ioc.extra.flask.app.%s' % name, c.get(name, value))
 
-        for name, value in c.all().items():
+        for name, value in c.iteritems():
             container_builder.parameters.set('ioc.extra.flask.app.%s' % name, c.get(name, value))
             defaults[name] = value
 
@@ -66,7 +66,7 @@ def configure_app_config(self, config, container_builder):
     def configure_blueprint(self, config, container_builder):
         definition = container_builder.get('ioc.extra.flask.app')
 
-        for id, kwargs in config.get_dict('blueprints', {}).all().items():
+        for id, kwargs in config.get_dict('blueprints', {}).iteritems():
             definition.add_call('register_blueprint', [ioc.component.Reference(id)], kwargs.all())
 
     def post_build(self, container_builder, container):

ioc/extra/redis/di.py

@@ -17,7 +17,7 @@ def configure_connections(self, config, container_builder):
 
         manager = container_builder.get('ioc.extra.redis')
 
-        for name, parameters in config.get_dict('connections', {}).all().items():
+        for name, parameters in config.get_dict('connections', {}).iteritems():
             id = "ioc.extra.redis.connection.%s" % name
 
             container_builder.add(id, ioc.component.Definition('redis.ConnectionPool', kwargs={
@@ -33,7 +33,7 @@ def configure_connections(self, config, container_builder):
 
             manager.add_call('add_connection', arguments=[name, ioc.component.Reference(id)])
 
-        for name, parameters in config.get_dict('clients', {}).all().items():
+        for name, parameters in config.get_dict('clients', {}).iteritems():
             id_connection = "ioc.extra.redis.connection.%s" % parameters.get('connection')
             id = "ioc.extra.redis.client.%s" % name
 

ioc/helper.py

@@ -80,14 +80,37 @@ def get_dict(self, name, default=None):
     def get_int(self, name, default=None):
         return int(self.get(name, default))
 
+    def get_all(self, name, default=None):
+        return self.get_dict(name, default).all()
+
     def all(self):
-        return self.data
-        
+        def walk(data):
+            all = {}
+
+            if not isinstance(data, dict):
+                return data
+
+            for v, d in data.iteritems():
+                if isinstance(d, Dict):
+                    all[v] = d.all()
+                else:
+                    all[v] = d
+
+                if is_iterable(all[v]):
+                    walk(all[v])
+
+            return all
+
+        return walk(self.data)
+
+    def iteritems(self):
+        return self.data.iteritems()
+
     def __iter__(self):
         return iter(self.data)
 
     def __getitem__(self, key):
-        return self.data[key]     
+        return self.data[key]
 
 def build(files, logger=None, parameters=None):
 

tests/ioc/test_helper.py

@@ -3,6 +3,7 @@
 import ioc
 import os
 import unittest2 as unittest
+import yaml
 
 current_dir = os.path.dirname(os.path.realpath(__file__))
 
@@ -29,8 +30,20 @@ def test_build(self):
         self.assertEquals('the argument 1', container.parameters.get('foo.foo'))
         self.assertEquals('parameter', container.parameters.get('inline'))
 
-    def test_dict(self):
 
+    def test_deepcopy(self):
+        values = [
+            {'sad': 1},
+            ('%tuple%', 2)
+        ]
+
+        for value in values:
+            self.assertEquals(value, ioc.helper.deepcopy(value))
+
+
+class DictTest(unittest.TestCase):
+
+    def test_dict(self):
         d = ioc.helper.Dict({'key': 'value'})
 
         self.assertEquals('value', d.get('key'))
@@ -42,13 +55,19 @@ def test_dict(self):
 
         self.assertEquals(managers.get('foo'), 'bar')
 
-    def test_deepcopy(self):
+    def test_dict_iterator(self):
+        d = ioc.helper.Dict({'key': 'value'})
 
-        values = [
-            {'sad': 1},
-            ('%tuple%', 2)
-        ]
+        for key, value in d.iteritems():
+            self.assertEquals(key, 'key')
+            self.assertEquals(value, 'value')
 
-        for value in values:
-            self.assertEquals(value, ioc.helper.deepcopy(value))
-        
+    def test_all(self):
+        d = ioc.helper.Dict({'key': 'value'})
+        self.assertEquals(d.all(), {'key': 'value'})
+
+        d = ioc.helper.Dict({'key': ioc.helper.Dict({'value': 'foo'})})
+        self.assertEquals(d.all(), {'key': {'value': 'foo'}})
+
+        d = ioc.helper.Dict({'key': ioc.helper.Dict({'value': ['foo', 'bar']})})
+        self.assertEquals(d.all(), {'key': {'value': ['foo', 'bar']}})