Add support for io.StringIO

.gitignore

@@ -55,3 +55,14 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Virtual environtment
+venv
+.env
+.venv
+
+# Editor stuff
+.vscode
+
+# OS stuff
+.DS_Store

Makefile

@@ -0,0 +1,11 @@
+.PHONY: prepare-test
+prepare-test:
+		pip install pyvows coverage tornado_pyvows
+
+.PHONY: test
+test:
+		@echo "Restart MongoDB"
+		@docker-compose down
+		@docker-compose up -d
+		@echo "Run Vows"
+		@pyvows -c -l tc_mongodb

docker-compose.yml

@@ -0,0 +1,7 @@
+version: '2.3'
+services:
+  mongo:
+    image: mvertes/alpine-mongo:4.0.5-0
+    container_name: thumbor_mongo
+    ports:
+      - 27017:27017

requirements.txt

@@ -0,0 +1,2 @@
+pymongo==3.10.1
+thumbor>=5.0.0

setup.py

@@ -14,25 +14,26 @@ def read(fname):
 
 setup(
     name="tc_mongodb",
-    version="5.1.0",
+    version="5.3.0",
     author="Thumbor Community",
     description=("Thumbor thumbor storage adapters"),
     license="MIT",
     keywords="thumbor mongodb mongo",
     url="https://github.com/thumbor-community/mongodb",
-    packages=[
+    packages=find_packages(include=[
         'tc_mongodb',
+        'tc_mongodb.mongodb',
         'tc_mongodb.storages',
         'tc_mongodb.result_storages'
-    ],
+    ]),
     long_description=long_description,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
     ],
     install_requires=[
-        'thumbor>=5.0.0',
-        'pymongo'
+        'thumbor>=6.5.1,<7.0.0',
+        'pymongo==3.10.1'
     ]
 )

tc_mongodb/__init__.py

@@ -1,5 +0,0 @@
-
-Config.define('MONGO_STORAGE_SERVER_HOST', 'localhost', 'MongoDB storage server host', 'MongoDB Storage')
-Config.define('MONGO_STORAGE_SERVER_PORT', 27017, 'MongoDB storage server port', 'MongoDB Storage')
-Config.define('MONGO_STORAGE_SERVER_DB', 'thumbor', 'MongoDB storage server database name', 'MongoDB Storage')
-Config.define('MONGO_STORAGE_SERVER_COLLECTION', 'images', 'MongoDB storage image collection', 'MongoDB Storage')

tc_mongodb/mongodb/connector_result_storage.py

@@ -0,0 +1,54 @@
+from pymongo import ASCENDING, DESCENDING, MongoClient
+
+
+class Singleton(type):
+    """
+    Define an Instance operation that lets clients access its unique
+    instance.
+    """
+
+    def __init__(cls, name, bases, attrs, **kwargs):
+        super(Singleton, cls).__init__(name, bases, attrs)
+        cls._instance = None
+
+    def __call__(cls, *args, **kwargs):
+        if cls._instance is None:
+            cls._instance = super(Singleton, cls).__call__(*args, **kwargs)
+        return cls._instance
+
+
+class MongoConnector(object):
+    __metaclass__ = Singleton
+
+    def __init__(self,
+                 uri=None,
+                 host=None,
+                 port=None,
+                 db_name=None,
+                 coll_name=None):
+        self.uri = uri
+        self.host = host
+        self.port = port
+        self.db_name = db_name
+        self.coll_name = coll_name
+        self.db_conn, self.coll_conn = self.create_connection()
+        self.ensure_index()
+
+    def create_connection(self):
+        if self.uri:
+            connection = MongoClient(self.uri)
+        else:
+            connection = MongoClient(self.host, self.port)
+
+        db_conn = connection[self.db_name]
+        coll_conn = db_conn[self.coll_name]
+
+        return db_conn, coll_conn
+
+    def ensure_index(self):
+        index_name = 'key_1_created_at_-1'
+        if index_name not in self.coll_conn.index_information():
+            self.coll_conn.create_index(
+                [('key', ASCENDING), ('created_at', DESCENDING)],
+                name=index_name
+            )

tc_mongodb/mongodb/connector_storage.py

@@ -0,0 +1,54 @@
+from pymongo import ASCENDING, DESCENDING, MongoClient
+
+
+class Singleton(type):
+    """
+    Define an Instance operation that lets clients access its unique
+    instance.
+    """
+
+    def __init__(cls, name, bases, attrs, **kwargs):
+        super(Singleton, cls).__init__(name, bases, attrs)
+        cls._instance = None
+
+    def __call__(cls, *args, **kwargs):
+        if cls._instance is None:
+            cls._instance = super(Singleton, cls).__call__(*args, **kwargs)
+        return cls._instance
+
+
+class MongoConnector(object):
+    __metaclass__ = Singleton
+
+    def __init__(self,
+                 uri=None,
+                 host=None,
+                 port=None,
+                 db_name=None,
+                 coll_name=None):
+        self.uri = uri
+        self.host = host
+        self.port = port
+        self.db_name = db_name
+        self.coll_name = coll_name
+        self.db_conn, self.coll_conn = self.create_connection()
+        self.ensure_index()
+
+    def create_connection(self):
+        if self.uri:
+            connection = MongoClient(self.uri)
+        else:
+            connection = MongoClient(self.host, self.port)
+
+        db_conn = connection[self.db_name]
+        coll_conn = db_conn[self.coll_name]
+
+        return db_conn, coll_conn
+
+    def ensure_index(self):
+        index_name = 'path_1_created_at_-1'
+        if index_name not in self.coll_conn.index_information():
+            self.coll_conn.create_index(
+                [('path', ASCENDING), ('created_at', DESCENDING)],
+                name=index_name
+            )