Merge pull request #5 from jaimelopez/FEATURE-allows-minus-character-…

…within-property-name [FEATURE] Allows minus character within property name
Galbar · Aug 7, 2017 · 9a4d3aa · 9a4d3aa
2 parents dbb9140 + da6a19b
commit 9a4d3aa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ JsonPath Language
 =================
 This library implements the following specification:
 ```
-var_name    = [a-zA-Z\_\$][\w\$]*
+var_name    = [a-zA-Z\_\$][\w\-\$]*
 number      = ([0-9]+(\.[0-9]*) | ([0-9]*\.[0-9]+))
 string      = ('\''.*?'\'' | '"'.*?'"')
 boolean     = ('true' | 'false')

diff --git a/src/Skyscanner/JsonPath/JsonObject.php b/src/Skyscanner/JsonPath/JsonObject.php
@@ -109,16 +109,16 @@ class JsonObject
     const RE_ROOT_OBJECT = '/^\$(.*)/';
 
     // Child regex
-    const RE_CHILD_NAME = '/^\.([a-zA-Z\_\$][\w\$]*|\*)(.*)/';
-    const RE_RECURSIVE_SELECTOR = '/^\.\.([a-zA-Z\_\$][\w\$]*|\*)(.*)/';
+    const RE_CHILD_NAME = '/^\.([a-zA-Z\_\$][\w\-\$]*|\*)(.*)/';
+    const RE_RECURSIVE_SELECTOR = '/^\.\.([a-zA-Z\_\$][\w\-\$]*|\*)(.*)/';
 
     // Array expressions
     const RE_ARRAY_INTERVAL = '/^(?:(-?\d*:-?\d*)|(-?\d*:-?\d*:-?\d*))$/';
     const RE_INDEX_LIST = '/^(-?\d+)(\s*,\s*-?\d+)*$/';
     const RE_LENGTH = '/^(.*)\.length$/';
 
     // Object expression
-    const RE_CHILD_NAME_LIST = '/^(:?([a-zA-Z\_\$][\w\$]*?|".*?"|\'.*?\')(\s*,\s*([a-zA-Z\_\$][\w\$]*|".*?"|\'.*?\'))*)$/';
+    const RE_CHILD_NAME_LIST = '/^(:?([a-zA-Z\_\$][\w\-\$]*?|".*?"|\'.*?\')(\s*,\s*([a-zA-Z\_\$][\w\-\$]*|".*?"|\'.*?\'))*)$/';
 
     // Conditional expressions
     const RE_COMPARISON = '/^(.+)\s*(==|!=|<=|>=|<|>|=\~)\s*(.+)$/';

diff --git a/tests/Skyscanner/JsonPath/JsonObjectTest.php b/tests/Skyscanner/JsonPath/JsonObjectTest.php
@@ -61,7 +61,8 @@ class JsonPathTest extends \PHPUnit_Framework_TestCase
       "color": "red",
       "price": 19.95,
       "available": true,
-      "model": null
+      "model": null,
+      "sku-number": "BCCLE-0001-RD"
     }
   },
   "authors": [
@@ -139,13 +140,18 @@ public function testGetProvider()
                 array(19.95),
                 "$.store.bicycle.price"
             ),
+            array(
+                array("BCCLE-0001-RD"),
+                "$.store.bicycle.sku-number"
+            ),
             array(
                 array(
                     array(
                         "color" => "red",
                         "price" => 19.95,
                         "available" => true,
-                        "model" => null
+                        "model" => null,
+                        "sku-number" => "BCCLE-0001-RD"
                     )
                 ),
                 "$.store.bicycle"
@@ -220,7 +226,8 @@ public function testGetProvider()
                     "red",
                     19.95,
                     true,
-                    null
+                    null,
+                    "BCCLE-0001-RD"
                 ),
                 "$.store.bicycle.*"
             ),
@@ -288,13 +295,13 @@ public function testGetProvider()
                 array(
                     "red"
                 ),
-                "$..*[?(@.length <= 4)].color"
+                "$..*[?(@.length <= 5)].color"
             ),
             array(
                 array(
                     "red"
                 ),
-                "$..*[?(@.length <= 4.0)].color"
+                "$..*[?(@.length <= 5.0)].color"
             ),
             array(
                 array(
@@ -360,7 +367,8 @@ public function testGetProvider()
                         "color" => "red",
                         "price" => 19.95,
                         "available" => true,
-                        "model" => null
+                        "model" => null,
+                        "sku-number" => "BCCLE-0001-RD"
                     )
                 ),
                 "$.store[?(@.*.length == 3)]",
@@ -417,7 +425,8 @@ public function testSmartGetProvider()
                     "color" => "red",
                     "price" => 19.95,
                     "available" => true,
-                    "model" => null
+                    "model" => null,
+                    "sku-number" => "BCCLE-0001-RD"
                 ),
                 "$.store.bicycle"
             ),
@@ -491,7 +500,8 @@ public function testSmartGetProvider()
                     "red",
                     19.95,
                     true,
-                    null
+                    null,
+                    "BCCLE-0001-RD"
                 ),
                 "$.store.bicycle.*"
             ),
@@ -559,13 +569,13 @@ public function testSmartGetProvider()
                 array(
                     "red"
                 ),
-                "$..*[?(@.length <= 4)].color"
+                "$..*[?(@.length <= 5)].color"
             ),
             array(
                 array(
                     "red"
                 ),
-                "$..*[?(@.length <= 4.0)].color"
+                "$..*[?(@.length <= 5.0)].color"
             ),
             array(
                 array(
@@ -631,7 +641,8 @@ public function testSmartGetProvider()
                         "color" => "red",
                         "price" => 19.95,
                         "available" => true,
-                        "model" => null
+                        "model" => null,
+                        "sku-number" => "BCCLE-0001-RD"
                     )
                 ),
                 "$.store[?(@.*.length == 3)]",
@@ -746,7 +757,8 @@ public function testAdd($smartGet)
                 'price' => 19.95,
                 'type' => 'BMX',
                 'available' => true,
-                'model' => null
+                'model' => null,
+                "sku-number" => "BCCLE-0001-RD"
             )
         );
         $expected = $smartGet ? $expected[0] : $expected;
@@ -794,7 +806,8 @@ public function testRemove($smartGet)
     ],
     "bicycle": {
       "color": "red",
-      "model": null
+      "model": null,
+      "sku-number": "BCCLE-0001-RD"
     }
   },
   "authors": [