From ef8d5f8310a5bcb055f9fc109593b5971dc4ce35 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Sat, 2 Feb 2019 09:44:45 +0000
Subject: [PATCH 01/12] Make work with django template lookup

---
 .../src/js/components/navigation.js           |  6 +-
 .../src/scss/components/_list.scss            |  3 +-
 .../templates/pattern_library/base.html       | 26 +------
 .../pattern_library/pattern_group.html        | 24 +++++++
 pattern_library/urls.py                       |  8 +--
 pattern_library/utils.py                      | 67 +++++++++----------
 pattern_library/views.py                      |  3 +-
 7 files changed, 71 insertions(+), 66 deletions(-)
 create mode 100644 pattern_library/templates/pattern_library/pattern_group.html

diff --git a/pattern_library/static/pattern_library/src/js/components/navigation.js b/pattern_library/static/pattern_library/src/js/components/navigation.js
index 1f580bb4..8c62f537 100644
--- a/pattern_library/static/pattern_library/src/js/components/navigation.js
+++ b/pattern_library/static/pattern_library/src/js/components/navigation.js
@@ -3,7 +3,11 @@ export function toggleNavItems() {
     headings.forEach(heading => {
         heading.addEventListener('click', e => {
             e.target.classList.toggle('is-open');
-            e.target.nextElementSibling.classList.toggle('is-open');
+            for ( const element of e.target.parentNode.childNodes ) {
+                if ( element.nodeName === "UL" ){
+                    element.classList.toggle('is-open');
+                }
+            }
         });
     });
 }
diff --git a/pattern_library/static/pattern_library/src/scss/components/_list.scss b/pattern_library/static/pattern_library/src/scss/components/_list.scss
index 1ff3b4c1..a93f15cc 100644
--- a/pattern_library/static/pattern_library/src/scss/components/_list.scss
+++ b/pattern_library/static/pattern_library/src/scss/components/_list.scss
@@ -8,6 +8,7 @@
         font-size: 13px;
         color: $mid-grey;
         display: none;
+        padding-left: 10px;
 
         &.is-open {
             display: block;
@@ -68,5 +69,3 @@
         }
     }
 }
-
-
diff --git a/pattern_library/templates/pattern_library/base.html b/pattern_library/templates/pattern_library/base.html
index 5368b467..e5deb10a 100644
--- a/pattern_library/templates/pattern_library/base.html
+++ b/pattern_library/templates/pattern_library/base.html
@@ -27,35 +27,15 @@ <h1 class="header__title">
         <div class="sidebar__search-results" id="js-pattern-search-results-container"></div>
         <nav class="sidebar__nav" id="sidebar-nav">
             <ul class="list">
-                {% for pattern_type, pattern_type_groups in pattern_templates.items %}
+                {% for pattern_type_group, pattern_templates in pattern_templates.template_groups.items %}
                 <li class="list__item">
                     <h2 class="list__item-heading js-toggle-pattern">
                         <svg class="list__item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160">
                             <path d="M88 80l-48 48 16 16 64-64-64-64-16 16 48 48z" />
                         </svg>
-                        {{ pattern_type|title }}
+                        {{ pattern_type_group|title }}
                     </h2>
-                    <ul class="list list--child">
-                        {% for group_name, pattern_templates in pattern_type_groups.items %}
-                        <li class="list__item">
-                            <h3 class="list__item-heading list__item-heading--small list__item-heading--light js-toggle-pattern">
-                                <svg class="list__item-icon list__item-icon--small" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160">
-                                    <path d="M88 80l-48 48 16 16 64-64-64-64-16 16 48 48z" />
-                                </svg>
-                                {{ group_name }}
-                            </h3>
-                            <ul class="list list--grandchild">
-                                {% for template in pattern_templates %}
-                                <li class="list__item">
-                                    <a class="list__item-link" href="{% url 'pattern_library:display_pattern' template.origin.template_name %}" id="{{ template.origin.template_name }}">
-                                        {{ template.pattern_name }}
-                                    </a>
-                                </li>
-                                {% endfor %}
-                            </ul>
-                        </li>
-                        {% endfor %}
-                    </ul>
+                    {% include "pattern_library/pattern_group.html" with groups=pattern_templates.template_groups %}
                 </li>
                 {% endfor %}
             </ul>
