Add DateTime option to Range function

Signed-off-by: davidarendsen <davidarendsen@hey.com>

src/Formatters.php

@@ -2,6 +2,8 @@
 
 namespace Arendsen\FluxQueryBuilder;
 
+use DateTime;
+
 class Formatters {
 
     public static function valueToString($value): string
@@ -38,4 +40,8 @@ class Formatters {
         return implode(', ', $array);
     }
 
+    public static function dateTimeToString(DateTime $dateTime): string {
+		return 'time(v: ' . $dateTime->format('Y-m-d\TH:i:s\Z') . ')';
+	}
+
 }

src/Functions/Range.php

@@ -3,30 +3,48 @@
 namespace Arendsen\FluxQueryBuilder\Functions;
 
 use Arendsen\FluxQueryBuilder\Exception\FunctionRequiredSettingMissingException;
+use Arendsen\FluxQueryBuilder\Formatters;
+use DateTime;
 
 class Range extends Base {
 
     /**
-     * @var array $settings
+     * @var mixed $start
      */
-    private $settings;
+    private $start;
+
+    /**
+     * @var mixed $stop
+     */
+    private $stop;
 
     public function __construct(array $settings)
     {
-        $this->settings = $settings;
+        $this->start = isset($settings['start']) ? $settings['start'] : null;
+        $this->stop = isset($settings['stop']) ? $settings['stop'] : null;
     }
 
     public function __toString()
     {
-        if(!isset($this->settings['start']))
+        if(!$this->start)
         {
             throw new FunctionRequiredSettingMissingException('Range', 'Start setting is required!');
         }
 
-        $settingsString = 'start: ' . $this->settings['start'];
-        if(isset($this->settings['stop']))
+        if($this->start instanceof DateTime)
         {
-            $settingsString .= ', stop: ' . $this->settings['stop'];
+            $this->start = Formatters::dateTimeToString($this->start);
+        }
+
+        if($this->stop instanceof DateTime)
+        {
+            $this->stop = Formatters::dateTimeToString($this->stop);
+        }
+
+        $settingsString = 'start: ' . $this->start;
+        if($this->stop)
+        {
+            $settingsString .= ', stop: ' . $this->stop;
         }
 
         return '|> range(' . $settingsString . ') ';

src/QueryBuilder.php

@@ -2,6 +2,8 @@
 
 namespace Arendsen\FluxQueryBuilder;
 
+use DateTime;
+use Exception;
 use Arendsen\FluxQueryBuilder\Expression\KeyValue;
 use Arendsen\FluxQueryBuilder\Functions\Filter;
 use Arendsen\FluxQueryBuilder\Functions\From;
@@ -11,7 +13,6 @@ use Arendsen\FluxQueryBuilder\Functions\Sort;
 use Arendsen\FluxQueryBuilder\Functions\Map;
 use Arendsen\FluxQueryBuilder\Functions\Group;
 use Arendsen\FluxQueryBuilder\Functions\Limit;
-use Exception;
 
 class QueryBuilder {
 
@@ -100,12 +101,25 @@ class QueryBuilder {
         return $this;
     }
 
-    public function addRangeStart(string $rangeStart): QueryBuilder
+    /**
+     * @param string|DateTime $rangeStart
+     */
+    public function addRangeStart($rangeStart): QueryBuilder
     {
         $this->addRange(['start' => $rangeStart]);
         return $this;
     }
 
+    /**
+     * @param string|DateTime $start
+     * @param string|DateTime $stop
+     */
+    public function addRangeInBetween($start, $stop)
+    {
+        $this->addRange(['start' => $start, 'stop' => $stop]);
+        return $this;
+    }
+
     public function addReduce(array $settings, array $identity): QueryBuilder
     {
         $this->addToQueryArray(