give tables a lighter border

closes #2

incorporealcms/__init__.py

@@ -3,7 +3,7 @@ import logging
 import os
 from logging.config import dictConfig
 
-from flask import Flask, request
+from flask import Flask, request, send_from_directory
 
 from ._version import get_versions
 
@@ -17,12 +17,11 @@ def create_app(instance_path=None, test_config=None):
     # if it doesn't already exist, create the instance folder
     os.makedirs(app.instance_path, exist_ok=True)
 
-    if test_config is None:
     # load defaults from config provided with the application
     app.config.from_object('incorporealcms.config.Config')
     # load specific instance configurations
     app.config.from_pyfile('config.py', silent=True)
-    else:
+    if test_config:
         app.config.from_mapping(test_config)
 
     dictConfig(app.config['LOGGING'])
@@ -33,7 +32,17 @@ def create_app(instance_path=None, test_config=None):
 
     @app.before_request
     def log_request():
-        logger.info("REQUEST: [ %s ]", request.path)
+        logger.info("REQUEST:  %s %s", request.method, request.path)
+
+    @app.after_request
+    def log_response(response):
+        logger.info("RESPONSE: %s %s: %s", request.method, request.path, response.status)
+        return response
+
+    @app.route(f'/{app.config["MEDIA_DIR"]}/<path:filename>')
+    def media_files(filename):
+        return send_from_directory(os.path.join(app.instance_path, app.config['MEDIA_DIR']),
+                                   filename)
 
     from . import pages
     app.register_blueprint(pages.bp)

incorporealcms/config.py

@@ -31,3 +31,6 @@ class Config(object):
             },
         },
     }
+
+    TITLE_SUFFIX = 'incorporeal.org'
+    MEDIA_DIR = 'media'

incorporealcms/pages.py

@@ -10,18 +10,19 @@ from tzlocal import get_localzone
 logger = logging.getLogger(__name__)
 
 bp = Blueprint('pages', __name__, url_prefix='/')
-md = markdown.Markdown(extensions=['meta'])
+md = markdown.Markdown(extensions=['meta', 'tables'])
 
 
 @bp.route('/', defaults={'path': 'index'})
 @bp.route('/<path:path>')
 def display_page(path):
     """Get the file contents of the requested path and render the file."""
-    resolved_path = page_file_resolver(path)
-    logger.info("received request for path '%s', resolved to '%s'", path, resolved_path)
+    resolved_path = resolve_page_file(path)
+    logger.debug("received request for path '%s', resolved to '%s'", path, resolved_path)
     try:
         with app.open_instance_resource(resolved_path, 'r') as entry_file:
             logger.debug("file '%s' found", resolved_path)
+            parent_navs = generate_parent_navs(path)
             mtime = datetime.datetime.fromtimestamp(os.path.getmtime(entry_file.name), get_localzone())
             entry = entry_file.read()
     except FileNotFoundError:
@@ -31,10 +32,11 @@ def display_page(path):
         content = Markup(md.convert(entry))
         logger.debug("file metadata: %s", md.Meta)
         title = " ".join(md.Meta.get('title')) if md.Meta.get('title') else ""
