Test countries

.gitignore

@@ -3,11 +3,11 @@
 *.*~
 *.egg
 *.egg-info
-*.odt
+/*.odt
 *.txt
 .tox
 .cache
 .vscode
 dist
 build
-eggs
+eggs

Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.6.4
+
+RUN pip install \
+  pytest==3.3.2
+
+COPY ./* /opt/secretary/
+
+RUN pip install -e /opt/secretary

secretary.py

@@ -35,7 +35,8 @@
 from uuid import uuid4
 from xml.dom.minidom import parseString
 from xml.parsers.expat import ExpatError, ErrorString
-from jinja2 import Environment, Undefined, Markup
+from jinja2 import Environment, Undefined
+from markupsafe import Markup
 
 PY2 = sys.version_info < (3, 0)
 
@@ -141,14 +142,13 @@ def __init__(self, environment=None, **kwargs):
             self.environment.filters['pad'] = pad_string
             self.environment.filters['markdown'] = self.markdown_filter
             self.environment.filters['image'] = self.image_filter
-            self.environment.globals['SafeValue'] = jinja2.Markup
+            self.environment.globals['SafeValue'] = Markup
 
         self.media_path = kwargs.pop('media_path', '')
         self.media_callback = self.fs_loader
 
         self._compile_tags_expressions()
 
-    @jinja2.evalcontextfilter
     def finalize_value(self, value, *args):
         """Escapes variables values."""
         if isinstance(value, Markup):

setup.py

@@ -36,7 +36,7 @@ def run_tests(self):
     py_modules=['secretary', 'markdown_map'],
     platforms='any',
     install_requires=[
-        'Jinja2', 'markdown2'
+        'Jinja2>=3', 'markdown2', 'MarkupSafe'
     ],
     tests_require=['pytest'],
     cmdclass={'test': PyTest},

tests/README.md

@@ -0,0 +1,35 @@
+# Secretary tests
+
+You can run tests on your local Python environment with the command :
+
+<pre>
+pytest
+</pre>
+
+## Docker image
+
+You can also build a docker image dedicated to your tests :
+
+<pre>
+docker build -t phe/secretary .
+</pre>
+
+Then you can run the tests in a container :
+
+<pre>
+docker run -ti \
+  -v $PWD:/opt/secretary \
+  -e "PYTHONPATH=/opt" \
+  -w /opt/secretary \
+  phe/secretary pytest -v
+</pre>
+
+For special need, you may prefer to run a shell :
+
+<pre>
+docker run -ti \
+  -v $PWD:/opt/secretary \
+  -e "PYTHONPATH=/opt" \
+  -w /opt/secretary \
+  phe/secretary /bin/bash
+</pre>

tests/tools.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+import os
+
+def relative_path(rel_path) :
+    '''Give a full path relative to this file'''
+    return os.path.join(os.path.dirname(__file__), rel_path)
+
+
+def compare_odt_files(file1, file2):
+    '''Compare two LibreOffice odt file
+    returns True if they are equal
+    '''
+    #TODO: check content
+    assert True