RDBC-179 Fix problematic code

- Fix Typos
- Fix sending None values to server

Author: IdanHaim

README.md

@@ -155,7 +155,7 @@ with store.open_session() as session:
 ##What`s new
 ###Changes Api
 The RavenDB client offers a push notification feature that allows you to receive messages from a server about events that occurred there. 
-ou are able to subscribe to events for all documents, indexes and operations as well as to indicate a particular 
+You are able to subscribe to events for all documents, indexes and operations as well as to indicate a particular 
 one that you are interested in. This mechanism lets you notify users if something has changed without 
 the need to do any expensive polling.
 
@@ -188,7 +188,7 @@ In this example we want to observe to changes from all documents and for index w
 After we register the observable we can subscribe for the notification and decide what to do with them (like append).
 
 If you did not create an Observer for the subscription we will create one for you with the method you put.
-(To create Observer you can make any class that you want the will inherit from the class Observer
+(To create Observer you can make any class that you want that will inherit from the class Observer
 can be found in pyravendb.changes.observers or to use the ActionObserver).
 
 ```python
@@ -204,4 +204,7 @@ class Observer(metaclass=ABCMeta):
     @abstractmethod
     def on_next(self, value):
         pass
-```
+```
+
+#####Bug Tracker
+http://issues.hibernatingrhinos.com/issues/RDBC

pyravendb/commands/commands_data.py

@@ -26,7 +26,10 @@ def __init__(self, key, change_vector=None, document=None, metadata=None):
 
     def to_json(self):
         self.document["@metadata"] = self.metadata
-        return {"Type": self._type, "Id": self.key, "Document": self.document, "ChangeVector": self.change_vector}
+        data = {"Type": self._type, "Id": self.key, "Document": self.document}
+        if self.change_vector:
+            data["ChangeVector"] = self.change_vector
+        return data
 
 
 class DeleteCommandData(_CommandData):
@@ -35,7 +38,10 @@ def __init__(self, key, change_vector=None):
         self.additionalData = None
 
     def to_json(self):
-        return {"Id": self.key, "ChangeVector": self.change_vector, "Type": self._type}
+        data = {"Id": self.key, "ChangeVector": self.change_vector, "Type": self._type}
+        if self.change_vector:
+            data["ChangeVector"] = self.change_vector
+        return {"Id": self.key, "Type": self._type}
 
 
 class PatchCommandData(_CommandData):
@@ -67,10 +73,13 @@ def __init__(self, key, scripted_patch, change_vector=None, patch_if_missing=Non
         self.debug_Mode = debug_mode
 
     def to_json(self):
-        data = {"Id": self.key, "ChangeVector": self.change_vector, "Type": self._type,
+        data = {"Id": self.key, "Type": self._type,
                 "Patch": self.scripted_patch.to_json(),
                 "DebugMode": self.debug_Mode}
 
+        if self.change_vector:
+            data["ChangeVector"] = self.change_vector
+
         if self.patch_if_missing is not None:
             data["PatchIfMissing"] = self.patch_if_missing.to_json()
 
@@ -98,8 +107,12 @@ def __init__(self, document_id, name, stream, content_type, change_vector):
         self.content_type = content_type
 
     def to_json(self):
-        return {"Id": self.key, "Name": self.name, "ContentType": self.content_type,
-                "ChangeVector": self.change_vector, "Type": self._type}
+        data = {"Id": self.key, "Name": self.name, "ContentType": self.content_type, "Type": self._type}
+
+        if self.change_vector:
+            data["ChangeVector"] = self.change_vector
+
+        return data
 
 
 class DeleteAttachmentCommandData(_CommandData):
@@ -119,5 +132,9 @@ def __init__(self, document_id, name, change_vector):
         self.name = name
 
     def to_json(self):
-        return {"Id": self.key, "Name": self.name,
-                "ChangeVector": self.change_vector, "Type": self._type}
+        data = {"Id": self.key, "Name": self.name, "Type": self._type}
+
+        if self.change_vector:
+            data["ChangeVector"] = self.change_vector
+
+        return data

pyravendb/data/query.py

@@ -1,6 +1,5 @@
 from pyravendb.tools.utils import Utils
 from abc import ABCMeta
-from datetime import timedelta
 from enum import Enum
 import json
 import xxhash

pyravendb/hilo/hilo_generator.py

@@ -93,8 +93,6 @@ def generate_document_key(self, entity):
         tag = self._conventions.default_transform_type_tag_name(entity.__class__.__name__)
         if tag is None:
             return None
-        if tag in self.key_generators_by_tag:
-            value = self.key_generators_by_tag[tag]
         else:
             with self.lock:
                 if tag in self.key_generators_by_tag:

pyravendb/store/document_session.py

@@ -328,7 +328,7 @@ def _update_batch_result(self, batch_result, data):
                 if entity in self._documents_by_entity:
                     self._documents_by_id[item["@id"]] = entity
                     document_info = self._documents_by_entity[entity]
-                    document_info["change_vector"] = ["change_vector"]
+                    document_info["change_vector"] = item["@change-vector"]
                     item.pop("Type", None)
                     document_info["original_metadata"] = item.copy()
                     document_info["metadata"] = item
@@ -341,7 +341,6 @@ def _prepare_for_delete_commands(self, data):
             keys_to_delete.append(self._documents_by_entity[entity]["key"])
 
         for key in keys_to_delete:
-            existing_entity = None
             change_vector = None
             if key in self._documents_by_id:
                 existing_entity = self._documents_by_id[key]
@@ -350,7 +349,7 @@ def _prepare_for_delete_commands(self, data):
                         "@change-vector"] if self.advanced.use_optimistic_concurrency else None
                 self._documents_by_entity.pop(existing_entity, None)
                 self._documents_by_id.pop(key, None)
-            data.entities.append(existing_entity)
+                data.entities.append(existing_entity)
             data.commands.append(commands_data.DeleteCommandData(key, change_vector))
         self._deleted_entities.clear()
 

pyravendb/store/document_store.py

@@ -96,7 +96,7 @@ def get_request_executor(self, db_name=None):
     def initialize(self):
         if not self._initialize:
             if self.urls is None or len(self.urls) == 0:
-                raise ValueError("Document store URLs cannot be empty", "urks")
+                raise ValueError("Document store URLs cannot be empty", "urls")
             if self.database is None:
                 raise exceptions.InvalidOperationException("None database is not valid")
 

pyravendb/tests/session_tests/test_delete.py

@@ -4,7 +4,6 @@
 sys.path.append(os.path.abspath(__file__ + "/../"))
 
 from pyravendb.tests.test_base import TestBase
-from pyravendb.store.document_store import DocumentStore
 from pyravendb.custom_exceptions import exceptions
 import unittest
 
@@ -56,6 +55,19 @@ def test_delete_after_change_success_with_save_session(self):
             session.save_changes()
             self.assertIsNone(session.load("products/107"))
 
+    def test_delete_with_entity(self):
+        product = Product("Toys")
+        with self.store.open_session() as session:
+            session.store(product)
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            product = session.load(product.Id)
+            session.delete(product)
+            session.save_changes()
+
+            self.assertIsNone(session.load(product.Id))
+
 
 if __name__ == "__main__":
     unittest.main()

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='pyravendb',
     packages=find_packages(),
-    version='4.0.4.2',
+    version='4.0.4.3',
     description='This is the official python client for RavenDB v4.0 document database',
     author='Idan Haim Shalom',
     author_email='haimdude@gmail.com',