[#90] Start rewriting template generation from the schema

The fields template is mostly there, but titles still needs more work.

Deliberately breaks a lot the tests.

Author: Bjwebb

flattentool/schema.py

@@ -93,7 +93,7 @@ def __init__(self, schema_filename=None, root_schema_dict=None, main_sheet_name=
             self.root_schema_dict = root_schema_dict
 
     def parse(self):
-        fields = self.parse_schema_dict(self.main_sheet_name, '', self.root_schema_dict)
+        fields = self.parse_schema_dict('', self.root_schema_dict)
         for field, title in fields:
             if self.use_titles:
                 if not title:
@@ -103,14 +103,14 @@ def parse(self):
             else:
                 self.main_sheet.append(field)
 
-    def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fields=None, title_lookup=None):
+    def parse_schema_dict(self, parent_path, schema_dict, parent_id_fields=None, title_lookup=None):
         if parent_path:
             parent_path = parent_path + '/'
         parent_id_fields = parent_id_fields or []
         title_lookup = self.title_lookup if title_lookup is None else title_lookup
         if 'properties' in schema_dict:
             if 'id' in schema_dict['properties']:
-                id_fields = parent_id_fields + [parent_name+'/id']
+                id_fields = parent_id_fields + [parent_path+'id']
             else:
                 id_fields = parent_id_fields
 
@@ -125,7 +125,6 @@ def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fie
                 if 'object' in property_type_set:
                     self.flattened[parent_path+property_name] = "object"
                     for field, child_title in self.parse_schema_dict(
-                            parent_name+'/'+property_name,
                             parent_path+property_name,
                             property_schema_dict,
                             parent_id_fields=id_fields,
@@ -150,22 +149,20 @@ def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fie
                             raise ValueError
                     elif 'object' in type_set:
                         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:
-                            sub_sheet_name = property_name
+                            title_lookup[title].property_name = property_name+'/0'
+
+                        sub_sheet_name = ('_'.join(x[:3] for x in parent_path.split('/')) + property_name)[:31]
 
-                        self.sub_sheet_mapping[parent_name+'/'+property_name] = sub_sheet_name
+                        #self.sub_sheet_mapping[parent_name+'/'+property_name] = sub_sheet_name
 
                         if sub_sheet_name not in self.sub_sheets:
                             self.sub_sheets[sub_sheet_name] = Sheet(root_id=self.root_id, name=sub_sheet_name)
                         sub_sheet = self.sub_sheets[sub_sheet_name]
                         sub_sheet.title_lookup = title_lookup.get(title)
 
                         for field in id_fields:
-                            sub_sheet.add_field(field+':'+property_name, id_field=True)
-                        fields = self.parse_schema_dict(parent_name+'/'+property_name+'[]',
+                            sub_sheet.add_field(field, id_field=True)
+                        fields = self.parse_schema_dict(
                                 parent_path+property_name,
                                 property_schema_dict['items'],
                                 parent_id_fields=id_fields,
@@ -180,10 +177,10 @@ def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fie
                                 else:
                                     sub_sheet.add_field(child_title)
                             else:
-                                sub_sheet.add_field(field)
+                                sub_sheet.add_field(parent_path+property_name+'/'+field)
                             if self.rollup and 'rollUp' in property_schema_dict and field in property_schema_dict['rollUp']:
                                 rolledUp.add(field)
-                                yield property_name+'[]/'+field, (title+':'+child_title if title and child_title else None)
+                                yield property_name+'/0/'+field, (title+':'+child_title if title and child_title else None)
 
                         # Check that all items in rollUp are in the schema
                         if self.rollup and 'rollUp' in property_schema_dict:
@@ -209,6 +206,6 @@ def parse_schema_dict(self, parent_name, parent_path, schema_dict, parent_id_fie
                          'so this property has been ignored.'.format(
                              repr(property_type_set),
                              property_name,
-                             parent_name))
+                             parent_path))
         else:
-            warn('Skipping field "{}", because it has no properties.'.format(parent_name))
+            warn('Skipping field "{}", because it has no properties.'.format(parent_path))