Merge pull request #60 from plone/factory-reorg

reorganize factory module

buildout.cfg

@@ -27,7 +27,7 @@ eggs =
 
 [gunicorn]
 recipe = zc.recipe.egg
-eggs = 
+eggs =
     gunicorn
     uvloop
     plone.server
@@ -90,6 +90,7 @@ eggs =
     plone.server [test]
     plone.example
 
+
 [versions]
 pycodestyle = 2.2.0
-
+flake8 = 3.2.1

src/plone.server/CHANGELOG.rst

@@ -3,6 +3,10 @@
 
 New features:
 
+- be able provide your own database factories by providing named utilities for
+  the IDatabaseConfigurationFactory interface
+  [vangheem]
+
 - install, uninstall methods for addon class can now be async
   [vangheem]
 

src/plone.server/plone/server/configure.py

@@ -179,7 +179,19 @@ def load_subscriber(_context, subscriber):
 
 def load_utility(_context, _utility):
     conf = _utility['config']
-    conf['factory'] = resolve_or_get(conf.get('factory') or _utility['klass'])
+    if 'factory' in conf:
+        conf['factory'] = resolve_or_get(conf['factory'])
+    elif 'component' in conf:
+        conf['component'] = resolve_or_get(conf['component'])
+    else:
+        # use provided klass
+        klass = _utility['klass']
+        if isinstance(klass, type):
+            # is a class type, use factory setting
+            conf['factory'] = klass
+        else:
+            # not a factory
+            conf['component'] = klass
     zcml.utility(
         _context,
         **conf