Merge lp:~dholbach/developer-ubuntu-com/1565639 into lp:developer-ubuntu-com

[Daniel Holbach]

Test case http://paste.ubuntu.com/15613355/

Just create a root page and a child of it called snappy.

=== modified file 'md_importer/importer/publish.py'
--- md_importer/importer/publish.py	2016-03-08 13:07:19 +0000
+++ md_importer/importer/publish.py	2016-04-04 14:07:41 +0000
@@ -1,11 +1,12 @@
 from md_importer.importer import (
     DEFAULT_LANG,
     DEFAULT_TEMPLATE,
-    HOME_PAGE_URL,
 )
+from md_importer.importer.tools import remove_leading_and_trailing_slash
 
 from cms.api import create_page, add_plugin
-from cms.models import Title
+from cms.models import Page, Title
+from cms.utils.page_resolver import get_page_from_path
 from djangocms_text_ckeditor.html import clean_html
 
 from bs4 import BeautifulSoup
@@ -25,22 +26,21 @@
 
 
 def _find_parent(full_url):
-    if full_url == HOME_PAGE_URL:
-        # If we set up the homepage, we don't need a parent.
-        return None
-    parent_url = re.sub(
-        r'^\/{}\/'.format(DEFAULT_LANG),
+    parent_url = remove_leading_and_trailing_slash(re.sub(
+        r'^\/None|{}\/'.format(DEFAULT_LANG),
         '',
-        os.path.dirname(full_url))
-
-    parent_pages = Title.objects.select_related('page').filter(
-        path__regex=parent_url, language=DEFAULT_LANG).filter(
-        publisher_is_draft=True)
-    if not parent_pages:
-        logging.error('Parent {} not found.'.format(
-            parent_url))
+        os.path.dirname(full_url)))
+    parent_url = os.path.dirname(full_url)
+    if not parent_url:
+        root = Page.objects.get_home()
+        if not root:
+            return None
+        return root.get_draft_object()
+    parent = get_page_from_path(parent_url, draft=True)
+    if not parent:
+        logging.error('Parent {} not found.'.format(parent_url))
         return None
-    return parent_pages[0].page
+    return parent
 
 
 def find_text_plugin(page):

=== modified file 'md_importer/importer/repo.py'
--- md_importer/importer/repo.py	2016-03-09 14:14:08 +0000
+++ md_importer/importer/repo.py	2016-04-04 14:07:41 +0000
@@ -76,8 +76,14 @@
     def execute_import_directives(self):
         import_list = []
         # Import single files first
-        for directive in [d for d in self.directives
-                          if os.path.isfile(d['import_from'])]:
+        single_files = [d for d in self.directives
+                        if os.path.isfile(d['import_from'])]
+        # Sort by number of '/' in write_to - this should ensure that we
+        # first import entries closer to the root.
+        single_files.sort(
+            cmp=lambda x, y:
+            x['write_to'].count('/')-y['write_to'].count('/'))
+        for directive in single_files:
             import_list += [
                 (directive['import_from'], directive['write_to'],
                  directive['advertise'], directive['template'])

=== added file 'md_importer/importer/tools.py'
--- md_importer/importer/tools.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/tools.py	2016-04-04 14:07:41 +0000
@@ -0,0 +1,12 @@
+def remove_leading_and_trailing_slash(url):
+    if url.startswith('/'):
+        url = url[1:]
+    if url.endswith('/'):
+        url = url[:-1]
+    return url
+
+
+def remove_trailing_slash(url):
+    if url.endswith('/'):
+        url = url[:-1]
+    return url

=== modified file 'md_importer/tests/test_branch_import.py'
--- md_importer/tests/test_branch_import.py	2016-03-08 13:07:19 +0000
+++ md_importer/tests/test_branch_import.py	2016-04-04 14:07:41 +0000
@@ -1,4 +1,5 @@
 from datetime import datetime
+import os
 import pytz
 import shutil
 
@@ -10,10 +11,51 @@
 )
 from md_importer.importer.article import Article
 from md_importer.importer.publish import find_text_plugin
