github.com/blag
1
0
Fork 1
mirror of https://github.com/venthur/blag.git synced 2025-11-25 20:52:43 +00:00
Code Activity

added global site variables to environment

Browse Source
This commit is contained in:
Bastian Venthur
2021-03-08 21:35:51 +01:00
parent 3874d19371
commit d778d01e78
5 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
blag/blag.py
View File

@@ -97,6 +97,36 @@ def get_config(configfile):
return config['main'] return config['main']
def environment_factory(template_dir=None, globals_=None):
"""Environment factory.
Creates a Jinja2 Environment with the default templates and
additional templates from `template_dir` loaded. If `globals` are
provided, they are attached to the environment and thus available to
all contexts.
Parameters
----------
template_dir : str
globals_ : dict
Returns
-------
jinja2.Environment
"""
# first we try the custom templates, and fall back the ones provided
# by blag
loaders = []
if template_dir:
loaders.append(FileSystemLoader([template_dir]))
loaders.append(PackageLoader('blag', 'templates'))
env = Environment(loader=ChoiceLoader(loaders))
if globals_:
env.globals = globals_
return env
def build(args): def build(args):
os.makedirs(f'{args.output_dir}', exist_ok=True) os.makedirs(f'{args.output_dir}', exist_ok=True)
convertibles = [] convertibles = []
@@ -124,12 +154,8 @@ def build(args):
config = get_config('config.ini') config = get_config('config.ini')
env = Environment( env = environment_factory(args.template_dir, dict(site=config))
loader=ChoiceLoader([
FileSystemLoader([args.template_dir]),
PackageLoader('blag', 'templates'),
])
)
page_template = env.get_template('page.html') page_template = env.get_template('page.html')
article_template = env.get_template('article.html') article_template = env.get_template('article.html')
archive_template = env.get_template('archive.html') archive_template = env.get_template('archive.html')

2
blag/templates/archive.html
View File

@@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}{{ title }}{% endblock %} {% block title %}{{ site.title }}{% endblock %}
{% block content %} {% block content %}
{% for entry in archive %} {% for entry in archive %}

4
blag/templates/base.html
View File

@@ -4,6 +4,10 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="{{ site.author }}">
{%- if description %}
<meta name="description" content="{{ description }}">
{% endif %}
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
</head> </head>

10
tests/test_blag.py
View File

@@ -99,3 +99,13 @@ author = a. u. thor
config_parsed = blag.get_config(configfile) config_parsed = blag.get_config(configfile)
assert config_parsed['base_url'] == 'https://example.com/' assert config_parsed['base_url'] == 'https://example.com/'
def test_environment_factory():
globals_ = {
'foo': 'bar',
'test': 'me'
}
env = blag.environment_factory(globals_=globals_)
assert env.globals['foo'] == 'bar'
assert env.globals['test'] == 'me'

16
tests/test_templates.py
View File

@@ -1,14 +1,19 @@
import datetime import datetime
from jinja2 import Environment, PackageLoader
import pytest import pytest
from blag import blag
@pytest.fixture @pytest.fixture
def environment(): def environment():
env = Environment( site = {
loader=PackageLoader('blag', 'templates') 'base_url': 'site base_url',
) 'title': 'site title',
'description': 'site description',
'author': 'site author',
}
env = blag.environment_factory(globals_=dict(site=site))
yield env yield env
@@ -65,11 +70,10 @@ def test_archive(archive_template):
} }
archive = [entry] archive = [entry]
ctx = { ctx = {
'title': 'this is the title',
'archive': archive, 'archive': archive,
} }
result = archive_template.render(ctx) result = archive_template.render(ctx)
assert 'this is the title' in result assert 'site title' in result
assert 'this is a title' in result assert 'this is a title' in result
assert '1980-05-09' in result assert '1980-05-09' in result