Merge pull request #3 from productsupcom/CPU-899

WIP CPU-899 - JSON Testing

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 test/
-examples/customers/*
+composer.lock
+examples/customers/*

lib/Productsup/Service/ProductData.php

@@ -124,6 +124,11 @@ public function setImportType($type) {
      */
     public function commit() {
         $this->checkSubmit(1); // send all unsent products
+
+        if(!$this->didSubmit) {
+            throw new Exceptions\ClientException('no data submitted yet');
+        }
+
         $request = $this->getRequest();
         $request->method = Request::METHOD_POST;
         $request->postBody = array(
@@ -227,12 +232,51 @@ private function _submit() {
         $request->method = Request::METHOD_POST;
         $request->url .= '/upload';
         $request->postBody = $this->_productData;
-        $response = $this->getIoHandler()->executeRequest($request);
+
+        try {
+            $response = $this->getIoHandler()->executeRequest($request);
+        } catch (\Exception $e) {
+            $found = $this->testJson($this->_productData);
+
+            if ($found > 0) {
+                $this->_submitLog[] = sprintf(
+                    '%s: %u products with malformed json. removing affected products and retrying batch: %s',
+                    date('Y-m-d H:i:s'),
+                    $found,
+                    $this->_batchId
+                );
+
+                $this->_submit();
+            } else {
+                throw $e;
+            }
+        }
         $this->_productData = array();
         $this->logResponse($response);
         return $response->getData();
     }
 
+    private function testJson(array &$a)
+    {
+        $found = 0;
+
+        foreach ($a as $key => $row) {
+            $j = json_encode($row);
+            if (json_last_error()) {
+                unset($a[$key]);
+                $found++;
+                continue;
+            }
+            json_decode($j);
+            if (json_last_error()) {
+                unset($a[$key]);
+                $found++;
+            }
+        }
+
+        return $found;
+    }
+
     /**
      * convert api response to a log message
      * @param Response $response