+from md_importer.importer.tools import remove_trailing_slash
 
 from .utils import TestLocalBranchImport
 
 
+class TestImportDirectivesBuildHierarchyImport(TestLocalBranchImport):
+    '''
+    Build a article tree structure from files in the snapcraft tree.
+    Make sure the top-most articles (in the tree hierarchy) are imported
+    first, so the tree looks like this:
+    a
+    +-- b
+        +------ c
+        |       +-- d
+        |       |   +-- e
+        |       |       +-- f
+        +-- c2  |
+                +-- d2
+    Files in the import directives are random in the beginning.
+    '''
+    def runTest(self):
+        self.create_repo('data/snapcraft-test')
+        self.repo.add_directive('docs/debug.md', 'a/b/c/d')
+        self.repo.add_directive('docs/intro.md', 'a/b')
+        self.repo.add_directive('docs/mir-snaps.md', 'a/b/c/d/e/f')
+        self.repo.add_directive('docs/reference.md', 'a')
+        self.repo.add_directive('docs/snapcraft-advanced-features.md', 'a/b/c')
+        self.repo.add_directive('docs/snapcraft-syntax.md', 'a/b/c2')
+        self.repo.add_directive('docs/upload-your-snap.md', 'a/b/c/d2')
+        self.repo.add_directive('docs/get-started.md', 'a/b/c/d/e')
+        self.assertEqual(len(self.repo.directives), 8)
+        self.assertTrue(self.repo.execute_import_directives())
+        self.assertEqual(len(self.repo.imported_articles), 8)
+        self.assertTrue(self.repo.publish())
+        pages = Page.objects.all()
+        self.assertGreater(pages.count(), len(self.repo.imported_articles))
+        # Make sure we got the parents right
+        for article in self.repo.imported_articles:
+            parent_url = remove_trailing_slash(
+                article.page.parent.get_absolute_url())
+            url = remove_trailing_slash(article.page.get_absolute_url())
+            self.assertEqual(parent_url, os.path.split(url)[0])
+            self.assertIsInstance(article, Article)
+
+
 class TestOneDirImport(TestLocalBranchImport):
     def runTest(self):
         self.create_repo('data/snapcraft-test')
@@ -117,7 +159,8 @@
         self.assertTrue(self.repo.publish())
         for page in Page.objects.filter(publisher_is_draft=False):
             if page.parent is not None:
-                self.assertEqual(page.parent_id, self.root.id)
+                parent = page.parent.get_public_object()
+                self.assertEqual(parent.id, self.root.id)
                 self.assertTrue(page.in_navigation)
 
 

=== modified file 'md_importer/tests/test_website_import.py'
--- md_importer/tests/test_website_import.py	2016-03-22 10:23:18 +0000
+++ md_importer/tests/test_website_import.py	2016-04-04 14:07:41 +0000
@@ -51,18 +51,36 @@
             '/en/snappy/start/',
             '/en/snappy/start/as-dev/',
             '/en/snappy/start/as-dev/16-04/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-azure-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-azure-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-azure-windows/',
             '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-macos/',
             '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-ubuntu/',
             '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-windows/',
             '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-macos/',
             '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-ubuntu/',
             '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-ec2-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-ec2-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-ec2-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-gce-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-gce-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-gce-windows/',
             '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-macos/',
             '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-ubuntu/',
             '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-kvm-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-kvm-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-kvm-windows/',
             '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-macos/',
             '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-ubuntu/',
             '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-vagrant-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-vagrant-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-vagrant-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-x86-device-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-x86-device-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-x86-device-windows/',
             '/en/snappy/start/as-dev/16-04/step3-get-familiar/',
             '/en/snappy/start/as-dev/16-04/step4-first-snap/',
             '/en/snappy/start/as-dev/16-04/step5-further-readings/',