prepare 0.13.1

Author: barseghyanartur

CHANGELOG.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.13.1
+------
+2018-07-26
+
+- Minor fix in suggesters on Elasticsearch 6.x.
+
 0.13
 ----
 2018-07-23

docs/changelog.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.13.1
+------
+2018-07-26
+
+- Minor fix in suggesters on Elasticsearch 6.x.
+
 0.13
 ----
 2018-07-23

docs/installing_elasticsearch.rst

@@ -21,8 +21,8 @@ Docker
 ~~~
 .. code-block:: sh
 
-    docker pull docker.elastic.co/elasticsearch/elasticsearch:6.3.0
-    docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.3.0
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:6.3.1
+    docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.3.1
 
 Vagrant
 -------

installing_elasticsearch.rst

@@ -21,8 +21,8 @@ Docker
 ~~~
 .. code-block:: sh
 
-    docker pull docker.elastic.co/elasticsearch/elasticsearch:6.3.0
-    docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.3.0
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:6.3.1
+    docker run -p 9200:9200 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:6.3.1
 
 Vagrant
 -------

scripts/create_index.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 cd examples/simple/
 ./manage.py search_index --create -f
-./manage.py search_index --populate -f
+#./manage.py search_index --populate -f

scripts/delete_index.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+cd examples/simple/
+./manage.py search_index --delete -f "$@"

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.13'
+version = '0.13.1'
 
 DOCS_TRANSFORMATIONS = (
     (

src/django_elasticsearch_dsl_drf/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.13'
+__version__ = '0.13.1'
 __author__ = 'Artur Barseghyan <[email protected]>'
 __copyright__ = '2017-2018 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/django_elasticsearch_dsl_drf/pagination.py

@@ -127,7 +127,7 @@ def paginate_queryset(self, queryset, request, view=None):
         is_suggest = getattr(queryset, '_suggest', False)
         if is_suggest:
             if ELASTICSEARCH_GTE_6_0:
-                return queryset.execute().to_dict()['suggest']
+                return queryset.execute().to_dict().get('suggest')
             return queryset.execute_suggest().to_dict()
 
         # Check if we're using paginate queryset from `functional_suggest`
@@ -233,7 +233,7 @@ def paginate_queryset(self, queryset, request, view=None):
         is_suggest = getattr(queryset, '_suggest', False)
         if is_suggest:
             if ELASTICSEARCH_GTE_6_0:
-                return queryset.execute().to_dict()['suggest']
+                return queryset.execute().to_dict().get('suggest')
             return queryset.execute_suggest().to_dict()
 
         # Check if we're using paginate queryset from `functional_suggest`

src/django_elasticsearch_dsl_drf/tests/test_suggesters.py

@@ -31,6 +31,7 @@
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = (
     'TestSuggesters',
+    'TestSuggestersEmptyIndex',
 )
 
 
@@ -314,5 +315,32 @@ def test_nested_fields_suggesters_completion(self):
         self._test_suggesters(test_data, self.addresses_suggest_url)
 
 
+@pytest.mark.django_db
+class TestSuggestersEmptyIndex(BaseRestFrameworkTestCase, AddressesMixin):
+    """Test suggesters on empty index."""
+
+    pytestmark = pytest.mark.django_db
+
+    @classmethod
+    def setUpClass(cls):
+        """Set up class."""
+        cls.authors_url = reverse(
+            'authordocument-suggest',
+            kwargs={}
+        )
+        # Suggest on empty index
+        call_command('search_index', '--delete', '-f')
+        call_command('search_index', '--create', '-f')
+
+    def test_suggesters_on_empty_index(self):
+        """Test suggesters phrase."""
+        response = self.client.get(
+            self.authors_url + '?name_suggest__completion=Ad',
+            {}
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertFalse(bool(response.data))
+
+
 if __name__ == '__main__':
     unittest.main()