Merge pull request #3 from databox/feature/attributes

add attributes support

Author: VladaPetrovic

README.md

@@ -53,8 +53,13 @@ $c->insertAll([
     ['sales', 103, '2015-01-01 17:00:00'],
 ]);
 
+// Or push some attributes
+$ok = $c->push('sales', 203, null, [
+    'city' => 'Boston'
+]);
+
 print_r(
-    $c->lastPush(2)
+    $c->lastPush(3)
 );
 
 ```

src/Databox/Client.php

@@ -24,20 +24,24 @@ public function rawPush($path = '/', $data = [])
         return $this->post($path, $data)->json();
     }
 
-    private function processKPI($key, $value, $date = null)
+    private function processKPI($key, $value, $date = null, $attributes = null)
     {
-        $data = [sprintf('$%s', $key) => $value];
+        $data = [sprintf('$%s', trim($key, '$')) => $value];
         if (!is_null($date)) {
             $data['date'] = $date;
         }
 
+        if (is_array($attributes)) {
+            $data = $data + $attributes;
+        }
+
         return $data;
     }
 
-    public function push($key, $value, $date = null)
+    public function push($key, $value, $date = null, $attributes = null)
     {
         $response = $this->rawPush('/', [
-            'json' => ['data' => [$this->processKPI($key, $value, $date)]]
+            'json' => ['data' => [$this->processKPI($key, $value, $date, $attributes)]]
         ]);
 
         return $response['status'] === 'ok';

tests/Databox/Tests/ClientTest.php

@@ -29,6 +29,9 @@ public function testPush()
 
         $this->assertTrue($this->client->push('sales', 53.2));
         $this->assertTrue($this->client->push('sales', 40, '2015-01-01 17:00:00'));
+        $this->assertTrue($this->client->push('sales', 40, '2015-01-01 17:00:00', [
+            'name' => 'attribute name'
+        ]));
     }
 
     public function testFailedPush()