Tests and conformance for object.

Author: eggpi

jsonfsm.py

@@ -265,11 +265,11 @@ def object_fsm():
     if c != '{':
         raise JSONParseError("Objects must begin with {")
 
-    while c != '}':
+    c = (yield NOT_PARSED_YET)
+    while c.isspace():
         c = (yield NOT_PARSED_YET)
-        while c.isspace():
-            c = (yield NOT_PARSED_YET)
 
+    while c != '}':
         # parse attribute key
         key = NOT_PARSED_YET
         sp = string_fsm()
@@ -288,6 +288,7 @@ def object_fsm():
             c = (yield NOT_PARSED_YET)
 
         # parse value
+        value = NOT_PARSED_YET
         vp = value_fsm()
 
         # look out for , and } since they act as delimiters for numbers
@@ -298,6 +299,16 @@ def object_fsm():
                 while c.isspace():
                     c = (yield NOT_PARSED_YET)
 
+        # if we stopped at a , advance until the start of the next key/value
+        # pair (and raise exception if the object ends)
+        if c == ',':
+            c = (yield NOT_PARSED_YET)
+            while c.isspace():
+                c = (yield NOT_PARSED_YET)
+
+            if c == '}':
+                raise JSONParseError("Extra , before } in object")
+
         obj[key] = value
 
     yield obj

test.py

@@ -105,5 +105,32 @@ def test_invalid_arrays(self):
                               jsonfsm.loads,
                               json)
 
+class TestObject(unittest.TestCase):
+    def setUp(self):
+        self.valid = (
+            ('{}', {}),
+            ('{"one": 1}', {u"one": 1.0}),
+            ('{ "one" :1, "two": 2}', {u"one":1.0, u"two":2.0}),
+            ('{"delimiter": "}" }', {u"delimiter": u"}"}),
+            ('{"nested": {"object": "here"}}', {u"nested": {u"object": u"here"}}),
+        )
+
+        self.invalid = (
+            "{,}",
+            '{"key":}',
+            '{:"value"}',
+            '{"extra" : "comma",}',
+        )
+
+    def test_valid_objects(self):
+        for json, expected in self.valid:
+            self.assertEquals(jsonfsm.loads(json), expected)
+
+    def test_invalid_objects(self):
+        for json in self.invalid:
+            self.assertRaises(jsonfsm.JSONParseError,
+                              jsonfsm.loads,
+                              json)
+
 if __name__ == "__main__":
     unittest.main()