[#50][#75] Re-add case and space insensitivity of titles

Author: Bjwebb

flattentool/schema.py

@@ -32,7 +32,22 @@ def lookup_header_list(self, title_header_list):
             else:
                 return self[first_title].property_name
         else:
-            return '/'.join(title_header_list)
+            # If we can't look up the title, treat it and any children as
+            # field names directly.
+            # Strip spaces off these.
+            return '/'.join(x.strip(' ') for x in title_header_list)
+
+    def __setitem__(self, key, value):
+        self.data[key.replace(' ', '').lower()] = value
+
+    def __getitem__(self, key):
+        if key is None:
+            raise KeyError
+        else:
+            return self.data[key.replace(' ', '').lower()]
+    
+    def __contains__(self, key):
+        return key.replace(' ', '').lower() in self.data
 
 
 class SchemaParser(object):
@@ -87,15 +102,16 @@ def parse_schema_dict(self, parent_name, schema_dict, parent_id_fields=None, tit
                 property_type_set = get_property_type_set(property_schema_dict)
 
                 title = property_schema_dict.get('title')
-                title_lookup[title] = TitleLookup()
-                title_lookup[title].property_name = property_name
+                if title:
+                    title_lookup[title] = TitleLookup()
+                    title_lookup[title].property_name = property_name
 
                 if 'object' in property_type_set:
                     for field, child_title in self.parse_schema_dict(
                             parent_name+'/'+property_name,
                             property_schema_dict,
                             parent_id_fields=id_fields,
-                            title_lookup=title_lookup[title]):
+                            title_lookup=title_lookup.get(title)):
                         yield (
                             property_name+'/'+field,
                             # TODO ambiguous use of "title"
@@ -112,7 +128,8 @@ def parse_schema_dict(self, parent_name, schema_dict, parent_id_fields=None, tit
                         else:
                             raise ValueError
                     elif 'object' in type_set:
-                        title_lookup[title].property_name = property_name+'[]'
+                        if title:
+                            title_lookup[title].property_name = property_name+'[]'
                         if hasattr(property_schema_dict['items'], '__reference__'):
                             sub_sheet_name = property_schema_dict['items'].__reference__['$ref'].split('/')[-1]
                         else:
@@ -129,7 +146,7 @@ def parse_schema_dict(self, parent_name, schema_dict, parent_id_fields=None, tit
                         fields = self.parse_schema_dict(parent_name+'/'+property_name+'[]',
                                 property_schema_dict['items'],
                                 parent_id_fields=id_fields,
-                                title_lookup=title_lookup[title])
+                                title_lookup=title_lookup.get(title))
 
                         rolledUp = set()
 

flattentool/tests/test_input_SpreadsheetInput_unflatten.py

@@ -245,6 +245,20 @@ def create_schema(root_id):
             'testB': {'testC': 3, 'Not in schema': 4}
         }]
     ),
+    # Should be space and case invariant
+    (
+        [{
+            'ROOT_ID_TITLE': 1,
+            'Identifier': 2,
+            'B  title : c  title': 3,
+            'btitle : Not in schema': 4,
+        }],
+        [{
+            'ROOT_ID': 1,
+            'id': 2,
+            'testB': {'testC': 3, 'Not in schema': 4}
+        }]
+    ),
     # Unicode
     (
         [{