Merge pull request #57 from plone/newt_support

Newt support

buildout-newt.cfg

@@ -0,0 +1,11 @@
+[buildout]
+extends = buildout.cfg
+parts -= server
+parts += newtdb
+
+[newtdb]
+recipe = zc.recipe.egg
+eggs =
+    plone.server
+    plone.example
+    newt.db

config-newt.json

@@ -0,0 +1,50 @@
+{
+    "databases": [
+        {
+        "newt0": {
+            "storage": "NEWT",
+            "type": "postgres",
+            "dsn": {
+                "dbname": "zodb",
+                "username": "zodb",
+                "password": "secret",
+                "host": "localhost",
+                "port": "5432"
+            },
+            "options": {
+                "read_only": false,
+                "keep_history": true,
+                "commit_lock_timeout": 30
+            },
+            "configuration": {
+                    "pool_size": 100,
+                    "cache_size": 100
+                }
+            }
+        }
+    ],
+    "applications": [],
+    "address": 8080,
+    "static": [
+        {"favicon.ico": "static/favicon.ico"}
+    ],
+    "root_user": {
+        "password": "root"
+    },
+    "auth_token_validators": [
+        "plone.server.auth.validators.SaltedHashPasswordValidator"
+    ],
+    "jwt": {
+        "secret": "secret",
+        "algorithm": "HS256"
+    },
+    "cors": {
+        "allow_origin": ["*"],
+        "allow_methods": ["GET", "POST", "DELETE", "HEAD", "PATCH", "OPTIONS"],
+        "allow_headers": ["*"],
+        "expose_headers": ["*"],
+        "allow_credentials": true,
+        "max_age": 3660
+    },
+    "utilities": []
+}

src/plone.server/CHANGELOG.rst

@@ -6,6 +6,9 @@ New features:
 - install, uninstall methods for addon class can now be async
   [vangheem]
 
+- Support with newt
+  [ramonnb]
+
 - Be able to define adapters, subscribers, permissions, roles, grant
   with decorators, not zcml
   [vangheem]

src/plone.server/plone/server/factory.py

@@ -56,6 +56,11 @@
 except ImportError:
     RELSTORAGE = False
 
+try:
+    import newt.db
+    NEWT = True
+except ImportError:
+    NEWT = False
 
 try:
     from Crypto.PublicKey import RSA
@@ -478,6 +483,29 @@ def make_app(config_file=None, settings=None):
                 rs = RelStorage(adapter=adapter, options=options)
                 db = RequestAwareDB(rs, **config)
                 dbo = Database(key, db)
+            elif dbconfig['storage'] == 'NEWT' and NEWT:
+                options = Options(**dbconfig['options'])
+                if dbconfig['type'] == 'postgres':
+                    from relstorage.adapters.postgresql import PostgreSQLAdapter
+                    dsn = "dbname={dbname} user={username} host={host} password={password} port={port}".format(**dbconfig['dsn'])
+                    adapter = PostgreSQLAdapter(dsn=dsn, options=options)
+                rs = RelStorage(adapter=adapter, options=options)
+                db = DB(rs)
+                try:
+                    conn = db.open()
+                    rootobj = conn.root()
+                    if not IDatabase.providedBy(rootobj):
+                        alsoProvides(rootobj, IDatabase)
+                    transaction.commit()
+                except:
+                    pass
+                finally:
+                    rootobj = None
+                    conn.close()
+                    db.close()
+                rs = RelStorage(adapter=adapter, options=options)
+                db = newt.db._db.NewtDB(RequestAwareDB(rs, **config))
+                dbo = Database(key, db)
             elif dbconfig['storage'] == 'DEMO':
                 storage = DemoStorage(name=dbconfig['name'])
                 db = DB(storage)