Adding a new scheme for settings, MONGODB_SETTINGS, which is a dict. Allowing fallback to existing config scheme.

Author: anemitz

example/simpleapp.py

@@ -15,7 +15,7 @@
 
 app = flask.Flask(__name__)
 app.config.from_object(__name__)
-app.config['MONGODB_DB'] = 'testing'
+app.config['MONGODB_SETTINGS'] = {'DB': 'testing'}
 app.config['TESTING'] = True
 app.config['SECRET_KEY'] = 'flask+mongoengine=<3'
 app.debug = True
@@ -55,4 +55,4 @@ def index():
     return flask.render_template('index.html', todos=todos)
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=4000)
+    app.run(host="0.0.0.0", port=4000)

flask_mongoengine/__init__.py

@@ -31,15 +31,18 @@ def __init__(self, app=None):
 
     def init_app(self, app):
 
-        conn_settings = {
-            'db': app.config.get('MONGODB_DB', None),
-            'username': app.config.get('MONGODB_USERNAME', None),
-            'password': app.config.get('MONGODB_PASSWORD', None),
-            'host': app.config.get('MONGODB_HOST', None),
-            'port': int(app.config.get('MONGODB_PORT', 0)) or None
-        }
-
-        conn_settings = dict([(k, v) for k, v in conn_settings.items() if v])
+        conn_settings = app.config.get('MONGODB_SETTINGS', None)
+        
+        if not conn_settings:
+            conn_settings = {
+                'db': app.config.get('MONGODB_DB', None),
+                'username': app.config.get('MONGODB_USERNAME', None),
+                'password': app.config.get('MONGODB_PASSWORD', None),
+                'host': app.config.get('MONGODB_HOST', None),
+                'port': int(app.config.get('MONGODB_PORT', 0)) or None
+            }
+
+        conn_settings = dict([(k.lower(), v) for k, v in conn_settings.items() if v])
 
         self.connection = mongoengine.connect(**conn_settings)
 

tests.py

@@ -53,6 +53,25 @@ def show(id):
         self.app = app
         self.db = db
 
+    def test_connection_kwargs(self):
+        app = flask.Flask(__name__)
+        app.config['MONGODB_SETTINGS'] = {
+            'DB': 'testing_tz_aware',
+            'alias': 'tz_aware_true',
+            'TZ_AWARE': True,
+        }
+        app.config['TESTING'] = True
+        db = MongoEngine()
+        db.init_app(app)
+        self.assertTrue(db.connection.tz_aware)
+
+        app.config['MONGODB_SETTINGS'] = {
+            'DB': 'testing',
+            'alias': 'tz_aware_false',
+        }
+        db.init_app(app)
+        self.assertFalse(db.connection.tz_aware)
+
     def test_with_id(self):
         c = self.app.test_client()
         resp = c.get('/show/38783728378090/')
@@ -77,7 +96,6 @@ def test_request_context(self):
             todo.save()
             self.assertEqual(self.Todo.objects.count(), 1)
 
-
 class WTFormsAppTestCase(unittest.TestCase):
 
     def setUp(self):