changed examples for next release

4 files changed, 37 insertions, 31 deletions

diff --git a/examples/config/config.cfg b/examples/config/config.cfg
index 36b0414..a99c4bd 100644
--- a/examples/config/config.cfg
+++ b/examples/config/config.cfg
@@ -27,3 +27,7 @@ username=test
 password=test
 port=12345
 database=testing
+
+[test_file_db]
+protocol=sqlite
+filename=test_file_db.sqlite
diff --git a/examples/example_01.py b/examples/example_01.py
index 7915e5f..d77c163 100644
--- a/examples/example_01.py
+++ b/examples/example_01.py
@@ -35,35 +35,29 @@ def main(config):
     print config.__dict__
 
 
-
 if __name__ == "__main__":
 
     config = Config()
-    config.options().add_quiet()
-    config.options().add_log_level()
-    config.options().parser.add_option('-c', '--crazy', dest='crazy',
+    config.options.add_quiet()
+    config.options.add_log_level()
+    config.options.parser.add_option('-c', '--crazy', dest='crazy',
             default=False, help="Crazy mode")
-    config.set('crazy', config.options().get_options().crazy)
-    config.set('verbose', config.options().get_options().verbose)
+    config.set('crazy', config.options.get_options().crazy)
+    config.set('verbose', config.options.get_options().verbose)
 
 
-    path = p.join(p.dirname(p.abspath(__file__)), 'logs')
-    config.logs().set_directory(path)
-    config.logs().set_log_level(config.options().get_options().log_level)
-    log = config.logs().load(__file__)
-    config.logs().attach_file_handler(log, 'example.log')
-    config.logs().attach_screen_handler(log, 'critical')
+    log_directory =  p.join(p.dirname(p.abspath(__file__)), 'config')
+    config.logs.set_directory(log_directory)
+    config.logs.set_log_level(config.options.get_options().log_level)
+    log = config.logs.load('test_log')
+    config.logs.attach_file_handler(log, 'example.log')
+    config.logs.attach_screen_handler(log, 'critical')
     config.set('log', log)
 
 
     path = p.join(p.dirname(p.abspath(__file__)), 'config')
-    config.files().set_directory(path)
-    config.files().load('config.cfg')
-    foo = config.files().parser().get('title', 'foo')
-    config.set('foo', foo)
-
-
-
-
-
+    filename = p.join(path, 'config.cfg')
+    config.files.add(filename)
+    sections = config.files.load()
+    config.set('foo', sections['title']['foo'])
     main(config())
diff --git a/examples/example_02.py b/examples/example_02.py
index 2844121..28ee179 100644
--- a/examples/example_02.py
+++ b/examples/example_02.py
@@ -43,15 +43,18 @@ from dodai.config import Config
 
 def main(config):
     print config.db.__dict__
+    print config.file_db.__dict__
 
 
 if __name__ == "__main__":
 
-    config = Config()
+    # path to config file
     path = p.join(p.dirname(p.abspath(__file__)), 'config')
-    config.files().set_directory(path)
-    config.files().load('config.cfg')
-    config.dbs().add_config(config_parser=config.files().parser())
-    db = config.dbs().load('test_db')
-    config.set('db', db)
+    filename = p.join(path, 'config.cfg')
+
+    config = Config()
+    config.files.add(filename)
+    config.databases.add(config.files.load())
+    config.set('db', config.databases.load('test_db'))
+    config.set('file_db', config.databases.load('test_file_db'))
     main(config())
diff --git a/examples/example_03.py b/examples/example_03.py
index b94c39e..da84eb8 100644
--- a/examples/example_03.py
+++ b/examples/example_03.py
@@ -38,7 +38,7 @@ On ubuntu you can do:
 """
 
 from dodai import Configure
-
+from dodai.tools import home_directory
 
 def main(config):
     print config.db.engine
@@ -47,8 +47,13 @@ def main(config):
 
 if __name__ == "__main__":
 
-    config = Configure('test')
-    db = config.dbs().load('test_db')
+
+    # path to config file
+    path = p.join(p.dirname(p.abspath(__file__)), 'config')
+    filename = p.join(path, 'config.cfg')
+
+    config = Configure('test', filename)
+    db = config.databases.load('test_db')
     config.set('db', db)
-    config.set('home_directory', config.home_directory)
+    config.set('home_directory', home_directory())
     main(config())