Merge pull request #1 from estahn/add_exception_mapping

Map "parser error" to exception "DataTypeMapperException"

src/JsonQueryWrapper/DataTypeMapper.php

@@ -28,6 +28,7 @@
  */
 
 namespace JsonQueryWrapper;
+use JsonQueryWrapper\Exception\DataTypeMapperException;
 
 /**
  * Map data returned from jq to PHP data types
@@ -41,6 +42,7 @@ class DataTypeMapper
      *
      * @param string $value
      * @return mixed
+     * @throws DataTypeMapperException
      */
     public function map($value)
     {
@@ -62,6 +64,11 @@ public function map($value)
             return $matches[1];
         }
 
+        // Map parser error
+        if (preg_match('/^parse error: (.*)$/', $value, $matches)) {
+            throw new DataTypeMapperException($matches[1]);
+        }
+
         return $value;
     }
 }

src/JsonQueryWrapper/Exception/DataTypeMapperException.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * JSON Query Wrapper
+ *
+ * (The MIT license)
+ * Copyright (c) 2016 Enrico Stahn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated * documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * @package JsonQueryWrapper
+ * @link    http://github.com/estahn/json-query-wrapper for the canonical source repository
+ */
+
+namespace JsonQueryWrapper\Exception;
+
+class DataTypeMapperException extends \Exception
+{
+}

src/JsonQueryWrapper/JsonQueryFactory.php

@@ -40,7 +40,7 @@ class JsonQueryFactory
      *
      * @return JsonQuery
      */
-    static public function create()
+    public static function create()
     {
         return new JsonQuery(new ProcessBuilder(), new DataTypeMapper());
     }
@@ -51,7 +51,7 @@ static public function create()
      * @param string $filenameOrText A path to a json file or json text
      * @return JsonQuery
      */
-    static public function createWith($filenameOrText)
+    public static function createWith($filenameOrText)
     {
         $provider = file_exists($filenameOrText) ? new File($filenameOrText) : new Text($filenameOrText);
 

tests/JsonQueryWrapper/DataTypeMapperTest.php

@@ -68,6 +68,14 @@ public function testInteger()
         $this->assertEquals(33, $value);
     }
 
+    /**
+     * @expectedException \JsonQueryWrapper\Exception\DataTypeMapperException
+     */
+    public function testParserError()
+    {
+        $this->mapper->map('parse error: Expected another key-value pair at line 7, column 1');
+    }
+
     public function testJson()
     {
         $this->markTestIncomplete('Need to decide whether to convert JSON data');