Merge pull request #502 from onyxfish/366

Fix #366

AUTHORS

@@ -61,3 +61,4 @@ The following individuals have contributed code to csvkit:
 * Eric Bréchemier
 * Neil Freeman
 * Fede Isas
+* Patricia Lipp

csvkit/convert/js.py

@@ -10,6 +10,7 @@
 import agate
 import six
 
+
 def parse_object(obj, path=''):
     """
     Recursively parse JSON objects and a dictionary of paths/keys and values.
@@ -21,16 +22,17 @@ def parse_object(obj, path=''):
     elif isinstance(obj, (list, tuple)):
         iterator = enumerate(obj)
     else:
-        return { path.strip('/'): obj }
+        return {path.strip('/'): obj}
 
-    d = {}
+    d = OrderedDict()
 
     for key, value in iterator:
         key = six.text_type(key)
         d.update(parse_object(value, path + key + '/'))
 
     return d
 
+
 def json2csv(f, key=None, **kwargs):
     """
     Convert a JSON document into CSV format.
@@ -49,9 +51,10 @@ def json2csv(f, key=None, **kwargs):
     flat = []
 
     for obj in js:
-        flat.append(parse_object(obj))
+        parsed_object = parse_object(obj)
+        flat.append(parsed_object)
 
-        for key in obj.keys():
+        for key in parsed_object.keys():
             if key not in fields:
                 fields.append(key)
 

examples/testjson_nested.json

@@ -0,0 +1,28 @@
+[
+    {
+        "text": "Chicago Reader", 
+        "float": 1.0, 
+        "datetime": "1971-01-01T04:14:00", 
+        "boolean": true,
+        "nested": {
+          "time": "04:14:00",
+          "nested": {
+            "date": "1971-01-01",
+            "integer": 40
+          }
+        }
+    }, 
+    {
+        "text": "Chicago Sun-Times", 
+        "float": 1.27, 
+        "datetime": "1948-01-01T14:57:13", 
+        "boolean": true,
+        "nested": {
+          "time": "14:57:13",
+          "nested": {
+            "date": "1948-01-01",
+            "integer": 63
+          }
+        }
+    }
+]

examples/testjson_nested_converted.csv

@@ -0,0 +1,3 @@
+text,float,datetime,boolean,nested/time,nested/nested/date,nested/nested/integer
+Chicago Reader,1.0,1971-01-01T04:14:00,True,04:14:00,1971-01-01,40
+Chicago Sun-Times,1.27,1948-01-01T14:57:13,True,14:57:13,1948-01-01,63

tests/test_utilities/test_in2csv.py

@@ -70,3 +70,13 @@ def test_convert_ndjson(self):
 
         target_output = open('examples/testjson_multiline_converted.csv', 'r').read()
         self.assertEqual(output_file.getvalue(), target_output)
+
+    def test_convert_nested_json(self):
+        args = ['examples/testjson_nested.json']
+        output_file = six.StringIO()
+
+        utility = In2CSV(args, output_file)
+        utility.main()
+
+        target_output = open('examples/testjson_nested_converted.csv', 'r').read()
+        self.assertEqual(output_file.getvalue(), target_output)