Update to ES 1.0.0

.travis.yml

@@ -8,7 +8,7 @@ install: "pip install -r requirements.txt --use-mirrors"
 # set up environment variables
 env:
   global:
-    - ES_VER=1.0.0.RC2
+    - ES_VER=1.0.0
     - ES_MAPPER_ATTACHMENTS_VER=2.0.0.RC1
     - ES_TRANSPORT_THRIFT_VER=2.0.0.RC1
     - ES_RABBITMQ_PLUGIN_VER=2.0.0.RC1

README.rst

@@ -33,7 +33,7 @@ Documentation can be found `here <https://pylastica.readthedocs.org>`_.
 Compatibility
 -------------
 
-Pylastica is tested with Python 2.7 and Elasticsearch version 1.0.0.RC2.
+Pylastica is tested with Python 2.7 and Elasticsearch version 1.0.0.
 
 Changes
 -------

changes.markdown

@@ -1,5 +1,8 @@
 Changelog
 =========
+### 2014-02-12
+* Update to Elasticsearch 1.0.0
+
 ### 2014-02-03
 * Update to Elasticsearch 1.0.0.RC2
 * Update GeohashGrid aggregation to reflect name change

pylastica/aggregation/iprange.py

@@ -4,6 +4,16 @@
 
 
 class IpRange(abstract.AbstractAggregation):
+    def __init__(self, name, field):
+        """
+        @param name: the name of this aggregation
+        @type name: str
+        @param field: the name of the document field on which to perform this aggregation
+        @type field: str
+        """
+        super(IpRange, self).__init__(name)
+        self.set_field(field)
+
     def set_field(self, field):
         """
         Set the field for this aggregation

pylastica/aggregation/missing.py

@@ -4,6 +4,16 @@
 
 
 class Missing(abstract.AbstractAggregation):
+    def __init__(self, name, field):
+        """
+        @param name: the name of this aggregation
+        @type name: str
+        @param field: the name of the document field on which to perform this aggregation
+        @type field: str
+        """
+        super(Missing, self).__init__(name)
+        self.set_field(field)
+
     def set_field(self, field):
         """
         Set the field for this aggregation

pylastica/aggregation/nested.py

@@ -4,6 +4,16 @@
 
 
 class Nested(abstract.AbstractAggregation):
+    def __init__(self, name, path):
+        """
+        @param name: the name of this aggregation
+        @type name: str
+        @param path: the nested path for this aggregation
+        @type path: str
+        """
+        super(Nested, self).__init__(name)
+        self.set_path(path)
+
     def set_path(self, path):
         """
         Set the nested path for this aggregation

pylastica/aggregation/valuecount.py

@@ -4,6 +4,16 @@
 
 
 class ValueCount(abstract.AbstractAggregation):
+    def __init__(self, name, field):
+        """
+        @param name: the name of this aggregation
+        @type name: str
+        @param field: the name of the document field on which to perform this aggregation
+        @type field: str
+        """
+        super(ValueCount, self).__init__(name)
+        self.set_field(field)
+
     def set_field(self, field):
         """
         Set the field for this aggregation

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='pylastica',
-    version='1.0.0.RC1',
+    version='1.0.0.0',
     packages=packages,
     url='https://github.com/jlinn/pylastica',
     license='LICENSE.txt',

tests/aggregation/test_daterange.py

@@ -40,7 +40,7 @@ def test_date_range_aggregation(self):
         query.add_aggregation(agg)
         results = self._index.search(query).aggregations['date']
 
-        for bucket in results:
+        for bucket in results['buckets']:
             if 'to' in bucket:
                 self.assertEqual(1, bucket['doc_count'])
             elif 'from' in bucket:

tests/aggregation/test_geohashgrid.py

@@ -12,7 +12,7 @@
 class GeohashgridTest(unittest.TestCase, Base):
     def setUp(self):
         super(GeohashgridTest, self).setUp()
-        self._index = self._create_index("test_aggregation_geo_distance")
+        self._index = self._create_index("test_aggregation_geohash_grid")
         mapping = Mapping()
         mapping.set_properties({
             "location": {"type": "geo_point"}

tests/aggregation/test_iprange.py

@@ -32,7 +32,7 @@ def tearDown(self):
         self._index.delete()
 
     def test_ip_range_aggregation(self):
-        agg = IpRange("ip").set_field("address")
+        agg = IpRange("ip", "address")
         agg.add_range(from_value="192.168.1.101").add_range(to_value="192.168.1.200").add_mask_range("192.168.1.0/24")
 
         query = Query()

tests/aggregation/test_max.py

@@ -9,9 +9,9 @@
 import unittest
 
 
-class MinTest(unittest.TestCase, Base):
+class MaxTest(unittest.TestCase, Base):
     def setUp(self):
-        super(MinTest, self).setUp()
+        super(MaxTest, self).setUp()
         self._index = self._create_index("test_aggregation_max")
         docs = [
             Document("1", {"price": 5}),
@@ -23,7 +23,7 @@ def setUp(self):
         self._index.refresh()
 
     def tearDown(self):
-        super(MinTest, self).tearDown()
+        super(MaxTest, self).tearDown()
         self._index.delete()
 
     def test_to_dict(self):
@@ -45,7 +45,7 @@ def test_to_dict(self):
         agg.add_aggregation(Max("subagg").set_field("foo"))
         self.assertEqual(expected, agg.to_dict())
 
-    def test_min_aggregation(self):
+    def test_max_aggregation(self):
         agg = Max("min_price")
         agg.set_field("price")
 

tests/aggregation/test_missing.py

@@ -26,7 +26,7 @@ def tearDown(self):
         self._index.delete()
 
     def test_missing_aggregation(self):
-        agg = Missing("missing").set_field("color")
+        agg = Missing("missing", "color")
 
         query = Query()
         query.add_aggregation(agg)

tests/aggregation/test_nested.py

@@ -48,7 +48,7 @@ def tearDown(self):
         self._index.delete()
 
     def test_nested_aggregation(self):
-        agg = Nested("resellers").set_path("resellers")
+        agg = Nested("resellers", "resellers")
         agg.add_aggregation(Min("min_price").set_field("price"))
 
         query = Query()

tests/aggregation/test_valuecount.py

@@ -27,8 +27,7 @@ def tearDown(self):
         self._index.delete()
 
     def test_value_count_aggregation(self):
-        agg = ValueCount("count")
-        agg.set_field("price")
+        agg = ValueCount("count", "price")
 
         query = Query()
         query.add_aggregation(agg)