Merge lp:~mhall119/developer-ubuntu-com/add-autopilot-scopes-docs into lp:developer-ubuntu-com

[Michael Hall]

Add the new python3-scope-harness Autopilot API docs to be auto-imported.

[Daniel Holbach (dholbach)]

Works for me and the code looks cleaner now.

review: Approve

=== modified file 'api_docs/importers/autopilot_sections.py'
--- api_docs/importers/autopilot_sections.py	2015-04-09 20:43:39 +0000
+++ api_docs/importers/autopilot_sections.py	2015-06-24 14:45:52 +0000
@@ -14,6 +14,9 @@
     'autopilot.gestures': 'Input and Display',
     'autopilot.input': 'Input and Display',
 
+    'scope_harness': 'Scopes',
+    'scope_harness.testing': 'Scopes',
+
     'tutorial/': 'Tutorials',
     'guides/': 'Guides',
     'faq/': 'Frequently Asked Questions',

=== modified file 'api_docs/importers/sphinx.py'
--- api_docs/importers/sphinx.py	2015-04-16 14:16:26 +0000
+++ api_docs/importers/sphinx.py	2015-06-24 14:45:52 +0000
@@ -28,6 +28,7 @@
         self.sections_file = self.options.get('sections')
         self.pages_sections = dict()
         self.page_data_map = dict()
+        self.module_order = []
 
     def parse_line(self, line, source_file, element_fullname):
         line = line.replace(u'\u00b6', u'')
@@ -213,7 +214,7 @@
         
         self.PRIMARY_NAMESPACE = None
 
-        namespace_order_index = 0
+        module_order_index = 0
             
         DOC_MODULE = '0'
         DOC_API_PART = '1'
@@ -242,7 +243,7 @@
                 if page_path.endswith('/'):
                     page_path = page_path[:-1]
                 ns_name = fullname
-                self.namespace_order.append(fullname)
+                self.module_order.append(fullname)
                 self.namespace_map[fullname] = page_path
             elif doc_enum == DOC_API_PART:
                 ns_name = '.'.join(fullname.split('.')[:2])
@@ -281,40 +282,43 @@
                 
             continue
             
-        for ns_name in self.namespace_order:
-            cleaned_ns_name = self.parse_namespace(ns_name)
-
-            section, created = Section.objects.get_or_create(name=self.get_section(ns_name, None), topic_version=self.version)
-            if created:
-                print "Created section: %s" % section.name
-
-            if self.verbosity >= 1:
-                print 'Namespace: ' + ns_name
-                print 'Section: ' + section.name
-
-                
-            doc_file = os.path.join(self.DOC_ROOT, self.namespace_map[ns_name]+'.fjson')
-            ns_data = self.read_json_file(doc_file)
-            classes, extra = self.extract_classes(ns_data['body'])
-
-            if cleaned_ns_name is not None and cleaned_ns_name != '':
-                namespace, created = Namespace.objects.get_or_create(name=ns_name, display_name=cleaned_ns_name, platform_section=section)
-                if created:
-                    print "Created Namespace: %s" % ns_name
-                namespace.data = self.clean_content(extra, doc_file, ns_name)
-                namespace.source_file = os.path.basename(doc_file)
-                namespace.source_format = "sphinx"
-                namespace.save()
-            else:
-                namespace = None
+        for module in self.module_order:
+
+            doc_file = os.path.join(self.DOC_ROOT, self.namespace_map[module]+'.fjson')
+            module_data = self.read_json_file(doc_file)
+            classes, extra = self.extract_classes(module_data['body'])
 
             if len(classes) > 0:
                             
                 for fullname, doc_data in classes:
-                    if fullname.startswith(ns_name):
-                        classname = fullname[len(ns_name)+1:]
+                    if '.' in fullname:
+                        ns_name = fullname[:fullname.rindex('.')]
+                        classname = fullname[fullname.rindex('.')+1:]
                     else:
                         classname = fullname
+                        ns_name = None
+
+                    cleaned_ns_name = self.parse_namespace(ns_name)
+
+                    section, created = Section.objects.get_or_create(name=self.get_section(ns_name, None), topic_version=self.version)
+                    if created:
+                        print "Created section: %s" % section.name
+
+                    if self.verbosity >= 1:
+                        print 'Namespace: ' + ns_name
+                        print 'Section: ' + section.name
+
+                    if cleaned_ns_name is not None and cleaned_ns_name != '':
+                        namespace, created = Namespace.objects.get_or_create(name=ns_name, display_name=cleaned_ns_name, platform_section=section)
+                        if created:
+                            print "Created Namespace: %s" % ns_name
+                        namespace.data = self.clean_content(extra, doc_file, ns_name)
+                        namespace.source_file = os.path.basename(doc_file)
+                        namespace.source_format = "sphinx"
+                        namespace.save()
+                    else:
+                        namespace = None
+                        
 
                     if self.verbosity >= 1:
                         print 'Element: ' + fullname
@@ -346,7 +350,7 @@
         if not self.options.get('no_pages', False):
             page_order_index = 0
             
-            #self.page_order.extend(self.namespace_order)
+            #self.page_order.extend(self.module_order)
                 
             for pagefile in self.pages_sections:
                 ns_name, pagename, pagefullname, pagetitle = self.page_data_map[pagefile]

=== modified file 'update_apidocs.sh'
--- update_apidocs.sh	2015-05-12 19:40:04 +0000
+++ update_apidocs.sh	2015-06-24 14:45:52 +0000
@@ -90,6 +90,10 @@
 find /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/ -name "*.gz" -print0 |xargs -0 gunzip
 python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/ubuntu-ui-toolkit-autopilot/json/objects.inv
 
+SERIES=wily ARCH=i386 ./get_package.sh python3-scope-harness
+find /tmp/apidoc_sources/usr/share/doc/python3-scope-harness/json/ -name "*.gz" -print0 |xargs -0 gunzip
+python manage.py import_sphinx -t autopilot -l python -r 1.5.0 -s ./api_docs/importers/autopilot_sections.py -i /tmp/apidoc_sources/usr/share/doc/python3-scope-harness/json/objects.inv
+
 #### Scopes/C++ 
 ## unity.scopes
 ./get_package.sh libunity-scopes-doc