introduce strict concept to config... now mocking config sections by …

…default
mjdorma · Aug 10, 2013 · c0b5757 · c0b5757
1 parent 8c506d7
commit c0b5757
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/funconf.py b/funconf.py
@@ -169,6 +169,7 @@ def wrapper(**kwargs):
                 for k in kwargs_set.difference(func_defaults_set):
                     kwargs.pop(k)
             return func(**kwargs)
+
         funcsig = signature(func)
         parameters = []
         for arg, param in funcsig.parameters.items():
@@ -446,19 +447,23 @@ class Config(MutableMapping):
       the defaults of a variable kwargs function.  
     """
 
-    __slots__ = ('_sections', '_reserved', '_lookup')
+    __slots__ = ('_sections', '_reserved', '_lookup', '_strict')
 
-    def __init__(self, filenames=[]):
+    def __init__(self, filenames=[], strict=False):
         """Construct a new Config object.  
         
         This is the root object for a function configuration set.  It is the
         container for the configuration sections.
 
         :param filenames: YAML configuration files.
         :type filenames: list of filepaths
+        :param strict: Raise :py:class:`ConfigAttributeError` if a
+                       :py:class:`ConfigSection` doesn't exist
+        :type strict: False 
         """
         self._sections = {}
         self._lookup = {}
+        self._strict = strict 
         self.read(filenames)
 
     def read(self, filenames):
@@ -547,8 +552,11 @@ def __getattribute__(self, y):
             return super(Config, self).__getattribute__(y)
         else:
             if y not in self._sections:
-                msg = "Config object has no section '%s'" % (y)
-                raise ConfigAttributeError(msg)
+                if not self._strict:
+                    self._sections[y] = ConfigSection(y, {})
+                else:
+                    msg = "Config object has no section '%s'" % (y)
+                    raise ConfigAttributeError(msg)
             return self._sections[y]
 
     def __setattr__(self, x, y):

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -61,13 +61,12 @@ def test_print_config(self, mock_open):
         self.assertEqual(len(config.bbb), 4)
 
     @patch('__builtin__.open') 
-    def test_accessing_attributes(self, mock_open):
+    def test_accessing_strict_attributes(self, mock_open):
         mock_open.return_value = StringIO(TEST_CONFIG)
         config = funconf.Config('mocked.conf')
         self.assertEqual(config.aaa.int, 4)
         config.aaa.int = 5
         self.assertEqual(config.aaa.int, 5)
-        self.assertRaises(funconf.ConfigAttributeError, getattr, config, 'nope')
         self.assertRaises(funconf.ConfigAttributeError, getattr, config.aaa,
                 'nope')
 
@@ -87,6 +86,14 @@ def test_broken_yaml(self, mock_open):
         self.assertRaises(yaml.scanner.ScannerError, 
                 funconf.Config, 'mocked.conf')
 
+    def test_strict_config(self):
+        config = funconf.Config(strict=True)
+        self.assertRaises(funconf.ConfigAttributeError, getattr, config, 'nope')
+
+    def test_not_strict_config(self):
+        config = funconf.Config()
+        self.assertTrue(dict(config.foo) == {})
+
     def test_file_doesnt_exist(self):
         funconf.Config(['blaoo.con'])