Merge pull request #68 from moremoban/lml3-optimization

✨ template types using the same template engine will be grouped

Author: chfw

.moban.cd/changelog.yml

@@ -1,6 +1,13 @@
 name: moban
 organisation: moremoban
 releases:
+- changes:
+  - action: Updated
+    details:
+    - templates using the same template engine will be templated as a group
+    - update lml dependency to 0.0.3
+  date: unreleased
+  version: 0.2.1
 - changes:
   - action: Added
     details:

.moban.cd/moban.yml

@@ -3,8 +3,8 @@ organisation: moremoban
 author: C. W.
 contact: [email protected]
 license: MIT
-version: 0.2.0
-current_version: 0.2.0
+version: 0.2.1
+current_version: 0.2.1
 release: 0.2.0
 branch: master
 command_line_interface: "moban"
@@ -15,7 +15,7 @@ keywords:
 dependencies:
   - pyyaml>=3.11
   - jinja2>=2.7.1
-  - lml==0.0.2
+  - lml==0.0.3
   - crayons
 description: Yet another jinja2 cli command for static text generation
 scm_host: github.com

CHANGELOG.rst

@@ -1,6 +1,15 @@
 Change log
 ================================================================================
 
+0.2.1 - unreleased
+--------------------------------------------------------------------------------
+
+Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. templates using the same template engine will be templated as a group
+#. update lml dependency to 0.0.3
+
 0.2.0 - 11-06-2018
 --------------------------------------------------------------------------------
 

moban/engine.py

@@ -69,8 +69,8 @@ def __init__(self, template_dirs, context_dirs):
         for test_name, test_function in _TESTS.get_all():
             self.jj2_environment.tests[test_name] = test_function
 
-        for global_name, helper_obj in _GLOBALS.get_all():
-            self.jj2_environment.globals[global_name] = helper_obj.payload
+        for global_name, dict_obj in _GLOBALS.get_all():
+            self.jj2_environment.globals[global_name] = dict_obj
 
         self.context = Context(context_dirs)
         self.template_dirs = template_dirs

moban/extensions.py

@@ -64,14 +64,6 @@ def __init__(self):
         )
 
 
-class PluginHelper(object):
-
-    def __init__(self, identifier, payload_obj):
-        self.payload = payload_obj
-        self.__name__ = identifier
-
-
 def jinja_global(identifier, dict_obj):
     plugin = PluginInfo(constants.JINJA_GLOBALS_EXTENSION, tags=[identifier])
-    helper = PluginHelper(identifier, dict_obj)
-    plugin(helper)
+    plugin(dict_obj)

moban/mobanfile.py

@@ -34,9 +34,11 @@ def handle_targets(merged_options, targets):
     for file_list in list_of_templating_parameters:
         _, extension = os.path.splitext(file_list[0])
         template_type = extension[1:]
-        if template_type not in ENGINES.all_types():
-            template_type = merged_options[constants.LABEL_TEMPLATE_TYPE]
-        jobs_for_each_engine[template_type].append(file_list)
+        primary_template_type = ENGINES.get_primary_key(template_type)
+        if primary_template_type is None:
+            primary_template_type = merged_options[
+                constants.LABEL_TEMPLATE_TYPE]
+        jobs_for_each_engine[primary_template_type].append(file_list)
 
     count = 0
     for template_type in jobs_for_each_engine.keys():

requirements.txt

@@ -1,4 +1,4 @@
 pyyaml>=3.11
 jinja2>=2.7.1
-lml==0.0.2
+lml==0.0.3
 crayons

setup.py

@@ -11,7 +11,7 @@
 
 NAME = 'moban'
 AUTHOR = 'C. W.'
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 EMAIL = '[email protected]'
 LICENSE = 'MIT'
 ENTRY_POINTS = {
@@ -46,7 +46,7 @@
 INSTALL_REQUIRES = [
     'pyyaml>=3.11',
     'jinja2>=2.7.1',
-    'lml==0.0.2',
+    'lml==0.0.3',
     'crayons',
 ]
 SETUP_COMMANDS = {}