Add spec test functionality

.travis.yml

@@ -3,6 +3,8 @@ language: python
 services:
   - mongodb
 
+install: python -m pip install https://github.com/mongodb/mongo-python-driver/archive/3.11.0rc0.tar.gz
+
 python:
   - 3.5
   - 3.6

pymongoexplain/commands.py

@@ -20,6 +20,7 @@
 
 from bson.son import SON
 from pymongo.collection import Collection
+from pymongo.helpers import _index_document
 from .utils import convert_to_camelcase
 
 
@@ -39,18 +40,25 @@ def command_name(self):
     def get_SON(self):
         cmd = SON([(self.command_name, self.collection)])
         cmd.update(self.command_document)
+        if self.command_document == {}:
+            return {}
         return cmd
 
 
 class UpdateCommand(BaseCommand):
     def __init__(self, collection: Collection, filter, update,
                  kwargs):
         super().__init__(collection.name)
-        return_document = {"updates":[{"q": filter, "u": update}]}
-        for key in kwargs:
-            value = kwargs[key]
+        return_document = {
+            "updates":[{"q": filter, "u": update}]
+        }
+        for key, value in kwargs.items():
             if key == "bypass_document_validation":
                 return_document[key] = value
+            elif key == "hint":
+                if value is not {} and value is not None:
+                    return_document["updates"][0]["hint"] = value if \
+                        isinstance(value, str) else _index_document(value)
             else:
                 return_document["updates"][0][key] = value
         self.command_document = convert_to_camelcase(return_document)
