Move Model.drop_all -> es.drop_all

The function deletes the whole index, not just one type of documents, so
this makes much more sense.

Author: Treora

annotator/elasticsearch.py

@@ -66,6 +66,12 @@ def conn(self):
             self._connection = self._connect()
         return self._connection
 
+    def drop_all(self):
+        """Delete the index and its contents"""
+        if self.conn.indices.exists(self.index):
+            self.conn.indices.close(self.index)
+            self.conn.indices.delete(self.index)
+
     def create_models(self, models):
         mappings = _compile_mappings(models)
         analysis = _compile_analysis(models)
@@ -163,12 +169,6 @@ def get_mapping(cls):
     def get_analysis(cls):
         return getattr(cls, '__analysis__', {})
 
-    @classmethod
-    def drop_all(cls):
-        if cls.es.conn.indices.exists(cls.es.index):
-            cls.es.conn.indices.close(cls.es.index)
-            cls.es.conn.indices.delete(cls.es.index)
-
     # It would be lovely if this were called 'get', but the dict semantics
     # already define that method name.
     @classmethod

tests/__init__.py

@@ -30,14 +30,12 @@ class TestCase(object):
     @classmethod
     def setup_class(cls):
         cls.app = create_app()
-        annotation.Annotation.drop_all()
-        document.Document.drop_all()
+        es.drop_all()
 
     def setup(self):
         es.create_models([annotation.Annotation, document.Document])
         es.conn.cluster.health(wait_for_status='yellow')
         self.cli = self.app.test_client()
 
     def teardown(self):
-        annotation.Annotation.drop_all()
-        document.Document.drop_all()
+        es.drop_all()