Merge pull request #7 from paulnues/master

Adding SSL config option to Mongo connection.

docs/tutorial.rst

@@ -872,6 +872,7 @@ however you cannot nest a connection within itself (this will raise a
 * **config_host** (``str``) - Hostname to connect to.
 * **config_port** (``int``) - Port to connect to.
 * **config_replica** (``str``, optional) - Name of the replica set.
+* **config_ssl** (``bool``, optional) - If True, use SSL for this connection.
 
 If ``config_replica`` is present on the class, then HumbleDB will automatically
 use a :class:`~pymongo.connection.ReplicaSetConnection` for you. (Requires
@@ -895,6 +896,9 @@ either :func:`Pyconfig.set` (i.e. ``pyconfig.set('humbledb.connection_pool',
   ``use_greenlets`` with the :class:`~pymongo.connection.Connection`
   instance. (This is only needed if you intend on using threading and greenlets
   at the same time.)
+* **humbledb.ssl** (``bool``, default: ``False``) - Whether to use
+  ``ssl`` with the :class:`~pymongo.connection.Connection`
+  instance.  The mongod or mongos you are connecting to must have SSL enabled.
 
 More configuration settings are going to be added in the near future, so you
 can customize your :class:`~pymongo.connection.Connection` to completely suit

humbledb/__init__.py

@@ -18,7 +18,7 @@
 limitations under the License.
 
 """
-__version__ = '5.4.1'
+__version__ = '5.5'
 
 
 # We only want to allow * imports for the most common classes. If you want

humbledb/mongo.py

@@ -77,6 +77,12 @@ def __new__(mcs, name, bases, cls_dict):
             if cls_dict.get('config_port', UNSET) is UNSET:
                 raise TypeError("missing required 'config_port'")
 
+        # Validate if pymongo version supports SSL.
+        if (cls_dict.get('config_ssl', False) is True and
+                _version._lt('2.1')):
+            raise TypeError("Need pymongo.version >= 2.1 to use "
+                    "SSL.")
+
         # Create new class
         cls = type.__new__(mcs, name, bases, cls_dict)
 
@@ -197,6 +203,11 @@ class MyConnection(Mongo):
 
     """
 
+    config_ssl = pyconfig.setting('humbledb.ssl', False)
+    """ Specifies whether or not to use SSL for a connection.
+        .. versionadded: 5.5
+    """
+
     def __new__(cls):
         """ This class cannot be instantiated. """
         return cls
@@ -205,12 +216,14 @@ def __new__(cls):
     def _new_connection(cls):
         """ Return a new connection to this class' database. """
         kwargs = cls._connection_info()
+
         kwargs.update({
                 'max_pool_size': cls.config_max_pool_size,
                 'auto_start_request': cls.config_auto_start_request,
                 'use_greenlets': cls.config_use_greenlets,
                 'tz_aware': cls.config_tz_aware,
                 'w': cls.config_write_concern,
+                'ssl': cls.config_ssl,
                 })
 
         if _version._gte('2.1.0') and _version._lt('2.2.0'):

test/test_humbledb/test_mongo.py

@@ -5,7 +5,7 @@
 from humbledb import Mongo
 from humbledb import _version
 from humbledb.errors import DatabaseMismatch
-from ..util import database_name, eq_, DBTest, raises
+from ..util import database_name, ok_, eq_, DBTest, raises
 
 
 def teardown():
@@ -141,3 +141,39 @@ class TestDoc(Document):
         TestDoc.find()
 
 
+@raises(TypeError)
+def test_mongo_client_with_ssl_before_2_1():
+    if _version._gte('2.1'):
+        raise SkipTest("Only test this with version 2.1 or earlier.")
+
+    class SSLMongo(Mongo):
+        config_host = 'localhost'
+        config_port = 27017
+        config_ssl = True
+
+
+def test_mongo_client_with_ssl_after_2_1():
+    if _version._lt('2.1'):
+        raise SkipTest("This test requires version 2.1 or later.")
+
+    class SSLMongo(Mongo):
+        config_host = 'localhost'
+        config_port = 27017
+        config_ssl = True
+
+    from humbledb import Document
+    from humbledb.errors import ConnectionFailure
+    class SomeDoc(Document):
+        config_database = database_name()
+        config_collection = 'ssl_collection'
+
+        name = 'n'
+
+    try:
+        with SSLMongo:
+            SomeDoc.insert({SomeDoc.name:'foobar'})
+            ok_(SomeDoc.find({SomeDoc.name:'foobar'}))
+    except ConnectionFailure:
+        raise SkipTest("SSL may not be enabled on mongodb server.")
+
+