[#75] Case and space insensitivity

All titles made space and case insensitive.

Only main sheet names made case insensitive as sheet names have
relevence when unflattening as to how objects are nested.

Author: kindly

flattentool/input.py

@@ -27,8 +27,9 @@
 class SpreadsheetInput(object):
     def convert_dict_titles(self, dicts, titles):
         titles = titles or {}
+        titles_map = {title.replace(' ', '').lower(): title for title in titles}
         for d in dicts:
-            yield { (titles[k] if k in titles else (k if '/' in k else k.replace(':','/'))):v for k,v in d.items() }
+            yield { (titles[titles_map[k.replace(' ', '').lower()]] if k.replace(' ', '').lower() in titles_map else (k if '/' in k else k.replace(':','/'))):v for k,v in d.items() }
 
     def __init__(self, input_name='', main_sheet_name='', timezone_name='UTC', root_id='ocid', convert_titles=False):
         self.input_name = input_name
@@ -214,14 +215,22 @@ def get_sheet_lines(self, sheet_name):
 class XLSXInput(SpreadsheetInput):
     def read_sheets(self):
         self.workbook = openpyxl.load_workbook(self.input_name, data_only=True)
-        sheet_names = self.workbook.get_sheet_names()
+
+        self.sheet_names_map = {sheet_name: sheet_name for sheet_name in self.workbook.get_sheet_names()}
+        # allow main sheet to be any case
+        for sheet_name in list(self.sheet_names_map):
+            if sheet_name.lower() == self.main_sheet_name.lower():
+                self.sheet_names_map.pop(sheet_name)
+                self.sheet_names_map[self.main_sheet_name] = sheet_name
+
+        sheet_names = list(self.sheet_names_map.keys())
         if self.main_sheet_name not in sheet_names:
             raise ValueError('Main sheet "{}" not found in workbook.'.format(self.main_sheet_name))
         sheet_names.remove(self.main_sheet_name)
         self.sub_sheet_names = sheet_names
 
     def get_sheet_lines(self, sheet_name):
-        worksheet = self.workbook[sheet_name]
+        worksheet = self.workbook[self.sheet_names_map[sheet_name]]
         header_row = worksheet.rows[0]
         remaining_rows = worksheet.rows[1:]
         coli_to_header = ({i: x.value for i, x in enumerate(header_row) if x.value is not None})

flattentool/tests/fixtures/WellcomeTrust-grants_fixed_2_grants.json

@@ -18,7 +18,7 @@
                 }
             ], 
             "dateModified": "13-03-2015", 
-            "Data source": "http://www.wellcome.ac.uk/Managing-a-grant/Grants-awarded/index.htm", 
+            "dataSource": "http://www.wellcome.ac.uk/Managing-a-grant/Grants-awarded/index.htm", 
             "plannedDates": [
                 {
                     "duration": 30
@@ -62,7 +62,7 @@
                 }
             ], 
             "dateModified": "13-03-2015", 
-            "Data source": "http://www.wellcome.ac.uk/Managing-a-grant/Grants-awarded/index.htm", 
+            "dataSource": "http://www.wellcome.ac.uk/Managing-a-grant/Grants-awarded/index.htm", 
             "plannedDates": [
                 {
                     "duration": 25

flattentool/tests/fixtures/xlsx/WellcomeTrust-grants_2_Grants.xlsx

@@ -0,0 +1,57 @@
+import json
+
+from flattentool import unflatten
+
+def test_360_main_sheetname_insensitive(tmpdir):
+    input_name = 'flattentool/tests/fixtures/xlsx/WellcomeTrust-grants_2_grants.xlsx'
+    unflatten(
+        input_name=input_name,
+        output_name=tmpdir.join('output_grant.json').strpath,
+        input_format='xlsx',
+        schema='flattentool/tests/fixtures/360-giving-schema.json',
+        main_sheet_name='grants',
+        root_list_path='grants',
+        root_id='',
+        convert_titles=True)
+    output_json_grants = json.load(tmpdir.join('output_grant.json'))
+
+    input_name = 'flattentool/tests/fixtures/xlsx/WellcomeTrust-grants_2_Grants.xlsx'
+    unflatten(
+        input_name=input_name,
+        output_name=tmpdir.join('output_Grant.json').strpath,
+        input_format='xlsx',
+        schema='flattentool/tests/fixtures/360-giving-schema.json',
+        main_sheet_name='grants',
+        root_list_path='grants',
+        root_id='',
+        convert_titles=True)
+    output_json_Grants = json.load(tmpdir.join('output_Grant.json'))
+
+    assert output_json_grants == output_json_Grants
+
+def test_360_fields_case_insensitive(tmpdir):
+    input_name = 'flattentool/tests/fixtures/xlsx/WellcomeTrust-grants_2_grants.xlsx'
+    unflatten(
+        input_name=input_name,
+        output_name=tmpdir.join('output_grant.json').strpath,
+        input_format='xlsx',
+        schema='flattentool/tests/fixtures/360-giving-schema.json',
+        main_sheet_name='grants',
+        root_list_path='grants',
+        root_id='',
+        convert_titles=True)
+    output_json_grants = json.load(tmpdir.join('output_grant.json'))
+
+    input_name = 'flattentool/tests/fixtures/xlsx/WellcomeTrust-grants_2_grants_title_space_case.xlsx'
+    unflatten(
+        input_name=input_name,
+        output_name=tmpdir.join('output_space_case.json').strpath,
+        input_format='xlsx',
+        schema='flattentool/tests/fixtures/360-giving-schema.json',
+        main_sheet_name='grants',
+        root_list_path='grants',
+        root_id='',
+        convert_titles=True)
+    output_json_space_case = json.load(tmpdir.join('output_space_case.json'))
+
+    assert output_json_grants == output_json_space_case