[#85] Add some more tests, fix header lookup.

Some tests to show json pointer numbering.
Fixes to title lookup with multiple arrays.

Author: kindly

flattentool/schema.py

@@ -30,8 +30,12 @@ def lookup_header(self, title_header):
     def lookup_header_list(self, title_header_list):
         first_title = title_header_list[0]
         remaining_titles = title_header_list[1:]
-        if isinstance(first_title, int):
-            return first_title + '/' + self[first_title].lookup_header_list(remaining_titles)
+        try:
+            int(first_title)
+            return first_title + '/' + self.lookup_header_list(remaining_titles)
+        except ValueError:
+            pass
+
         if first_title in self:
             if remaining_titles:
                 return self[first_title].property_name + '/' + self[first_title].lookup_header_list(remaining_titles)
@@ -51,7 +55,7 @@ def __getitem__(self, key):
             raise KeyError
         else:
             return self.data[key.replace(' ', '').lower()]
-    
+
     def __contains__(self, key):
         if key is None:
             return False
@@ -129,7 +133,7 @@ def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fie
                         yield (
                             property_name+'/'+field,
                             # TODO ambiguous use of "title"
-                            (title+':'+child_title if title and child_title else None) 
+                            (title+':'+child_title if title and child_title else None)
                         )
 
                 elif 'array' in property_type_set:

flattentool/tests/test_input_SpreadsheetInput_unflatten.py

@@ -138,6 +138,60 @@ def inject_root_id(root_id, d):
     )
 ]
 
+testdata_pointer = [
+    # Single item array without json numbering
+    (
+        [{
+            'ROOT_ID': '1',
+            'testR/id': '2',
+            'testR/testB': '3',
+            'testR/testX': '3',
+        }],
+        [{
+            'ROOT_ID': '1',
+            'testR': [{
+                'id': '2',
+                'testB': '3',
+                'testX': '3'
+            }]
+        }]
+    ),
+    # Multi item array one with varied numbering 
+    (
+        [{
+            'ROOT_ID': '1',
+            'testR/id': '-1',
+            'testR/testB': '-1',
+            'testR/testX': '-2',
+            'testR/0/id': '0',
+            'testR/0/testB': '1',
+            'testR/0/testX': '1',
+            'testR/5/id': '5',
+            'testR/5/testB': '5',
+            'testR/5/testX': '6',
+        }],
+        [{
+            'ROOT_ID': '1',
+            'testR': [{
+                'id': '-1',
+                'testB': '-1',
+                'testX': '-2'
+            },
+            {
+                'id': '0',
+                'testB': '1',
+                'testX': '1'
+            },
+            {
+                'id': '5',
+                'testB': '5',
+                'testX': '6'
+            }
+            ]
+        }]
+    ),
+]
+
 def create_schema(root_id):
     schema = {
         'properties': {
@@ -336,6 +390,36 @@ def create_schema(root_id):
             }]
         }]
     ),
+    # Multi item array, allow numbering
+    (
+        [{
+            'ROOT_ID_TITLE': 1,
+            'Identifier': 2,
+            'R title:C title': 3,
+            'R title:Not in schema': 4,
+            'R title:0:C title': 5,
+            'R title:0:Not in schema': 6,
+            'R title:5:C title': 7,
+            'R title:5:Not in schema': 8,
+        }],
+        [{
+            'ROOT_ID': 1,
+            'id': 2,
+            'testR': [{
+                'testC': '3',
+                'Not in schema': 4
+            },
+            {
+                'testC': '5',
+                'Not in schema': 6
+            },
+            {
+                'testC': '7',
+                'Not in schema': 8
+            }
+            ]
+        }]
+    ),
     # Empty
     (
         [{
@@ -414,6 +498,13 @@ def test_unflatten(convert_titles, use_schema, root_id, root_id_kwargs, input_li
         assert recwarn.list == []
 
 
+@pytest.mark.parametrize('convert_titles', [True, False])
+@pytest.mark.parametrize('root_id,root_id_kwargs', ROOT_ID_PARAMS)
+@pytest.mark.parametrize('input_list,expected_output_list', testdata_pointer)
+def test_unflatten_pointer(convert_titles, root_id, root_id_kwargs, input_list, expected_output_list, recwarn):
+    return test_unflatten(convert_titles=convert_titles, use_schema=True, root_id=root_id, root_id_kwargs=root_id_kwargs, input_list=input_list, expected_output_list=expected_output_list, recwarn=recwarn)
+
+
 @pytest.mark.parametrize('input_list,expected_output_list', testdata_titles)
 @pytest.mark.parametrize('root_id,root_id_kwargs', ROOT_ID_PARAMS)
 def test_unflatten_titles(root_id, root_id_kwargs, input_list, expected_output_list, recwarn):