Merge pull request #9 from databox/last-push-update

"Lastpushes" update

Author: otobrglez

example.php

@@ -4,7 +4,13 @@
 
 use Databox\Client;
 
-$c = new Client('adxg1kq5a4g04k0wk0s4wkssow8osw84');
+$token = getenv("DATABOX_PUSH_TOKEN");
+
+if (!$token) {
+    $token = 'adxg1kq5a4g04k0wk0s4wkssow8osw84';
+}
+
+$c = new Client($token);
 
 $ok = $c->push('sales', 203);
 if ($ok) {

src/Databox/Client.php

@@ -10,10 +10,10 @@ public function __construct($pushToken = null)
     {
         parent::__construct([
             'base_uri' => 'https://push2new.databox.com',
-            'headers'  => [
-                'User-Agent'   => 'databox-php/1.2',
+            'headers' => [
+                'User-Agent' => 'databox-php/1.3',
                 'Content-Type' => 'application/json',
-                'Accept'       => 'application/json'
+                'Accept' => 'application/json'
             ],
             'auth' => [$pushToken, '', 'Basic']
         ]);
@@ -24,6 +24,11 @@ public function rawPush($path = '/', $data = [])
         return json_decode($this->post($path, $data)->getBody(), true);
     }
 
+    public function rawGet($path)
+    {
+        return json_decode($this->get($path)->getBody(), true);
+    }
+
     private function processKPI($key, $value, $date = null, $attributes = null)
     {
         $data = [sprintf('$%s', trim($key, '$')) => $value];
@@ -62,6 +67,6 @@ public function insertAll($kpis)
 
     public function lastPush($n = 1)
     {
-        return $this->rawPush(sprintf('/lastpushes/%d', $n));
+        return $this->rawGet(sprintf('/lastpushes/%d', $n));
     }
 }

tests/Databox/Tests/ClientTest.php

@@ -10,22 +10,22 @@ class ClientTest extends \PHPUnit_Framework_TestCase
     public function __construct()
     {
         $this->client = $this->getMockBuilder('Databox\Client')
-            ->setMethods(['rawPush'])
+            ->setMethods(['rawPush', 'rawGet'])
             ->getMock();
     }
 
     public function testClientCorrectOptions()
     {
-        $mimeType  = 'application/json';
+        $mimeType = 'application/json';
         $userAgent = 'databox-php';
-        $token     = 'test-token';
-        $baseUrl   = 'https://push2new.databox.com';
+        $token = 'test-token';
+        $baseUrl = 'https://push2new.databox.com';
 
         $client = new Client($token);
         $this->assertEquals($mimeType, $client->getConfig('headers')['Content-Type']);
         $this->assertEquals($userAgent, substr($client->getConfig('headers')['User-Agent'], 0, 11));
         $this->assertEquals($mimeType, $client->getConfig('headers')['Accept']);
-        $this->assertEquals($baseUrl, (string) $client->getConfig('base_uri'));
+        $this->assertEquals($baseUrl, (string)$client->getConfig('base_uri'));
         $this->assertEquals($token, $client->getConfig('auth')[0]);
     }
 
@@ -35,16 +35,28 @@ public function testRawPush()
             ->setMethods(['post'])
             ->getMock();
 
-        $json     = '{"status":"ok"}';
+        $json = '{"status":"ok"}';
         $response = new Response(200, [], $json);
         $client->method('post')->willReturn($response);
 
         $this->assertEquals($json, json_encode($client->rawPush()));
     }
 
+    public function testRawGet()
+    {
+        $client = $this->getMockBuilder('Databox\Client')
+            ->setMethods(['get'])
+            ->getMock();
+
+        $json = '[]';
+        $response = new Response(200, [], $json);
+        $client->method('get')->willReturn($response);
+        $this->assertEquals($json, json_encode([]));
+    }
+
     public function testLastPush()
     {
-        $this->client->method('rawPush')->willReturn([
+        $this->client->method('rawGet')->willReturn([
             [], []
         ]);