Merge pull request #17 from oceandba/release/v1.0.1

Release v1.0.1

src/Metrics/Target.php

@@ -9,7 +9,9 @@
 
 class Target implements UrlParameter, Metric
 {
-    use Makable, Macroable;
+    use Makable, Macroable {
+        Macroable::__call as callMacro;
+    }
 
     /**
      * Name for the target.
@@ -62,6 +64,16 @@ public function apply(string $method, ...$args): Metric
         return $this;
     }
 
+    /**
+     * Returns the name of the Target.
+     *
+     * @return string
+     */
+    public function name(): string
+    {
+        return $this->name;
+    }
+
     /**
      * Get the current value of the parameter as string for Graphite.
      *
@@ -92,7 +104,11 @@ public function render(): string
      */
     public function __call($name, $arguments)
     {
-        return $this->apply($name, ...$arguments);
+        try {
+            return $this->callMacro($name, $arguments);
+        } catch (\BadMethodCallException $e) {
+            return $this->apply($name, ...$arguments);
+        }
     }
 
     /**

src/Series/DataPoints.php

@@ -56,6 +56,26 @@ public static function make(Target $target, array $data = null): self
         return new static($target, $points);
     }
 
+    /**
+     * Returns the Target associated to the DataPoints.
+     *
+     * @return Target
+     */
+    public function target(): Target
+    {
+        return $this->target;
+    }
+
+    /**
+     * Returns the points Collection.
+     *
+     * @return Collection
+     */
+    public function points(): Collection
+    {
+        return $this->points;
+    }
+
     /**
      * Determine if the datapoints is empty or not.
      *

src/Series/Point.php

@@ -3,9 +3,12 @@
 namespace OceanDBA\Graphitti\Series;
 
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Traits\Macroable;
 
 class Point
 {
+    use Macroable;
+
     /**
      * Time at which the point occurred.
      *
@@ -32,6 +35,26 @@ public function __construct(Carbon $time, float $value)
         $this->value = $value;
     }
 
+    /**
+     * Get the time for this Point.
+     *
+     * @return Carbon
+     */
+    public function time(): Carbon
+    {
+        return $this->time;
+    }
+
+    /**
+     * Get the value of the Point.
+     *
+     * @return float
+     */
+    public function value(): float
+    {
+        return $this->value;
+    }
+
     /**
      * Create a new Point using raw values.
      *