Load all files in a data directory: "_all.yml" and other files if present.

.gitignore

@@ -102,3 +102,10 @@ pip-selfcheck.json
 # Generated folders
 public/
 
+
+Pipfile
+
+Pipfile\.lock
+
+.DS_Store
+statik.code-workspace

.travis.yml

@@ -1,8 +1,22 @@
 language: python
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
+
+# Takes inspiration from https://github.com/tornadoweb/tornado/blob/master/.travis.yml
+.mixins:
+- &xenial-mixin
+  dist: xenial
+  sudo: true
+  addons:
+    apt:
+      packages:
+        - libgnutls-dev
+jobs:
+  include:
+    - python: 2.7
+    - python: 3.5
+    - python: 3.6
+    - <<: *xenial-mixin
+      python: 3.7
+
 install:
   - "pip install -r requirements.txt"
 script:

CHANGELOG.md

@@ -4,6 +4,25 @@ This is the **Statik** change log as of version `0.6.0`.
 
 ## Release History
 
+### `v0.22.2` - 20 October 2018
+
+* Merging #74 to better organise the growing list of CLI arguments.
+
+### `v0.22.1` - 8 October 2018
+
+* Minor fix to add missing `paramiko` dependency
+
+### `v0.22.0` - 8 October 2018
+
+* Merges #68
+* Merges #73 to add SFTP upload functionality
+* Updates dependency versions in `requirements.txt`
+* Updates Markdown package integration to use new API
+
+### `v0.21.3` - 15 February 2018
+
+* Merging #65 to fix #64.
+
 ### `v0.21.2` - 12 February 2018
 
 * Attempting to fix issues #50 and #63 - automatic translation of special Unicode characters

files.txt

@@ -0,0 +1,10 @@
+/usr/local/lib/python3.7/site-packages/statik-0.21.2-py3.7.egg
+/usr/local/bin/statik
+/usr/local/bin/pystache
+/usr/local/bin/pystache-test
+/usr/local/bin/httpwatcher
+/usr/local/bin/slugify
+/usr/local/bin/markdown_py
+/usr/local/bin/futurize
+/usr/local/bin/pasteurize
+/usr/local/bin/watchmedo

requirements.txt

@@ -1,13 +1,21 @@
-future>=0.16.0
-jinja2>=2.8
-PyYAML>=3.11
-SQLAlchemy>=1.0.14
-markdown>=2.6.6
-python-slugify>=1.2.1
-six>=1.10.0
-lipsum>=0.1.1
-httpwatcher>=0.5.1
-mlalchemy>=0.2.1
-pystache>=0.5.4
-colorlog>=3.1.0
-python-dateutil>=2.6.1
+wheel
+argh==0.26.2
+colorlog==3.1.4
+future==0.16.0
+httpwatcher==0.5.1
+Jinja2==2.10
+lipsum==0.1.2
+Markdown==3.0.1
+MarkupSafe==1.0
+mlalchemy==0.2.2
+pathtools==0.1.2
+pystache==0.5.4
+python-dateutil==2.7.3
+python-slugify==1.2.6
+PyYAML==3.13
+six==1.11.0
+SQLAlchemy==1.2.12
+tornado==5.1.1
+Unidecode==1.0.22
+watchdog==0.9.0
+paramiko==2.4.2

setup.py

@@ -54,6 +54,7 @@ def get_version():
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Utilities",
     ]

statik/__init__.py

@@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 
-__version__ = "0.21.2"
+__version__ = "0.22.2"
+

statik/common.py

@@ -56,7 +56,8 @@ class ContentLoadable(object):
     loading content and metadata from a Markdown file.
     """
     def __init__(self, filename=None, file_type=None, from_string=None, from_dict=None,
-            name=None, markdown_config=None, encoding='utf-8', error_context=None):
+            name=None, markdown_config=None, encoding='utf-8', error_context=None,
+            content_field = None):
         self.vars = None
         self.content = None
         self.file_content = None
@@ -102,7 +103,6 @@ def __init__(self, filename=None, file_type=None, from_string=None, from_dict=No
                 "filename", "from_string", "from_dict",
                 context=self.error_context
             )
-
         if name is not None:
             self.name = name
         elif self.filename is not None:
@@ -112,7 +112,23 @@ def __init__(self, filename=None, file_type=None, from_string=None, from_dict=No
                 "name", "filename",
                 context=self.error_context
             )
-
+        markdown_ext = [
+                MarkdownYamlMetaExtension(),
+                MarkdownLoremIpsumExtension(error_context=self.error_context)
+            ]
+        if self.markdown_config.enable_permalinks:
+            markdown_ext.append(
+                MarkdownPermalinkExtension(
+                    permalink_text=self.markdown_config.permalink_text,
+                    permalink_class=self.markdown_config.permalink_class,
+                    permalink_title=self.markdown_config.permalink_title,
+                )
+            )
+        markdown_ext.extend(self.markdown_config.extensions)
+        md = Markdown(
+            extensions=markdown_ext,
+            extension_configs=self.markdown_config.extension_config
+            )
         # if it wasn't loaded from a dictionary
         if self.vars is None:
             if self.file_type is None:
@@ -127,26 +143,11 @@ def __init__(self, filename=None, file_type=None, from_string=None, from_dict=No
                 if not isinstance(self.vars, dict):
                     self.vars = {}
             else:
-                markdown_ext = [
-                    MarkdownYamlMetaExtension(),
-                    MarkdownLoremIpsumExtension(error_context=self.error_context)
-                ]
-                if self.markdown_config.enable_permalinks:
-                    markdown_ext.append(
-                        MarkdownPermalinkExtension(
-                            permalink_text=self.markdown_config.permalink_text,
-                            permalink_class=self.markdown_config.permalink_class,
-                            permalink_title=self.markdown_config.permalink_title,
-                        )
-                    )
-                markdown_ext.extend(self.markdown_config.extensions)
-
-                md = Markdown(
-                    extensions=markdown_ext,
-                    extension_configs=self.markdown_config.extension_config
-                )
                 self.content = md.convert(self.file_content)
                 self.vars = md.meta
+        else:
+            if (content_field is not None) and (content_field in self.vars):
+                self.content = md.convert(self.vars[content_field])
 
         if isinstance(self.vars, dict):
             self.vars = dict_strip(self.vars)

statik/context.py

@@ -44,12 +44,12 @@ def __repr__(self):
     def __str__(self):
         return repr(self)
 
-    def build_dynamic(self, db, safe_mode=False):
+    def build_dynamic(self, db, extra=None, safe_mode=False):
         """Builds the dynamic context based on our current dynamic context entity and the given
         database."""
         result = dict()
         for var, query in iteritems(self.dynamic):
-            result[var] = db.query(query, safe_mode=safe_mode)
+            result[var] = db.query(query, safe_mode=safe_mode, additional_locals=extra)
         return result
 
     def build_for_each(self, db, safe_mode=False, extra=None):
@@ -68,7 +68,7 @@ def build(self, db=None, safe_mode=False, for_each_inst=None, extra=None):
         result = copy(self.initial)
         result.update(self.static)
         if self.dynamic:
-            result.update(self.build_dynamic(db, safe_mode=safe_mode))
+            result.update(self.build_dynamic(db, extra=extra, safe_mode=safe_mode))
         if self.for_each and for_each_inst:
             result.update(self.build_for_each(db, safe_mode=safe_mode, extra=extra))
         if isinstance(extra, dict):