Merge pull request #9 from jfardello/master

* Allows the hyphen to be part of the field.

2 files changed, 12 insertions, 1 deletions

diff --git a/jsonpath_rw/lexer.py b/jsonpath_rw/lexer.py
index 9a70934..bfa570a 100644
--- a/jsonpath_rw/lexer.py
+++ b/jsonpath_rw/lexer.py
@@ -57,7 +57,7 @@ class JsonPathLexer(object):
     t_ignore = ' \t'
 
     def t_ID(self, t):
-        r'[a-zA-Z_@][a-zA-Z0-9_@]*'
+        r'[a-zA-Z_@][a-zA-Z0-9_@\-]*'
         t.type = self.reserved_words.get(t.value, 'ID')
         return t
 
diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py
index 0c496cc..bf3d5c6 100644
--- a/tests/test_jsonpath.py
+++ b/tests/test_jsonpath.py
@@ -5,6 +5,7 @@ from jsonpath_rw import jsonpath # For setting the global auto_id_field flag
 
 from jsonpath_rw.parser import parse
 from jsonpath_rw.jsonpath import *
+from jsonpath_rw.lexer import JsonPathLexerError
 
 class TestDatumInContext(unittest.TestCase):
     """
@@ -161,6 +162,16 @@ class TestJsonPath(unittest.TestCase):
         self.check_cases([('foo.baz.`parent`', {'foo': {'baz': 3}}, [{'baz': 3}]),
                           ('foo.`parent`.foo.baz.`parent`.baz.bizzle', {'foo': {'baz': {'bizzle': 5}}}, [5])])
 
+    def test_hyphen_key(self):
+        self.check_cases([('foo.bar-baz', {'foo': {'bar-baz': 3}}, [3]),
+            ('foo.[bar-baz,blah-blah]', {'foo': {'bar-baz': 3, 'blah-blah':5}},
+                [3,5])])
+        self.assertRaises(JsonPathLexerError, self.check_cases,
+                [('foo.-baz', {'foo': {'-baz': 8}}, [8])])
+
+
+
+
     #
     # Check that the paths for the data are correct.
     # FIXME: merge these tests with the above, since the inputs are the same anyhow