Commits

Lynn Rees  committed c6b2db9

- tweak import paths

  • Participants
  • Parent commits 5541296

Comments (0)

Files changed (8)

File graphalchemy/direct/apps.py

 
 class Appconf(Pathways):
 
-    class managers(Namespace):
+    class direct(Namespace):
 
         class element(Namespace):
-            link = 'graphalchemy.managers.elements.Link'
-            node = 'graphalchemy.managers.elements.Node'
+            link = 'graphalchemy.direct.elements.Link'
+            node = 'graphalchemy.direct.elements.Node'
 
         class collection(Namespace):
-            link = 'graphalchemy.managers.collections.Links'
-            node = 'graphalchemy.managers.collections.Nodes'
+            link = 'graphalchemy.direct.collections.Links'
+            node = 'graphalchemy.direct.collections.Nodes'
 
         class collector(Namespace):
-            link = 'graphalchemy.managers.collectors.Links'
-            node = 'graphalchemy.managers.collectors.Nodes'
+            link = 'graphalchemy.direct.collectors.Links'
+            node = 'graphalchemy.direct.collectors.Nodes'
 
-        class writer(Namespace):
-            link = 'graphalchemy.managers.writers.Links'
-            node = 'graphalchemy.managers.writers.Nodes'
-
-        class reader(Namespace):
-            link = 'graphalchemy.managers.readers.Links'
-            node = 'graphalchemy.managers.readers.Nodes'
+        class worker(Namespace):
+            link = 'graphalchemy.direct.workers.Links'
+            node = 'graphalchemy.direct.workers.Nodes'
 
 
 appconf = Appconf.create()

File graphalchemy/graphs.py

         # graph managers
         graph_manager = kw.pop('manager', defaults.manager.graph)
         # database configuration in url format
-        database, split = url.split('://')
+        database, split = url.split(':')
         # database path
         url = self.url = url2pathname(split)
         # database settings

File graphalchemy/models/apps.py

         class reader(Namespace):
             node = 'graphalchemy.models.readers.Nodes'
 
+        class worker(Namespace):
+            node = 'graphalchemy.models.workers.Nodes'
+
 
 appconf = Appconf.create()

File graphalchemy/sessions.py

     '''graph session'''
 
     # link manager
-    links = extend(conf.manager.link, conf.managers)
+    links = extend(conf.direct.worker.link, conf.direct)
     # node monager
-    nodes = extend(conf.manager.node, conf.managers)
+    nodes = extend(conf.model.worker.node, conf.models)
     # transaction monager
-    transaction = call(conf.transaction, conf.appspace)
+    transaction = call(conf.transaction, conf.userspace)
 
     def __exit__(self, e, b, c):
         with self.transaction:

File graphalchemy/tests/test_db.py

 
 
 def grapher():
-    graph = Graph('foo')
+    graph = Graph('neo4jem:foo')
     def cleanup(): #@IgnorePep8
         graph._db.shutdown()
         import shutil

File graphalchemy/tests/test_graph.py

 
     def setUp(self):
         from graphalchemy.graphs import Graph
-        self.graph = Graph('foo')
+        self.graph = Graph('neo4jem:foo')
 
     def test_create(self):
         self.assertTrue(hasattr(self.graph, '_db'))

File graphalchemy/tests/test_managers.py

 
     def setUp(self):
         from graphalchemy.graphs import Graph
-        self.graph = Graph('foo')
+        self.graph = Graph('neo4jem:foo')
 
     def test_create_node_writer(self):
         self.assertTrue(hasattr(self.graph.session.nodes, '_reader'))

File graphalchemy/tests/test_models.py

 
 
 def grapher():
-    graph = Graph('foo2')
+    graph = Graph('neo4jem:foo2')
     def cleanup(): #@IgnorePep8
         graph._db.shutdown()
         import shutil