Merge branch 'release/0.4.0'

README.md

@@ -3,6 +3,13 @@ django-tastypie-elasticsearch
 
 ElasticSearch support for django-tastypie
 
+Installation
+------------
+
+```
+    $ pip install django-tastypie-elasticsearch
+```
+
 Requirements
 ------------
 
@@ -15,7 +22,6 @@ Requirements
 .. _Django: http://djangoproject.com
 .. _django-tastypie: http://tastypieapi.org
 .. _ElasticSearch: http://elasticsearch.org
-.. _pyes: https://github.com/aparo/pyes
 
 How to use?
 -----------

docs/conf.py

@@ -18,7 +18,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('.'))
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.test_project.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
 
 
 # -- General configuration -----------------------------------------------------

docs/installation.rst

@@ -20,5 +20,5 @@ In your settings.py add ``tastypie`` and ``tastypie_elasticsearch`` to ``INSTALL
 
 You must also add in your settings::
 
-    ES_SERVER = 'http://127.0.0.1:9200/'
+    ES_SERVER = '127.0.0.1:9200'
 

docs/usage.rst

@@ -24,7 +24,7 @@ Simple Example
         class Meta:
 
             es_server = getattr(settings, 
-                "ES_SERVER", "http://127.0.0.1:9200/")
+                "ES_SERVER", "127.0.0.1:9200")
             es_timeout = 20
         
             indices = ["my_elasticsearch_index"]

setup.py

@@ -4,7 +4,7 @@
 import re
 from setuptools import setup, find_packages
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.test_project.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
 
 def parse_requirements(file_name):
     requirements = []
@@ -23,7 +23,7 @@ def parse_requirements(file_name):
 
 setup(
     name = 'django-tastypie-elasticsearch',
-    version = '0.3.0',
+    version = '0.4.0',
     description = "ElasticSearch Resource for django-tastypie.",
     long_description = open(os.path.join(os.path.dirname(__file__), 'README.md')).read(),
     author = 'Jordi Llonch',
@@ -44,5 +44,5 @@ def parse_requirements(file_name):
     zip_safe = True,
     install_requires=parse_requirements('requirements.txt'),
     tests_require=parse_requirements('requirements-test.txt'),
-    test_suite = 'tests.runtests.runtests',
+    test_suite='tests.runtests.runtests',
 )

tastypie_elasticsearch/__init__.py

@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-import logging
-
-logger = logging.getLogger(__name__)
-
 import pkg_resources
 VERSION = pkg_resources.get_distribution('django-tastypie-elasticsearch').version
 
@@ -14,4 +8,5 @@
 __homepage__ = "http://github.com/llonchj/django-tastypie-elasticsearch"
 __docformat__ = "restructuredtext"
 
-from .resources import ElasticSearch
+from elasticsearch.connection import *
+from .resources import ElasticsearchResource

tastypie_elasticsearch/paginator.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+"""
+tastypie.Resource definitions for Elasticsearch
+
+"""
+
+from tastypie.bundle import Bundle
+from tastypie.paginator import Paginator
+#from tastypie.resources import Resource, DeclarativeMetaclass
+#from tastypie.exceptions import NotFound
+#from tastypie.utils import trailing_slash
+#from tastypie import http
+
+
+class ElasticsearchResult(list):
+    def __init__(self, result, query=None):
+        super(ElasticsearchResult, self).__init__(result["hits"]["hits"])
+
+        self.shards = result["_shards"]
+        self.took = result["took"]
+        self.timed_out = result["timed_out"]
+        self.total = result["hits"]["total"]
+        self.max_score = result["hits"]["max_score"]
+        self.facets = result.get("facets", [])
+        self.query = query
+
+class ElasticsearchPaginator(Paginator):
+
+    add_search_info = False
+
+    def get_count(self):
+        return self.objects.total
+
+    def get_slice(self, limit, offset):
+        """
+        Slices the result set to the specified ``limit`` & ``offset``.
+        """
+        return self.objects
+
+    def page(self):
+        output = super(ElasticsearchPaginator, self).page()
+
+        objects = self.objects
+
+        if self.add_search_info:
+            search = dict(
+                took=objects.took,
+                max_score=objects.max_score,
+                shards=objects.shards,
+            )
+            if objects.timed_out:
+                search['timed_out'] = objects.timed_out
+            if objects.query:
+                search['query'] = objects.query
+
+            output['meta']['search'] = search
+        else:
+            output['meta']['took'] = objects.took
+        if len(objects.facets):
+            output["facets"] = objects.facets
+        return output
+