Added Elastica\Aggregation\DateHistogram::setTimezone

Author: im-denisenko

changes.txt

@@ -1,8 +1,8 @@
 CHANGES
 
 2015-04-08
-- Added Elastica\Aggregation\DateHistogram::setOffset
-- Added deprecation notice to setPreOffset, setPostOffset and setPreZoneAdjustLargeInterval methods in Elastica\Aggregation\DateHistogram
+- Added new methods to Elastica\Aggregation\DateHistogram: setOffset, setTimezone
+- Following methods in Elastica\Aggregation\DateHistogram marked as deprecated: setPreOffset, setPostOffset, setPreZone, setPostZone, setPreZoneAdjustLargeInterval
 
 2015-04-07
 - [BC break] Elastica\Query\QueryString::setLowercaseExpandedTerms removed

lib/Elastica/Aggregation/DateHistogram.php

@@ -11,6 +11,9 @@ class DateHistogram extends Histogram
 {
     /**
      * Set pre-rounding based on interval
+     *
+     * @deprecated Option "pre_zone" is deprecated as of ES 1.5. Use "time_zone" instead
+     *
      * @param  string $preZone
      * @return $this
      */
@@ -21,6 +24,9 @@ public function setPreZone($preZone)
 
     /**
      * Set post-rounding based on interval
+     *
+     * @deprecated Option "post_zone" is deprecated as of ES 1.5. Use "time_zone" instead
+     *
      * @param  string $postZone
      * @return $this
      */
@@ -29,6 +35,17 @@ public function setPostZone($postZone)
         return $this->setParam("post_zone", $postZone);
     }
 
+    /**
+     * Set time_zone option
+     *
+     * @param  string
+     * @return $this
+     */
+    public function setTimezone($timezone)
+    {
+        return $this->setParam('time_zone', $timezone);
+    }
+
     /**
      * Set pre-zone adjustment for larger time intervals (day and above)
      *

test/lib/Elastica/Test/Aggregation/DateHistogramTest.php

@@ -69,4 +69,23 @@ public function testSetOffsetWorks()
 
         $this->assertEquals('2014-01-29T00:19:40.000Z', $results['buckets'][0]['key_as_string']);
     }
+
+    public function testSetTimezone()
+    {
+        $agg = new DateHistogram('hist', 'created', '1h');
+
+        $agg->setTimezone('-02:30');
+
+        $expected = array(
+            'date_histogram' => array(
+                'field' => 'created',
+                'interval' => '1h',
+                'time_zone' => '-02:30',
+            ),
+        );
+
+       $this->assertEquals($expected, $agg->toArray());
+
+       $this->assertInstanceOf('Elastica\Aggregation\DateHistogram', $agg->setTimezone('-02:30'));
+    }
 }