version 2.5.4

mongorest/__init__.py

@@ -1,4 +1,4 @@
 # -*- encoding: UTF-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-__version__ = '2.5.3'
+__version__ = '2.5.4'

mongorest/database.py

@@ -1,6 +1,7 @@
 # -*- encoding: UTF-8 -*-
 from __future__ import absolute_import, unicode_literals
 
+from mongo_proxy import MongoProxy
 from pymongo import MongoClient
 from pymongo.uri_parser import parse_uri
 
@@ -40,7 +41,7 @@ def _get_db():
         if 'OPTIONS' in mongo and mongo['OPTIONS']:
             uri += '?{0}'.format('&'.join(mongo['OPTIONS']))
 
-    return MongoClient(uri)[parse_uri(uri)['database']]
+    return MongoProxy(MongoClient(uri)[parse_uri(uri)['database']])
 
 
 db = _get_db()

requirements.txt

@@ -1,3 +1,4 @@
+-e git://github.com/arngarden/MongoDBProxy.git#egg=MongoDBProxy
 pymongo==3.0.3
 six==1.9.0
 werkzeug==0.10.4

setup.py

@@ -31,6 +31,7 @@ def run_tests(self):
     url='https://github.com/lvieirajr/mongorest',
     download_url='github.com/lvieirajr/mongorest/tarball/{0}'.format(version),
     install_requires=['pymongo', 'werkzeug', 'six'],
+    dependency_links=['https://github.com/arngarden/MongoDBProxy/tarball/master#egg=MongoDBProxy'],
     cmdclass={'test': Test},
     keywords=['mongodb', 'mongo', 'rest', 'api', 'pymongo', 'werkzeug'],
     classifiers=[

tests/test_collection/test_collection_meta.py

@@ -8,5 +8,5 @@
 class TestCollectionMeta(TestCase):
 
     def test_collection_meta_sets_correct_collection_and_meta(self):
-        self.assertEqual(Collection.collection, self.db['collection'])
+        self.assertEqual(Collection.collection.name, self.db['collection'].name)
         self.assertEqual(Collection.meta, {'required': {}, 'optional': {}})

tests/test_database/test_database.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from os import environ
+from mongo_proxy import MongoProxy
 from pymongo.database import Database
 
 from mongorest.database import db, _get_db
@@ -11,7 +12,7 @@
 class TestDatabase(TestCase):
 
     def test_db_is_a_pymongo_database(self):
-        self.assertIsInstance(db, Database)
+        self.assertIsInstance(db, MongoProxy)
 
     def test_db_connected_to_correct_database(self):
         self.assertEqual(db.name, 'mongorest')

tests/test_testcase/test_testcase.py

@@ -3,6 +3,7 @@
 
 from logging import getLogger, CRITICAL
 
+from mongo_proxy import MongoProxy
 from pymongo.database import Database
 from werkzeug.test import Client
 
@@ -15,7 +16,7 @@ def setUp(self):
         self.test_case = TestCase(methodName='__call__')
 
     def test_testcase_has_instance_of_pymongos_database(self):
-        self.assertIsInstance(self.test_case.db, Database)
+        self.assertIsInstance(self.test_case.db, MongoProxy)
 
     def test_testcase_has_werkzeugs_test_client(self):
         self.assertEqual(self.test_case.client, Client)

tox.ini

@@ -20,4 +20,3 @@ setenv =
     PYTHONPATH={toxinidir}
 commands =
     coverage run --source=mongorest setup.py test
-    coveralls