Merge pull request #5 from tanelt/master

Readme update and data parsing fix

Author: actualreports

README.md

@@ -1,2 +1,32 @@
-# pdfgeneratorapi-php
-PHP API wrapper for pdfgeneratorapi.com
+# REST API wrapper for pdfgeneratorapi.com
+REST API wrapper for [PDF Generator API](https://pdfgeneratorapi.com).
+
+### Install
+Require this package with composer using the following command:
+```bash
+composer require actualreports/pdfgeneratorapi-php
+```
+
+### Usage
+```php
+$client = new \ActualReports\PDFGeneratorAPI\Client($token, $secret);
+$client->setWorkspace('[email protected]');
+```
+
+```php
+$data = [
+    "DocNumber" => "12312", 
+    "TotalAmt" => 1231.12
+];
+$content = $client->output(21650, $data);
+```
+
+```php
+header('Content-type: '.$content->meta->{'content-type'});
+header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+header('Pragma: public');
+header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+header('Content-Disposition: inline; filename="'.$content->meta->name.'"');
+die(base64_decode($content->response));
+```

src/Client.php

@@ -87,27 +87,25 @@ public function setBaseUrl($url)
     }
 
     /**
-     * @param array|string $data
+     * Turns data into string,
      *
-     * @return array|mixed
+     * @param array|string|\stdClass $data
+     *
+     * @return string
      */
     protected static function data($data)
     {
-        if (is_string($data))
+        if (!is_string($data))
         {
             try
             {
-                $data = \GuzzleHttp\json_decode($data);
+                $data = \GuzzleHttp\json_encode($data);
             }
             catch (\InvalidArgumentException $e)
             {
 
             }
         }
-        else
-        {
-            $data = (array) $data;
-        }
 
         return $data;
     }
@@ -192,16 +190,17 @@ public function request($method = self::REQUEST_POST, $resource, array $params =
             ])
         ];
 
-        $params['data'] = isset($params['data']) ? self::data($params['data']) : null;
+        if ($params['data'])
+        {
+            $params['data'] = self::data($params['data']);
+        }
 
-        if ($method === self::REQUEST_POST)
+        if ($method === self::REQUEST_POST && $params['data'])
         {
-            if ($params['data'] && is_array($params['data']))
-            {
-                $options['body'] = \GuzzleHttp\json_encode($params['data']);
-                unset($params['data']);
-            }
+            $options['body'] = $params['data'];
+            unset($params['data']);
         }
+
         $options['query'] = $params;
         return $this->handleRequest($method, $resource, $options);
     }
@@ -399,8 +398,7 @@ public function editor($template, $data = null, array $params = [])
 
         if ($data)
         {
-            $data = self::data($data);
-            $params['data'] = is_array($data) ? \GuzzleHttp\json_encode($data) : $data;
+            $params['data'] = self::data($data);
         }
 
         return $this->baseUrl.$resource.'?'.http_build_query($params);

tests/Client.php

@@ -59,6 +59,12 @@ public function testOutputDataUrl()
         $this->assertEquals('application/pdf', $result->meta->{'content-type'});
     }
 
+    public function testOutputDataString()
+    {
+        $result = $this->client->output($this->templateId, \GuzzleHttp\json_encode(['DocNumber' => 1123123123]));
+        $this->assertEquals('application/pdf', $result->meta->{'content-type'});
+    }
+
     public function testEditorDataUrl()
     {
         $url = $this->client->editor($this->templateId, $this->host.'/assets/web/data/qbo_invoice.json');