diff --git a/pattern_library/templates/pattern_library/pattern_group.html b/pattern_library/templates/pattern_library/pattern_group.html
new file mode 100644
index 00000000..a3aa1d85
--- /dev/null
+++ b/pattern_library/templates/pattern_library/pattern_group.html
@@ -0,0 +1,24 @@
+<ul class="list list--child">
+    {% for group_name, pattern_templates in groups.items %}
+    <li class="list__item">
+        <h3 class="list__item-heading list__item-heading--small list__item-heading--light js-toggle-pattern">
+            <svg class="list__item-icon list__item-icon--small" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160">
+                <path d="M88 80l-48 48 16 16 64-64-64-64-16 16 48 48z" />
+            </svg>
+            {{ group_name }}
+        </h4>
+        {% if pattern_templates.template_groups %}
+            {% include "pattern_library/pattern_group.html" with groups=pattern_templates.template_groups %}
+        {% endif %}
+        <ul class="list list--grandchild">
+            {% for template in pattern_templates.templates_stored %}
+            <li class="list__item">
+                <a class="list__item-link" href="{% url 'pattern_library:display_pattern' template.origin.template_name %}" id="{{ template.origin.template_name }}">
+                    {{ template.pattern_name }}
+                </a>
+            </li>
+            {% endfor %}
+        </ul>
+    </li>
+    {% endfor %}
+</ul>
diff --git a/pattern_library/urls.py b/pattern_library/urls.py
index be48d3d4..8763e51e 100644
--- a/pattern_library/urls.py
+++ b/pattern_library/urls.py
@@ -9,8 +9,8 @@
     # UI
     url(r'^$', views.IndexView.as_view(), name='index'),
     url(
-        r'^pattern/(?P<pattern_template_name>%s/[\w./-]+%s)$' % (
-            get_pattern_template_prefix(), get_pattern_template_suffix()
+        r'^pattern/(?P<pattern_template_name>[\w./-]+%s)$' % (
+            get_pattern_template_suffix()
         ),
         views.IndexView.as_view(),
         name='display_pattern'
@@ -18,8 +18,8 @@
 
     # iframe rendering
     url(
-        r'^render-pattern/(?P<pattern_template_name>%s/[\w./-]+%s)$' % (
-            get_pattern_template_prefix(), get_pattern_template_suffix()
+        r'^render-pattern/(?P<pattern_template_name>[\w./-]+%s)$' % (
+            get_pattern_template_suffix()
         ),
         views.RenderPatternView.as_view(),
         name='render_pattern'
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index 0c1e2528..dfeb70be 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -2,8 +2,10 @@
 import re
 from collections import OrderedDict
 
+from django.apps import apps
 from django.template import TemplateDoesNotExist
 from django.template.loader import get_template, render_to_string
+from django.template.loaders.app_directories import get_app_template_dirs
 from django.utils.safestring import mark_safe
 
 import markdown
@@ -17,10 +19,7 @@
 
 
 def is_pattern(template_name):
-    return (
-        template_name.startswith(get_pattern_template_prefix())
-        and template_name.endswith(get_pattern_template_suffix())
-    )
+    return template_name.endswith(get_pattern_template_suffix())
 
 
 def is_pattern_type(template_name, pattern_type):
@@ -37,50 +36,50 @@ def is_pattern_library_context(context):
     return context.get(context_var_name) is True
 
 
-def get_pattern_templates(pattern_types):
-    templates = OrderedDict()
+def base_dict():
+    return {'templates_stored': [], 'template_groups': {}}
 
-    base_lookup_dir = get_pattern_template_dir()
-    lookup_dir = os.path.join(base_lookup_dir, get_pattern_template_prefix())
 
-    for pattern_type in pattern_types:
-        # We can't use defaultdict here, because Django templates
-        # can't handle it properly: Django will try to resolve `templates.items`
-        # as `templates['items']` not as `templates.items()`
-        templates.setdefault(pattern_type, {})
-        pattern_type_path = os.path.join(lookup_dir, pattern_type)
+def get_pattern_templates():
+    templates = base_dict()
+    template_dirs = get_app_template_dirs('templates')
 
-        for root, dirs, files in os.walk(pattern_type_path):
-            # Do not allow patterns to sit directly underneath the pattern_type_path dir
-            if root == pattern_type_path:
-                continue
+    for lookup_dir in template_dirs:
+        app_folder = lookup_dir.split(os.sep)[-2]
+        try:
+            app_name = apps.get_app_config(app_folder).verbose_name
+        except LookupError:
+            app_name = app_folder.title()
 
+        for root, dirs, files in os.walk(lookup_dir, topdown=True):
             # Ignore folders without files
             if not files:
                 continue
 
-            pattern_subtype = os.path.relpath(root, pattern_type_path)
-            templates[pattern_type].setdefault(pattern_subtype, [])
-
+            found_templates = []
             for current_file in files:
                 pattern_path = os.path.join(root, current_file)
-                pattern_path = os.path.relpath(pattern_path, base_lookup_dir)
+                pattern_path = os.path.relpath(pattern_path, lookup_dir)
 
-                # Include only pattern templates
                 if is_pattern(pattern_path):
+                    template = get_template(pattern_path)
+                    pattern_config = get_pattern_config(pattern_path)
+                    pattern_name = pattern_config.get('name')
+                    if pattern_name:
+                        template.pattern_name = pattern_name
+                    found_templates.append(template)
+
+            sub_folders = os.path.relpath(root, lookup_dir)
+            if found_templates:
+                templates_to_store = templates
+                for folder in [app_name, *sub_folders.split(os.sep)]:
                     try:
-                        template = get_template(pattern_path)
-                        templates[pattern_type][pattern_subtype].append(template)
-                    except TemplateDoesNotExist:
-                        pass
-                    else:
-                        pattern_config = get_pattern_config(template.origin.template_name)
-                        pattern_name = pattern_config.get('name')
-                        if pattern_name:
-                            template.pattern_name = pattern_name
-                        else:
-                            template.pattern_name = os.path.basename(pattern_path)
+                        templates_to_store = templates_to_store['template_groups'][folder]
+                    except KeyError:
+                        templates_to_store['template_groups'][folder] = base_dict()
+                        templates_to_store = templates_to_store['template_groups'][folder]
 
+                templates_to_store['templates_stored'].extend(found_templates)
     return templates
 
 
diff --git a/pattern_library/views.py b/pattern_library/views.py
index 57049865..a4ccf0f4 100644
--- a/pattern_library/views.py
+++ b/pattern_library/views.py
@@ -35,8 +35,7 @@ def get_first_template(self, templates):
 
     def get(self, request, pattern_template_name=None):
         # Get all pattern templates
-        available_pattern_types = get_pattern_types()
-        templates = get_pattern_templates(available_pattern_types)
+        templates = get_pattern_templates()
 
         if pattern_template_name is None:
             # Just display the first pattern if a specific one isn't requested

From 22f187d57d66234be1411b22a24c85f00006cdf2 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Sat, 2 Feb 2019 15:53:22 +0000
Subject: [PATCH 02/12] Add the section options to the settings and allow order
 on settings

---
 pattern_library/__init__.py | 31 ++++++++++++-------
 pattern_library/urls.py     |  5 ++-
 pattern_library/utils.py    | 62 ++++++++++++++++++++++++++++++-------
 pattern_library/views.py    |  2 +-
 tests/settings.py           |  4 ++-
 5 files changed, 76 insertions(+), 28 deletions(-)

diff --git a/pattern_library/__init__.py b/pattern_library/__init__.py
index a2b683e6..f77ff64e 100644
--- a/pattern_library/__init__.py
+++ b/pattern_library/__init__.py
@@ -7,36 +7,43 @@
 
 def uses_settings(func):
     @wraps(func)
-    def wrapped():
+    def wrapped(*args, **kwargs):
         global settings
         if settings is None:
             settings = importlib.import_module('django.conf').settings
-        return func()
+        return func(*args, **kwargs)
     return wrapped
 
 
-@uses_settings
-def get_pattern_template_dir():
-    return settings.PATTERN_LIBRARY_TEMPLATE_DIR
+PATTERN_LIBRARY_SETTINGS = {
+    'BASE_TEMPLATE_NAME': 'patterns/base.html',
+    'TEMPLATE_SUFFIX': '.html',
+    'TEMPLATE_DIR': 'to/remove/',
+    'SECTIONS': tuple(),
+}
 
 
 @uses_settings
-def get_pattern_template_prefix():
-    return getattr(settings, 'PATTERN_LIBRARY_TEMPLATE_PREFIX', 'patterns')
+def get_from_settings(attr):
+    library_settings = getattr(settings, 'PATTERN_LIBRARY', PATTERN_LIBRARY_SETTINGS)
+    return library_settings.get(attr, PATTERN_LIBRARY_SETTINGS[attr])
 
 
 @uses_settings
+def get_pattern_template_dir():
+    return get_from_settings('TEMPLATE_DIR')
+
+
 def get_pattern_template_suffix():
-    return getattr(settings, 'PATTERN_LIBRARY_TEMPLATE_SUFFIX', '.html')
+    return get_from_settings('TEMPLATE_SUFFIX')
 
 
-@uses_settings
 def get_pattern_base_template_name():
-    return getattr(settings, 'PATTERN_LIBRARY_BASE_TEMPLATE_NAME', 'patterns/base.html')
+    return get_from_settings('BASE_TEMPLATE_NAME')
 
 
-def get_pattern_types():
-    return ['atoms', 'molecules', 'organisms', 'templates', 'pages']
+def get_sections():
+    return get_from_settings('SECTIONS')
 
 
 def get_pattern_context_var_name():
diff --git a/pattern_library/urls.py b/pattern_library/urls.py
index 8763e51e..adf5ccc5 100644
--- a/pattern_library/urls.py
+++ b/pattern_library/urls.py
@@ -1,8 +1,7 @@
 from django.conf.urls import url
 
-from pattern_library import (
-    get_pattern_template_prefix, get_pattern_template_suffix, views
-)
+from pattern_library import get_pattern_template_suffix, views
+
 
 app_name = 'pattern_library'
 urlpatterns = [
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index dfeb70be..d44c8760 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -1,9 +1,8 @@
 import os
 import re
-from collections import OrderedDict
+import operator
 
 from django.apps import apps
-from django.template import TemplateDoesNotExist
 from django.template.loader import get_template, render_to_string
 from django.template.loaders.app_directories import get_app_template_dirs
 from django.utils.safestring import mark_safe
@@ -13,11 +12,20 @@
 
 from pattern_library import (
     get_pattern_context_var_name, get_pattern_template_dir,
-    get_pattern_template_prefix, get_pattern_template_suffix
+    get_pattern_template_suffix, get_sections,
 )
 from pattern_library.exceptions import TemplateIsNotPattern
 
 
+def path_to_section():
+    section_config = get_sections()
+    sections = {}
+    for section, paths in section_config:
+        for path in paths:
+            sections[path] = section
+    return sections
+
+
 def is_pattern(template_name):
     return template_name.endswith(get_pattern_template_suffix())
 
@@ -36,26 +44,45 @@ def is_pattern_library_context(context):
     return context.get(context_var_name) is True
 
 
+def section_for(template_folder):
+    paths = path_to_section()
+    for path in paths:
+        if template_folder.startswith(path):
+            return paths[path], path
+    return None, None
+
+
 def base_dict():
     return {'templates_stored': [], 'template_groups': {}}
 
 
+def order_dict(dictionary, key_sort=None):
+    # Order a dictionary by the keys
+    values = list(dictionary.items())
+    if not key_sort:
+        values.sort(key=operator.itemgetter(0))
+    else:
+        values.sort(key=lambda key: key_sort(key[0]))
+    return dict(values)
+
+
 def get_pattern_templates():
     templates = base_dict()
     template_dirs = get_app_template_dirs('templates')
 
     for lookup_dir in template_dirs:
-        app_folder = lookup_dir.split(os.sep)[-2]
-        try:
-            app_name = apps.get_app_config(app_folder).verbose_name
-        except LookupError:
-            app_name = app_folder.title()
-
         for root, dirs, files in os.walk(lookup_dir, topdown=True):
             # Ignore folders without files
             if not files:
                 continue
 
+            base_path = os.path.relpath(root, lookup_dir)
+            section, path = section_for(base_path)
+
+            # It has no section, ignore it
+            if not section:
+                continue
+
             found_templates = []
             for current_file in files:
                 pattern_path = os.path.join(root, current_file)
@@ -69,10 +96,11 @@ def get_pattern_templates():
                         template.pattern_name = pattern_name
                     found_templates.append(template)
 
-            sub_folders = os.path.relpath(root, lookup_dir)
             if found_templates:
+                sub_folders = os.path.relpath(root, lookup_dir)
+                sub_folders = sub_folders.replace(path, '')
                 templates_to_store = templates
-                for folder in [app_name, *sub_folders.split(os.sep)]:
+                for folder in [section, *sub_folders.split(os.sep)]:
                     try:
                         templates_to_store = templates_to_store['template_groups'][folder]
                     except KeyError:
@@ -80,6 +108,18 @@ def get_pattern_templates():
                         templates_to_store = templates_to_store['template_groups'][folder]
 
                 templates_to_store['templates_stored'].extend(found_templates)
+
+    # Order the templates alphabetically
+    for templates_objs in templates['template_groups'].values():
+        templates_objs['template_groups'] = order_dict(templates_objs['template_groups'])
+
+    # Order the top level by the sections
+    section_order = [section for section, _ in get_sections()]
+    templates['template_groups'] = order_dict(
+        templates['template_groups'],
+        key_sort=lambda key: section_order.index(key)
+    )
+
     return templates
 
 
diff --git a/pattern_library/views.py b/pattern_library/views.py
index a4ccf0f4..16c14d76 100644
--- a/pattern_library/views.py
+++ b/pattern_library/views.py
@@ -5,7 +5,7 @@
 from django.views.decorators.clickjacking import xframe_options_sameorigin
 from django.views.generic.base import TemplateView
 
-from pattern_library import get_pattern_base_template_name, get_pattern_types
+from pattern_library import get_pattern_base_template_name
 from pattern_library.exceptions import (
     PatternLibraryEmpty, TemplateIsNotPattern
 )
diff --git a/tests/settings.py b/tests/settings.py
index d0c59b8d..0246adbb 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -19,7 +19,9 @@
 
 ROOT_URLCONF = 'tests.urls'
 
-PATTERN_LIBRARY_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
+PATTERN_LIBRARY = {
+    'TEMPLATE_DIR': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
+}
 
 TEMPLATES = [
     {

From bf8a09b3fc6b1fa41ab05f27b55ee099ce3fdab9 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Sat, 2 Feb 2019 16:02:17 +0000
Subject: [PATCH 03/12] Load context using the django loader

---
 pattern_library/utils.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index d44c8760..d11c013d 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -125,17 +125,11 @@ def get_pattern_templates():
 
 def get_pattern_config_str(template_name):
     replace_pattern = '{}$'.format(get_pattern_template_suffix())
-    context_file = re.sub(replace_pattern, '', template_name)
+    context_path = re.sub(replace_pattern, '', template_name)
 
-    context_file = context_file + '.yaml'
-    context_file = os.path.join(get_pattern_template_dir(), context_file)
-
-    try:
-        # Default encoding is platform-dependant, so we explicitly open it as utf-8.
-        with open(context_file, 'r', encoding='utf-8') as f:
-            return str(f.read())
-    except IOError:
-        return ''
+    context_name = context_path + '.yaml'
+    context_file = get_template(context_name)
+    return context_file.render()
 
 
 def get_pattern_config(template_name):

From 045df522be6b9843b1f970d3a877fc9c3b69f079 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Sat, 2 Feb 2019 16:27:21 +0000
Subject: [PATCH 04/12] Correctly find the first template in the new structure

---
 pattern_library/__init__.py |  6 ------
 pattern_library/utils.py    | 13 +++++++----
 pattern_library/views.py    | 43 +++++++++++++++++++++++++------------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/pattern_library/__init__.py b/pattern_library/__init__.py
index f77ff64e..665c5ab2 100644
--- a/pattern_library/__init__.py
+++ b/pattern_library/__init__.py
@@ -18,7 +18,6 @@ def wrapped(*args, **kwargs):
 PATTERN_LIBRARY_SETTINGS = {
     'BASE_TEMPLATE_NAME': 'patterns/base.html',
     'TEMPLATE_SUFFIX': '.html',
-    'TEMPLATE_DIR': 'to/remove/',
     'SECTIONS': tuple(),
 }
 
@@ -29,11 +28,6 @@ def get_from_settings(attr):
     return library_settings.get(attr, PATTERN_LIBRARY_SETTINGS[attr])
 
 
-@uses_settings
-def get_pattern_template_dir():
-    return get_from_settings('TEMPLATE_DIR')
-
-
 def get_pattern_template_suffix():
     return get_from_settings('TEMPLATE_SUFFIX')
 
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index d11c013d..8354f125 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -2,7 +2,7 @@
 import re
 import operator
 
-from django.apps import apps
+from django.template import TemplateDoesNotExist
 from django.template.loader import get_template, render_to_string
 from django.template.loaders.app_directories import get_app_template_dirs
 from django.utils.safestring import mark_safe
@@ -11,8 +11,9 @@
 import yaml
 
 from pattern_library import (
-    get_pattern_context_var_name, get_pattern_template_dir,
-    get_pattern_template_suffix, get_sections,
+    get_pattern_context_var_name,
+    get_pattern_template_suffix,
+    get_sections,
 )
 from pattern_library.exceptions import TemplateIsNotPattern
 
@@ -128,7 +129,11 @@ def get_pattern_config_str(template_name):
     context_path = re.sub(replace_pattern, '', template_name)
 
     context_name = context_path + '.yaml'
-    context_file = get_template(context_name)
+    try:
+        context_file = get_template(context_name)
+    except TemplateDoesNotExist:
+        return ''
+
     return context_file.render()
 
 
diff --git a/pattern_library/views.py b/pattern_library/views.py
index 16c14d76..99ee9f23 100644
--- a/pattern_library/views.py
+++ b/pattern_library/views.py
@@ -10,9 +10,13 @@
     PatternLibraryEmpty, TemplateIsNotPattern
 )
 from pattern_library.utils import (
-    get_pattern_config, get_pattern_config_str, get_pattern_markdown,
-    get_pattern_template_dir, get_pattern_templates, is_pattern_type,
-    render_pattern
+    get_pattern_config,
+    get_pattern_config_str,
+    get_pattern_markdown,
+    get_pattern_templates,
+    get_sections,
+    is_pattern_type,
+    render_pattern,
 )
 
 
@@ -20,18 +24,29 @@ class IndexView(TemplateView):
     http_method_names = ('get', )
     template_name = 'pattern_library/index.html'
 
+    def first_template_from_group(self, templates):
+        try:
+            return templates['templates_stored'][0]
+        except IndexError:
+            for template_group in templates['template_groups'].values():
+                return self.first_template_from_group(template_group)
+        return None
+
     def get_first_template(self, templates):
-        for pattern_type in templates:
-            pattern_groups = templates[pattern_type]
-            for pattern_group in pattern_groups:
-                pattern_templates = pattern_groups[pattern_group]
-                for pattern_template in pattern_templates:
-                    return pattern_template.origin.template_name
-
-        raise PatternLibraryEmpty(
-            "No templates found in the pattern library at '%s'"
-            % get_pattern_template_dir()
-        )
+        first_template = self.first_template_from_group(templates)
+        if first_template:
+            return first_template.origin.template_name
+
+        sections = get_sections()
+        if sections:
+            raise PatternLibraryEmpty(
+                "No templates found matching: '%s'"
+                % str(sections)
+            )
+        else:
+            raise PatternLibraryEmpty(
+                "No 'SECTIONS' found in the 'PATTERN_LIBRARY' setting"
+            )
 
     def get(self, request, pattern_template_name=None):
         # Get all pattern templates

From 6681a6721d70cd511d6b036b28ba873377440223 Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sun, 20 Oct 2019 07:51:59 +0100
Subject: [PATCH 05/12] isort

---
 pattern_library/urls.py  | 1 -
 pattern_library/utils.py | 6 ++----
 pattern_library/views.py | 9 ++-------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pattern_library/urls.py b/pattern_library/urls.py
index adf5ccc5..b018190d 100644
--- a/pattern_library/urls.py
+++ b/pattern_library/urls.py
@@ -2,7 +2,6 @@
 
 from pattern_library import get_pattern_template_suffix, views
 
-
 app_name = 'pattern_library'
 urlpatterns = [
     # UI
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index 8354f125..2a02f3d8 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -1,6 +1,6 @@
+import operator
 import os
 import re
-import operator
 
 from django.template import TemplateDoesNotExist
 from django.template.loader import get_template, render_to_string
@@ -11,9 +11,7 @@
 import yaml
 
 from pattern_library import (
-    get_pattern_context_var_name,
-    get_pattern_template_suffix,
-    get_sections,
+    get_pattern_context_var_name, get_pattern_template_suffix, get_sections
 )
 from pattern_library.exceptions import TemplateIsNotPattern
 
diff --git a/pattern_library/views.py b/pattern_library/views.py
index 99ee9f23..fd1a7e61 100644
--- a/pattern_library/views.py
+++ b/pattern_library/views.py
@@ -10,13 +10,8 @@
     PatternLibraryEmpty, TemplateIsNotPattern
 )
 from pattern_library.utils import (
-    get_pattern_config,
-    get_pattern_config_str,
-    get_pattern_markdown,
-    get_pattern_templates,
-    get_sections,
-    is_pattern_type,
-    render_pattern,
+    get_pattern_config, get_pattern_config_str, get_pattern_markdown,
+    get_pattern_templates, get_sections, is_pattern_type, render_pattern
 )
 
 

From 288bd474f522c740386a9b8f521ee9fe0fba3c4c Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sun, 20 Oct 2019 09:07:20 +0100
Subject: [PATCH 06/12] Use SECTIONS settings in test app

---
 pattern_library/__init__.py | 26 +++++++-------------------
 pattern_library/utils.py    |  7 ++++++-
 tests/settings.py           |  7 +++++++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pattern_library/__init__.py b/pattern_library/__init__.py
index 665c5ab2..238a4f7d 100644
--- a/pattern_library/__init__.py
+++ b/pattern_library/__init__.py
@@ -1,31 +1,19 @@
-import importlib
-from functools import wraps
-
-default_app_config = 'pattern_library.apps.PatternLibraryAppConfig'
-settings = None
+from django.conf import settings
 
 
-def uses_settings(func):
-    @wraps(func)
-    def wrapped(*args, **kwargs):
-        global settings
-        if settings is None:
-            settings = importlib.import_module('django.conf').settings
-        return func(*args, **kwargs)
-    return wrapped
-
+default_app_config = 'pattern_library.apps.PatternLibraryAppConfig'
 
-PATTERN_LIBRARY_SETTINGS = {
+DEFAULT_SETTINGS = {
     'BASE_TEMPLATE_NAME': 'patterns/base.html',
     'TEMPLATE_SUFFIX': '.html',
-    'SECTIONS': tuple(),
+    'SECTIONS': (),
 }
 
 
-@uses_settings
 def get_from_settings(attr):
-    library_settings = getattr(settings, 'PATTERN_LIBRARY', PATTERN_LIBRARY_SETTINGS)
-    return library_settings.get(attr, PATTERN_LIBRARY_SETTINGS[attr])
+    library_settings = DEFAULT_SETTINGS.copy()
+    library_settings.update(getattr(settings, 'PATTERN_LIBRARY', {}))
+    return library_settings.get(attr)
 
 
 def get_pattern_template_suffix():
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index 2a02f3d8..3f420e93 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -93,11 +93,16 @@ def get_pattern_templates():
                     pattern_name = pattern_config.get('name')
                     if pattern_name:
                         template.pattern_name = pattern_name
+                    else:
+                        template.pattern_name = os.path.relpath(
+                            template.origin.template_name,
+                            base_path,
+                        )
                     found_templates.append(template)
 
             if found_templates:
                 sub_folders = os.path.relpath(root, lookup_dir)
-                sub_folders = sub_folders.replace(path, '')
+                sub_folders = os.path.relpath(sub_folders, path)  # TODO improve this
                 templates_to_store = templates
                 for folder in [section, *sub_folders.split(os.sep)]:
                     try:
diff --git a/tests/settings.py b/tests/settings.py
index 0246adbb..6cd8d6f7 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -51,3 +51,10 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
+
+PATTERN_LIBRARY = {
+    'SECTIONS': [
+        ('atoms', ['patterns/atoms']),
+        ('molecules', ['patterns/molecules']),
+    ],
+}

From 3122813abe85a41a2b2a10ad957e455054fc0e2a Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sun, 20 Oct 2019 09:11:23 +0100
Subject: [PATCH 07/12] Fix top-level import during build

---
 pattern_library/__init__.py |  4 +++-
 tests/settings.py           | 13 +++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pattern_library/__init__.py b/pattern_library/__init__.py
index 238a4f7d..fb429201 100644
--- a/pattern_library/__init__.py
+++ b/pattern_library/__init__.py
@@ -1,4 +1,3 @@
-from django.conf import settings
 
 
 default_app_config = 'pattern_library.apps.PatternLibraryAppConfig'
@@ -11,8 +10,11 @@
 
 
 def get_from_settings(attr):
+    from django.conf import settings
+
     library_settings = DEFAULT_SETTINGS.copy()
     library_settings.update(getattr(settings, 'PATTERN_LIBRARY', {}))
+
     return library_settings.get(attr)
 
 
diff --git a/tests/settings.py b/tests/settings.py
index 6cd8d6f7..e6607b96 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -20,7 +20,11 @@
 ROOT_URLCONF = 'tests.urls'
 
 PATTERN_LIBRARY = {
-    'TEMPLATE_DIR': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
+    'TEMPLATE_DIR': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates'),
+    'SECTIONS': [
+        ('atoms', ['patterns/atoms']),
+        ('molecules', ['patterns/molecules']),
+    ],
 }
 
 TEMPLATES = [
@@ -51,10 +55,3 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
-
-PATTERN_LIBRARY = {
-    'SECTIONS': [
-        ('atoms', ['patterns/atoms']),
-        ('molecules', ['patterns/molecules']),
-    ],
-}

From a82593748d43290ce879bcbde3a176240b4cbdce Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sat, 30 Nov 2019 11:09:52 +0000
Subject: [PATCH 08/12] Fix markdown docs rendering

---
 pattern_library/utils.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index 3f420e93..a5eb9c77 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -171,19 +171,17 @@ def get_pattern_context(template_name):
 
 def get_pattern_markdown(template_name):
     replace_pattern = '{}$'.format(get_pattern_template_suffix())
-    md_file = re.sub(replace_pattern, '', template_name)
-
-    md_file = md_file + '.md'
-    md_file = os.path.join(get_pattern_template_dir(), md_file)
+    md_path = re.sub(replace_pattern, '', template_name)
 
+    md_name = md_path + '.md'
     try:
-        # Default encoding is platform-dependant, so we explicitly open it as utf-8.
-        with open(md_file, 'r', encoding='utf-8') as f:
-            htmlmarkdown = markdown.markdown(f.read())
-            return htmlmarkdown
-    except IOError:
+        md_file = get_template(md_name)
+    except TemplateDoesNotExist:
         return ''
 
+    with open(md_file.origin.name, 'r', encoding='utf-8') as f:
+        return markdown.markdown(f.read())
+
 
 def render_pattern(request, template_name):
     if not is_pattern(template_name):

From a8f79ed7c9ac10a5406ac60b47a6d3b574b70a22 Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sat, 30 Nov 2019 14:36:59 +0000
Subject: [PATCH 09/12] Return 404s for non-pattern templates

---
 pattern_library/utils.py     | 11 ++++----
 pattern_library/views.py     | 14 +++++------
 tests/tests/test_sections.py | 49 ++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 tests/tests/test_sections.py

diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index a5eb9c77..6c6d1849 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -26,15 +26,14 @@ def path_to_section():
 
 
 def is_pattern(template_name):
-    return template_name.endswith(get_pattern_template_suffix())
-
+    if not template_name.endswith(get_pattern_template_suffix()):
+        return False
 
-def is_pattern_type(template_name, pattern_type):
-    if not is_pattern(template_name):
+    section, path = section_for(os.path.dirname(template_name))
+    if section is None:
         return False
 
-    substring = '/{}/'.format(pattern_type)
-    return substring in template_name
+    return True
 
 
 def is_pattern_library_context(context):
diff --git a/pattern_library/views.py b/pattern_library/views.py
index fd1a7e61..b0adf022 100644
--- a/pattern_library/views.py
+++ b/pattern_library/views.py
@@ -1,4 +1,4 @@
-from django.http import HttpResponse, HttpResponseBadRequest
+from django.http import Http404
 from django.template.loader import get_template
 from django.utils.decorators import method_decorator
 from django.utils.html import escape
@@ -11,7 +11,7 @@
 )
 from pattern_library.utils import (
     get_pattern_config, get_pattern_config_str, get_pattern_markdown,
-    get_pattern_templates, get_sections, is_pattern_type, render_pattern
+    get_pattern_templates, get_sections, is_pattern, render_pattern
 )
 
 
@@ -51,6 +51,9 @@ def get(self, request, pattern_template_name=None):
             # Just display the first pattern if a specific one isn't requested
             pattern_template_name = self.get_first_template(templates)
 
+        if not is_pattern(pattern_template_name):
+            raise Http404
+
         template = get_template(pattern_template_name)
         pattern_config = get_pattern_config(pattern_template_name)
 
@@ -74,12 +77,7 @@ def get(self, request, pattern_template_name=None):
         try:
             rendered_pattern = render_pattern(request, pattern_template_name)
         except TemplateIsNotPattern:
-            return HttpResponseBadRequest()
-
-        # Do not render page patterns as part of the base template
-        # because it should already extend base template
-        if is_pattern_type(pattern_template_name, 'pages'):
-            return HttpResponse(rendered_pattern)
+            raise Http404
 
         context = self.get_context_data()
         context['pattern_library_rendered_pattern'] = rendered_pattern
diff --git a/tests/tests/test_sections.py b/tests/tests/test_sections.py
new file mode 100644
index 00000000..dd33b6f3
--- /dev/null
+++ b/tests/tests/test_sections.py
@@ -0,0 +1,49 @@
+from django.conf import settings
+from django.test import SimpleTestCase, override_settings
+
+from bs4 import BeautifulSoup
+
+from .utils import reverse
+
+
+class SectionsTestCase(SimpleTestCase):
+    def get_sections(self):
+        response = self.client.get(reverse('pattern_library:index'))
+        self.assertEqual(response.status_code, 200)
+
+        soup = BeautifulSoup(response.content, features='html.parser')
+        sidebar_nav = soup.select_one('#sidebar-nav')
+        sections = [h.text.strip() for h in sidebar_nav.find_all('h2')]
+
+        return sections
+
+    def test_just_atoms(self):
+        pl_settings = settings.PATTERN_LIBRARY
+
+        with override_settings(PATTERN_LIBRARY={
+            'TEMPLATE_DIR': pl_settings['TEMPLATE_DIR'],
+            'SECTIONS': [
+                ('atoms', ['patterns/atoms']),
+            ]
+        }):
+            # Check the section list in the sidebar only contains the Atoms sections
+            sections = self.get_sections()
+            self.assertListEqual(sections, ['Atoms'])
+
+            # Check a pattern from Atoms can be rendered
+            test_atom_render_url = reverse(
+                'pattern_library:render_pattern',
+                kwargs={'pattern_template_name': 'patterns/atoms/test_atom/test_atom.html'},
+            )
+
+            response = self.client.get(test_atom_render_url)
+            self.assertEqual(response.status_code, 200)
+
+            # Check a pattern from Molecules cannot be rendered
+            test_molecule_render_url = reverse(
+                'pattern_library:render_pattern',
+                kwargs={'pattern_template_name': 'patterns/molecules/test_molecule/test_molecule.html'},
+            )
+
+            response = self.client.get(test_molecule_render_url)
+            self.assertEqual(response.status_code, 404)

From 89a3e9490b2a876ccf6887663a47617f0d11b166 Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sat, 30 Nov 2019 16:19:27 +0000
Subject: [PATCH 10/12] Fix returning non-pattern templates as fake tag output

---
 pattern_library/__init__.py                               | 8 +++++++-
 pattern_library/monkey_utils.py                           | 2 +-
 pattern_library/utils.py                                  | 4 ++--
 tests/templates/non-patterns/include.html                 | 4 ++++
 .../patterns/atoms/test_includes/test_includes.html       | 1 +
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 tests/templates/non-patterns/include.html
 create mode 100644 tests/templates/patterns/atoms/test_includes/test_includes.html

diff --git a/pattern_library/__init__.py b/pattern_library/__init__.py
index fb429201..d6bbf060 100644
--- a/pattern_library/__init__.py
+++ b/pattern_library/__init__.py
@@ -5,7 +5,13 @@
 DEFAULT_SETTINGS = {
     'BASE_TEMPLATE_NAME': 'patterns/base.html',
     'TEMPLATE_SUFFIX': '.html',
-    'SECTIONS': (),
+    'SECTIONS': (
+        ('atoms', ['patterns/atoms']),
+        ('molecules', ['patterns/molecules']),
+        ('organisms', ['patterns/organisms']),
+        ('templates', ['patterns/templates']),
+        ('pages', ['patterns/pages']),
+    ),
 }
 
 
diff --git a/pattern_library/monkey_utils.py b/pattern_library/monkey_utils.py
index a030b220..3e854215 100644
--- a/pattern_library/monkey_utils.py
+++ b/pattern_library/monkey_utils.py
@@ -51,7 +51,7 @@ def node_render(context):
                         # Render pattern, if raw string is not defined
                         template_name = tag_config['template_name']
                         request = context.get('request')
-                        result = render_pattern(request, template_name)
+                        result = render_pattern(request, template_name, allow_non_patterns=True)
                         tag_overridden = True
 
                     # TODO: Allow objects with the __str__ method
diff --git a/pattern_library/utils.py b/pattern_library/utils.py
index 6c6d1849..e139b7b9 100644
--- a/pattern_library/utils.py
+++ b/pattern_library/utils.py
@@ -182,8 +182,8 @@ def get_pattern_markdown(template_name):
         return markdown.markdown(f.read())
 
 
-def render_pattern(request, template_name):
-    if not is_pattern(template_name):
+def render_pattern(request, template_name, allow_non_patterns=False):
+    if not allow_non_patterns and not is_pattern(template_name):
         raise TemplateIsNotPattern
 
     context = get_pattern_context(template_name)
diff --git a/tests/templates/non-patterns/include.html b/tests/templates/non-patterns/include.html
new file mode 100644
index 00000000..565de877
--- /dev/null
+++ b/tests/templates/non-patterns/include.html
@@ -0,0 +1,4 @@
+SHOWME
+{% if False %}
+DONTSHOWME
+{% endif %}
diff --git a/tests/templates/patterns/atoms/test_includes/test_includes.html b/tests/templates/patterns/atoms/test_includes/test_includes.html
new file mode 100644
index 00000000..838d5bb6
--- /dev/null
+++ b/tests/templates/patterns/atoms/test_includes/test_includes.html
@@ -0,0 +1 @@
+{% include 'non-patterns/include.html' %}

From b7ca5bbae53717c38282d05e858d10b3f8da8424 Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Sat, 30 Nov 2019 17:02:20 +0000
Subject: [PATCH 11/12] Add tests for non-pattern allowed rendering

---
 tests/templates/non-patterns/include.html     |  2 +-
 .../atoms/test_includes/test_includes.html    |  4 ++++
 .../atoms/test_includes/test_includes.yaml    |  4 ++++
 tests/tests/test_views.py                     | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/templates/patterns/atoms/test_includes/test_includes.yaml

diff --git a/tests/templates/non-patterns/include.html b/tests/templates/non-patterns/include.html
index 565de877..db9fcf7f 100644
--- a/tests/templates/non-patterns/include.html
+++ b/tests/templates/non-patterns/include.html
@@ -1,4 +1,4 @@
 SHOWME
 {% if False %}
-DONTSHOWME
+HIDEME
 {% endif %}
diff --git a/tests/templates/patterns/atoms/test_includes/test_includes.html b/tests/templates/patterns/atoms/test_includes/test_includes.html
index 838d5bb6..859af903 100644
--- a/tests/templates/patterns/atoms/test_includes/test_includes.html
+++ b/tests/templates/patterns/atoms/test_includes/test_includes.html
@@ -1 +1,5 @@
+{% load test_tags %}
+
 {% include 'non-patterns/include.html' %}
+
+{% error_tag include %}
diff --git a/tests/templates/patterns/atoms/test_includes/test_includes.yaml b/tests/templates/patterns/atoms/test_includes/test_includes.yaml
new file mode 100644
index 00000000..4be920d4
--- /dev/null
+++ b/tests/templates/patterns/atoms/test_includes/test_includes.yaml
@@ -0,0 +1,4 @@
+tags:
+  error_tag:
+    include:
+      template_name: 'non-patterns/include.html'
diff --git a/tests/tests/test_views.py b/tests/tests/test_views.py
index eb8a9717..802d0721 100644
--- a/tests/tests/test_views.py
+++ b/tests/tests/test_views.py
@@ -52,3 +52,22 @@ def test_pretty_names_from_filename(self):
 
         self.assertEqual(display_link.text.strip(), "test_molecule_no_context.html")
         self.assertEqual(render_link.text.strip(), pattern_path)
+
+    def test_includes(self):
+        pattern_path = 'patterns/atoms/test_includes/test_includes.html'
+        display_url = reverse(
+            'pattern_library:display_pattern',
+            kwargs={'pattern_template_name': pattern_path},
+        )
+        render_url = reverse(
+            'pattern_library:render_pattern',
+            kwargs={'pattern_template_name': pattern_path},
+        )
+
+        display_response = self.client.get(display_url)
+        self.assertEqual(display_response.status_code, 200)
+
+        render_response = self.client.get(render_url)
+        self.assertEqual(render_response.status_code, 200)
+        self.assertContains(render_response, 'SHOWME')
+        self.assertNotContains(render_response, 'HIDEME')

From f6a89e9c0351fba24f9a8c51d9c9456961d5288f Mon Sep 17 00:00:00 2001
From: Ben Dickinson <ben.dickinson@torchbox.com>
Date: Wed, 29 Jul 2020 09:16:48 +0100
Subject: [PATCH 12/12] Fix unmatched closing tag

---
 pattern_library/templates/pattern_library/pattern_group.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pattern_library/templates/pattern_library/pattern_group.html b/pattern_library/templates/pattern_library/pattern_group.html
index a3aa1d85..dd44d18e 100644
--- a/pattern_library/templates/pattern_library/pattern_group.html
+++ b/pattern_library/templates/pattern_library/pattern_group.html
@@ -6,7 +6,7 @@ <h3 class="list__item-heading list__item-heading--small list__item-heading--ligh
                 <path d="M88 80l-48 48 16 16 64-64-64-64-16 16 48 48z" />
             </svg>
             {{ group_name }}
-        </h4>
+        </h3>
         {% if pattern_templates.template_groups %}
             {% include "pattern_library/pattern_group.html" with groups=pattern_templates.template_groups %}
         {% endif %}