-        return render_template('base.html', title=title, content=content, mtime=mtime.strftime('%Y-%m-%d %H:%M:%S %Z'))
+        return render_template('base.html', title=title, content=content, navs=parent_navs,
+                               mtime=mtime.strftime('%Y-%m-%d %H:%M:%S %Z'))
 
 
-def page_file_resolver(path):
+def resolve_page_file(path):
     """Manipulate the request path to find appropriate page file.
 
     * convert dir requests to index files
@@ -46,3 +48,23 @@ def page_file_resolver(path):
         path = f'{path}index'
     path = f'pages/{path}.md'
     return path
+
+
+def generate_parent_navs(path):
+    """Create a series of paths/links to navigate up from the given path."""
+    # derive additional path/location stuff based on path
+    resolved_path = resolve_page_file(path)
+    parent_dir = os.path.dirname(resolved_path)
+    parent_path = '/'.join(path[:-1].split('/')[:-1]) + '/'
+
+    logger.debug("path: '%s'; parent path: '%s'; resolved path: '%s'; parent dir: '%s'",
+                 path, parent_path, resolved_path, parent_dir)
+
+    if path in ('index', '/'):
+        return [(app.config['TITLE_SUFFIX'], '/')]
+    else:
+        with app.open_instance_resource(resolved_path, 'r') as entry_file:
+            entry = entry_file.read()
+        _ = Markup(md.convert(entry))
+        page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else f'/{path}'
+        return generate_parent_navs(parent_path) + [(page_name, f'/{path}')]

incorporealcms/static/css/style.css

@@ -1,14 +1,113 @@
 html {
     font-family: sans-serif;
-    padding: 0 1em;
+    padding: 0;
+    padding-bottom: 16px;
+    color: #222;
+}
+
+body {
+    margin: 0;
 }
 
 h1,h2,h3,h4,h5,h6 {
     color: #811610;
 }
 
+h1 {
+    font-size: 2em;
+}
+
+h2 {
+    font-size: 1.5em;
+}
+
+h3 {
+    font-size: 1.25em;
+}
+
+h4 {
+    font-size: 1.17em;
+}
+
+h5 {
+    font-size: 1em;
+}
+
+h6 {
+    font-size: .83em;
+}
+
+a:link {
+    color: #222;
+    font-weight: bold;
+    text-decoration: none;
+    border-bottom: 1px dotted #222;
+}
+
+a:visited {
+    color: #222;
+    font-weight: bold;
+    text-decoration: none;
+    border-bottom: 1px dotted #222;
+}
+
+a:hover {
+    color: #811610;
+    font-weight: bold;
+    text-decoration: none;
+    border-bottom: 1px dotted #222;
+}
+
+a:active {
+    color: #811610;
+    font-weight: bold;
+    text-decoration: none;
+    border-bottom: 1px dotted #222;
+}
+
+section.nav {
+    color: #666;
+    background: #eee;
+    font-size: 0.75em;
+    border-bottom: 1px solid #ccc;
+    padding: 0.25em 0.5em;
+}
+
+section.nav a {
+    color: #666;
+    border-bottom: none;
+}
+
+section.content {
+    font-size: 11pt;
+
+    padding: 0 1em;
+    line-height: 1.5em;
+}
+
 footer {
     display: block;
     font-size: 75%;
     color: #999;
+    padding: 0 1em;
+    margin-top: 15px;
+}
+
+table {
+    border-collapse: collapse;
+}
+
+table, th, td {
+    padding: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 15px;
+}
+
+th {
+    background: #eee;
+}
+
+blockquote {
+    background-color: rgba(120, 120, 120, 0.1);
+    padding: 1px 10px;
 }

incorporealcms/templates/base.html

@@ -1,7 +1,13 @@
 <!doctype html>
-<title>{{ title }}{% if title %} - {% endif %}incorporeal.org</title>
+<title>{{ title }}{% if title %} - {% endif %}{{ config.TITLE_SUFFIX }}</title>
 <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
 <link rel="icon" href="{{ url_for('static', filename='img/favicon.png') }}">
+<section class="nav">
+    {% for nav in navs %}
+    <a href="{{ nav.1 }}">{{ nav.0 }}</a>
+    {% if not loop.last %} &raquo; {% endif %}
+    {% endfor %}
+</section>
 <section class="content">
 {{ content }}
 </section>

requirements/requirements-dev.txt

@@ -5,34 +5,33 @@
 #    pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
 #
 attrs==19.3.0             # via pytest
-click==7.0                # via flask, pip-tools
-coverage==5.0.3           # via pytest-cov
-entrypoints==0.3          # via flake8
-flake8==3.7.9             # via -r requirements/requirements-dev.in
-flask==1.1.1              # via -r requirements/requirements.in
-importlib-metadata==1.5.0  # via pluggy, pytest
+click==7.1.2              # via flask, pip-tools
+coverage==5.1             # via pytest-cov
+flake8==3.8.2             # via -r requirements/requirements-dev.in
+flask==1.1.2              # via -r requirements/requirements.in
+importlib-metadata==1.6.0  # via flake8, markdown, pluggy, pytest
 itsdangerous==1.1.0       # via flask
-jinja2==2.11.1            # via flask
-markdown==3.2.1           # via -r requirements/requirements.in
+jinja2==2.11.2            # via flask
+markdown==3.2.2           # via -r requirements/requirements.in
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via flake8
-more-itertools==8.2.0     # via pytest
-packaging==20.3           # via pytest
-pip-tools==4.5.1          # via -r requirements/requirements-dev.in
+more-itertools==8.3.0     # via pytest
+packaging==20.4           # via pytest
+pip-tools==5.2.0          # via -r requirements/requirements-dev.in
 pluggy==0.13.1            # via pytest
 py==1.8.1                 # via pytest
-pycodestyle==2.5.0        # via flake8
-pyflakes==2.1.1           # via flake8
-pyparsing==2.4.6          # via packaging
-pytest-cov==2.8.1         # via -r requirements/requirements-dev.in
-pytest==5.3.5             # via -r requirements/requirements-dev.in, pytest-cov
-pytz==2019.3              # via tzlocal
-six==1.14.0               # via packaging, pip-tools
-tzlocal==2.0.0            # via -r requirements/requirements.in
+pycodestyle==2.6.0        # via flake8
+pyflakes==2.2.0           # via flake8
+pyparsing==2.4.7          # via packaging
+pytest-cov==2.9.0         # via -r requirements/requirements-dev.in
+pytest==5.4.2             # via -r requirements/requirements-dev.in, pytest-cov
+pytz==2020.1              # via tzlocal
+six==1.15.0               # via packaging, pip-tools
+tzlocal==2.1              # via -r requirements/requirements.in
 versioneer==0.18          # via -r requirements/requirements-dev.in
-wcwidth==0.1.8            # via pytest
-werkzeug==1.0.0           # via flask
+wcwidth==0.1.9            # via pytest
+werkzeug==1.0.1           # via flask
 zipp==3.1.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# pip

requirements/requirements.txt

@@ -4,15 +4,14 @@
 #
 #    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
 #
-click==7.0                # via flask
-flask==1.1.1              # via -r requirements/requirements.in
+click==7.1.2              # via flask
+flask==1.1.2              # via -r requirements/requirements.in
+importlib-metadata==1.6.0  # via markdown
 itsdangerous==1.1.0       # via flask
-jinja2==2.11.1            # via flask
-markdown==3.2.1           # via -r requirements/requirements.in
+jinja2==2.11.2            # via flask
+markdown==3.2.2           # via -r requirements/requirements.in
 markupsafe==1.1.1         # via jinja2
-pytz==2019.3              # via tzlocal
-tzlocal==2.0.0            # via -r requirements/requirements.in
-werkzeug==1.0.0           # via flask
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+pytz==2020.1              # via tzlocal
+tzlocal==2.1              # via -r requirements/requirements.in
+werkzeug==1.0.1           # via flask
+zipp==3.1.0               # via importlib-metadata

setup.py

@@ -8,14 +8,14 @@ HERE = os.path.dirname(os.path.abspath(__file__))
 
 
 def extract_requires():
-    """Get pinned requirements from requirements.in."""
-    with open(os.path.join(HERE, 'requirements/requirements.in'), 'r') as reqs:
+    """Get pinned requirements from requirements.txt."""
+    with open(os.path.join(HERE, 'requirements/requirements.txt'), 'r') as reqs:
         return [line.split(' ')[0] for line in reqs if not line[0] in ('-', '#')]
 
 
 setup(
     name='incorporeal-cms',
-    description='Flask project for running https://incorporeal.org.',
+    description='Flask project for running https://suou.net (and eventually others).',
     url='https://git.incorporeal.org/bss/incorporeal-cms',
     license='GPL3',
     author='Brian S. Stephan',

tests/instance/pages/subdir-with-title/index.md

@@ -0,0 +1,3 @@
+Title:  SUB!
+
+# subdir-with-title

tests/instance/pages/subdir-with-title/page.md

@@ -0,0 +1 @@
+test page

tests/instance/pages/subdir/index.md

@@ -0,0 +1 @@
+# another page

tests/instance/pages/subdir/page.md

@@ -0,0 +1,3 @@
+Title:  Page
+
+# hello

tests/test_factory.py

@@ -0,0 +1,29 @@
+"""Test basic configuration stuff."""
+import os
+
+from incorporealcms import create_app
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_config():
+    """Test create_app without passing test config."""
+    instance_path = os.path.join(HERE, 'instance')
+    assert not create_app(instance_path=instance_path).testing
+    assert create_app(instance_path=instance_path, test_config={"TESTING": True}).testing
+
+
+def test_title_override():
+    """Test that a configuration with a specific title overrides the default."""
+    instance_path = os.path.join(HERE, 'instance')
+    app = create_app(instance_path=instance_path, test_config={'TITLE_SUFFIX': 'suou.net'})
+    client = app.test_client()
+    response = client.get('/no-title')
+    assert response.status_code == 200
+    assert b'<title>suou.net</title>' in response.data
+
+
+def test_media_file_access(client):
+    response = client.get('/media/favicon.png')
+    assert response.status_code == 200
+    assert response.headers['content-type'] == 'image/png'

tests/test_pages.py

@@ -1,19 +1,19 @@
 """Test page views and helper methods."""
 import re
 
-from incorporealcms.pages import page_file_resolver
+from incorporealcms.pages import generate_parent_navs, resolve_page_file
 
 
-def test_page_file_resolver_dir_to_index():
-    assert page_file_resolver('foo/') == 'pages/foo/index.md'
+def test_resolve_page_file_dir_to_index():
+    assert resolve_page_file('foo/') == 'pages/foo/index.md'
 
 
-def test_page_file_resolver_subdir_to_index():
-    assert page_file_resolver('foo/bar/') == 'pages/foo/bar/index.md'
+def test_resolve_page_file_subdir_to_index():
+    assert resolve_page_file('foo/bar/') == 'pages/foo/bar/index.md'
 
 
-def test_page_file_resolver_other_requests_fine():
-    assert page_file_resolver('foo/baz') == 'pages/foo/baz.md'
+def test_resolve_page_file_other_requests_fine():
+    assert resolve_page_file('foo/baz') == 'pages/foo/baz.md'
 
 
 def test_page_that_exists(client):
@@ -44,3 +44,33 @@ def test_page_has_modified_timestamp(client):
     response = client.get('/')
     assert response.status_code == 200
     assert re.search(r'Last modified: ....-..-.. ..:..:.. ...', response.data.decode()) is not None
+
+
+def test_generate_page_navs_index(app):
+    with app.app_context():
+        assert generate_parent_navs('/') == [('incorporeal.org', '/')]
+
+
+def test_generate_page_navs_alternate_index(app):
+    with app.app_context():
+        assert generate_parent_navs('index') == [('incorporeal.org', '/')]
+
+
+def test_generate_page_navs_subdir_index(app):
+    with app.app_context():
+        assert generate_parent_navs('subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')]
+
+
+def test_generate_page_navs_subdir_real_page(app):
+    with app.app_context():
+        assert generate_parent_navs('subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'),
+                                                       ('Page', '/subdir/page')]
+
+
+def test_generate_page_navs_subdir_with_title_parsing_real_page(app):
+    with app.app_context():
+        assert generate_parent_navs('subdir-with-title/page') == [
+            ('incorporeal.org', '/'),
+            ('SUB!', '/subdir-with-title/'),
+            ('/subdir-with-title/page', '/subdir-with-title/page')
+        ]