@@ -81,7 +89,12 @@ def __init__(self, collection: Collection, pipeline, session,
         super().__init__(collection.name)
         self.command_document = {"pipeline": pipeline, "cursor": cursor_options}
         for key, value in kwargs.items():
-            self.command_document[key] = value
+            if key == "batchSize":
+                if value == 0:
+                    continue
+                self.command_document["cursor"]["batchSize"] = value
+            else:
+                self.command_document[key] = value
 
         self.command_document = convert_to_camelcase(
             self.command_document, exclude_keys=exclude_keys)
@@ -108,6 +121,8 @@ class FindCommand(BaseCommand):
     def __init__(self, collection: Collection,
                  kwargs):
         super().__init__(collection.name)
+        if kwargs["filter"] == {}:
+            self.command_document = {}
         for key, value in kwargs.items():
             self.command_document[key] = value
         self.command_document = convert_to_camelcase(self.command_document)
@@ -116,12 +131,21 @@ def __init__(self, collection: Collection,
     def command_name(self):
         return "find"
 
+
 class FindAndModifyCommand(BaseCommand):
     def __init__(self, collection: Collection,
                  kwargs):
         super().__init__(collection.name)
         for key, value in kwargs.items():
-            self.command_document[key] = value
+            if key == "update" and kwargs.get("replacement", None) is not None:
+                continue
+            if key == "hint":
+                self.command_document["hint"] = value if \
+                    isinstance(value, str) else _index_document(value)
+            elif key == "replacement":
+                self.command_document["update"] = value
+            else:
+                self.command_document[key] = value
         self.command_document = convert_to_camelcase(self.command_document)
 
     @property
@@ -133,9 +157,15 @@ class DeleteCommand(BaseCommand):
     def __init__(self, collection: Collection, filter,
                  limit, collation, kwargs):
         super().__init__(collection.name)
-        self.command_document = {"deletes": [SON({"q": filter, "limit": limit})]}
+        self.command_document = {"deletes": [SON({"q": filter, "limit":
+            limit, "collation": collation})]}
         for key, value in kwargs.items():
-            self.command_document[key] = value
+            if key == "hint":
+                self.command_document["deletes"][0]["hint"] = value if \
+                    isinstance(value, str) else _index_document(value)
+            else:
+                self.command_document[key] = value
+
         self.command_document = convert_to_camelcase(self.command_document)
 
     @property

pymongoexplain/explainable_collection.py

@@ -16,20 +16,25 @@
 from typing import Union, List, Dict
 
 import pymongo
+from pymongo.collection import Collection
 from bson.son import SON
 
 from .commands import AggregateCommand, FindCommand, CountCommand, \
     UpdateCommand, DistinctCommand, DeleteCommand, FindAndModifyCommand
 
 Document = Union[dict, SON]
 
+
 class ExplainCollection():
     def __init__(self, collection):
         self.collection = collection
         self.last_cmd_payload = None
 
     def _explain_command(self, command):
         command_son = command.get_SON()
+        if command_son == {}:
+            self.last_cmd_payload = {}
+            return {}
         explain_command = SON([("explain", command_son)])
         explain_command["verbosity"] = "queryPlanner"
         self.last_cmd_payload = command_son
@@ -63,7 +68,7 @@ def distinct(self, key: str, filter: Document=None, session=None, **kwargs):
 
     def aggregate(self, pipeline: List[Document], session=None, **kwargs):
         command = AggregateCommand(self.collection, pipeline, session,
-                                   {},kwargs)
+                                   {}, kwargs)
         return self._explain_command(command)
 
     def estimated_document_count(self,
@@ -76,7 +81,7 @@ def count_documents(self, filter: Document, session=None,
                                  **kwargs):
 
         command = AggregateCommand(self.collection, [{'$match': filter},
-                                                      {'$group': {'n': {'$sum': 1}, '_id': 1}}],
+                                                     {'$group': {'n': {'$sum': 1}, '_id': 1}}],
                                    session, {}, kwargs,
                                    exclude_keys=filter.keys())
         return self._explain_command(command)
@@ -95,7 +100,7 @@ def delete_many(self, filter: Document, collation=None,
         limit = 0
         kwargs["session"] = session
         command = DeleteCommand(self.collection, filter, limit, collation,
-        kwargs)
+                                kwargs)
         return self._explain_command(command)
 
     def watch(self, pipeline: Document = None, full_document: Document = None,
@@ -124,7 +129,8 @@ def find(self, filter: Document = None,
         kwargs.update(locals())
         del kwargs["self"], kwargs["kwargs"]
         command = FindCommand(self.collection,
-                                kwargs)
+                              kwargs)
+
         return self._explain_command(command)
 
     def find_one(self, filter: Document = None, **kwargs: Dict[str,
@@ -149,29 +155,30 @@ def find_one_and_delete(self, filter: Document, projection: list = None,
                                        kwargs)
         return self._explain_command(command)
 
-    def find_one_and_replace(self, filter: Document, replacement: Document,
+    def find_one_and_replace(self, filter: Document, update:
+    Document={},
                             projection: list = None, sort=None,
                              return_document=pymongo.ReturnDocument.BEFORE,
                              session=None, **kwargs):
         kwargs["query"] = filter
         kwargs["fields"] = projection
         kwargs["sort"] = sort
         kwargs["new"] = False
-        kwargs["update"] = replacement
+        kwargs["update"] = update
         kwargs["session"] = session
         command = FindAndModifyCommand(self.collection,
                                        kwargs)
         return self._explain_command(command)
 
-    def find_one_and_update(self, filter: Document, replacement: Document,
+    def find_one_and_update(self, filter: Document, update: Document,
                             projection: list = None, sort=None,
                              return_document=pymongo.ReturnDocument.BEFORE,
                              session=None, **kwargs):
         kwargs["query"] = filter
         kwargs["fields"] = projection
         kwargs["sort"] = sort
         kwargs["upsert"] = False
-        kwargs["update"] = replacement
+        kwargs["update"] = update
         kwargs["session"] = session
 
         command = FindAndModifyCommand(self.collection,

setup.py

@@ -26,8 +26,8 @@
         'console_scripts': [
             'pymongoexplain=pymongoexplain.cli_explain:cli_explain'],
     },
-    tests_require=["pymongo==3.10.1"],
-    install_requires=['pymongo==3.10.1'],
+    tests_require=["pymongo==3.11.0rc0"],
+    install_requires=['pymongo==3.11.0rc0'],
     python_requires='>=3.5',
     license="Apache License, Version 2.0",
     classifiers=[