提交: 7a14eb11098977b0148a595bbbc6c7ccf518da09 - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• 修訂: 7a14eb11098977b0148a595bbbc6c7ccf518da09 (tree)
• 時間: 2023-11-01 23:12:46
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Aside: refactor RPY's Template (class), rename the (1st) parameter: template= to name=, as create a (Jinja) Template, based on a file(name)

Change Summary

• modified: castle/writers/RPy/templates.py
• modified: pytst/writers/RPy/test_0_templating.py

差異

diff -r 0d8bb1bc8200 -r 7a14eb110989 castle/writers/RPy/templates.py
--- a/castle/writers/RPy/templates.py	Tue Oct 31 20:41:20 2023 +0100
+++ b/castle/writers/RPy/templates.py	Wed Nov 01 15:12:46 2023 +0100
@@ -10,23 +10,25 @@
     return tuple(d if d.is_absolute() else top_dir/d  for d in (Path(d) for d in search_path))
 
 class Template():
-    def __init__(self, template=None, *, top_dir=None, search_path=("templates",)):
-        if isinstance(search_path, (str, Path)): search_path=(search_path,) # make it a sequence 
+    def __init__(self, name=None, *, top_dir=None, search_path=("templates",)):
+        if isinstance(search_path, (str, Path)): search_path=(search_path,) # make it a sequence
         if top_dir is None:
             top_dir= Path(os.path.realpath(__file__)).parent #use module-dir a top, "templates/" works
         search_path = _addTopDir(top_dir, search_path)
 
-        logger.info(f"template={template}, top_dir={top_dir}, search_path={search_path}")
+        logger.info(f"(template)name={name}, top_dir={top_dir}, search_path={search_path}")
 
         self.environment = jinja.Environment(loader=jinja.FileSystemLoader(search_path), trim_blocks=True, lstrip_blocks=True)  # pragma: no mutate
-        self.def_template = self.environment.get_template(template) if template else None
+        self.default_template = self.environment.get_template(name) if name else None
 
+    @property
+    def _template(self, name=None):
+        return self.environment.get_template(name) if name  else self.default_template
 
 
-    def render(self, template=None, **kwargs):
-        if not template and not self.def_template:
-            raise FileNotFoundError("No template nor default template specified")                    # pragma: no mutate
+    def render(self, name=None, **kwargs):
+        if not name and not self.default_template:
+            raise FileNotFoundError("No template (name), nor default template specified")                    # pragma: no mutate
 
-        template = self.environment.get_template(template) if template  else self.def_template
-        return template.render(**kwargs)
+        return self._template.render(**kwargs)
 

diff -r 0d8bb1bc8200 -r 7a14eb110989 pytst/writers/RPy/test_0_templating.py
--- a/pytst/writers/RPy/test_0_templating.py	Tue Oct 31 20:41:20 2023 +0100
+++ b/pytst/writers/RPy/test_0_templating.py	Wed Nov 01 15:12:46 2023 +0100
@@ -14,7 +14,7 @@
 
 def test_simpel_template():
     HW_file = 'HW_template.txt'
-    template = RPy.Template(template=HW_file, search_path=template_a_dir)
+    template = RPy.Template(name=HW_file, search_path=template_a_dir)
     out=template.render(Hello='{{Hello}}', World='{{World}}')           # Generates itself
 
     ref=open(template_a_dir / HW_file).read()
@@ -22,7 +22,7 @@
 
 def test_simpel_template_2():
     HW_file = 'HW_template.txt'
-    template = RPy.Template(template=HW_file, top_dir=my_dir)
+    template = RPy.Template(name=HW_file, top_dir=my_dir)
     out=template.render(Hello='{{Hello}}', World='{{World}}')           # Generates itself
 
     ref=open(template_a_dir / HW_file).read()
@@ -33,7 +33,7 @@
     child = 'child.txt'
     base  = 'base.txt' # Not used to render, only to test
 
-    template = RPy.Template(template=child, search_path=template_a_dir)
+    template = RPy.Template(name=child, search_path=template_a_dir)
     out = template.render(v1 ='Var 1', v2 ='Var 2', TOP='top: but not completely', BOTTOM="bottom, really")
 
     ref_lines = open(template_a_dir / base).readlines()
@@ -52,7 +52,7 @@
 def test_template_parts():
     big_file  = "big.txt"                                             # Uses: part-include.txt &  part-import.txt
 
-    template = RPy.Template(template=big_file, search_path=template_a_dir)
+    template = RPy.Template(name=big_file, search_path=template_a_dir)
     out = template.render()
 
     assert 'INCLUDED' in out, "this line in part-include.txt"