Merge pull request #171 from adisbladis/master

Change document.save/delete to raise ValidationError on no index

elasticsearch_dsl/document.py

@@ -8,6 +8,7 @@
 from .result import ResultMeta
 from .search import Search
 from .connections import connections
+from .exceptions import ValidationException
 
 DOC_META_FIELDS = frozenset((
     'id', 'parent', 'routing', 'timestamp', 'ttl', 'version', 'version_type'
@@ -165,7 +166,7 @@ def delete(self, using=None, index=None, **kwargs):
         if index is None:
             index = getattr(self.meta, 'index', self._doc_type.index)
         if index is None:
-            raise #XXX - no index
+            raise ValidationException('No index')
         # extract parent, routing etc from meta
         doc_meta = dict(
             (k, self.meta[k])
@@ -199,7 +200,7 @@ def save(self, using=None, index=None, **kwargs):
         if index is None:
             index = getattr(self.meta, 'index', self._doc_type.index)
         if index is None:
-            raise #XXX - no index
+            raise ValidationException('No index')
         # extract parent, routing etc from meta
         doc_meta = dict(
             (k, self.meta[k])

test_elasticsearch_dsl/test_document.py

@@ -265,3 +265,13 @@ def test_meta_fields_can_be_accessed_directly_with_underscore():
     assert md.meta.id == 42
     assert md._id == 42
     assert md.meta.parent is md._parent is p
+
+def test_save_no_index(mock_client):
+    md = MyDoc()
+    with raises(ValidationException):
+        md.save(using='mock')
+
+def test_delete_no_index(mock_client):
+    md = MyDoc()
+    with raises(ValidationException):
+        md.delete(using='mock')