Merge branch 'release/3.9.6'

mikitex70 · Apr 24, 2024 · 329f74a · 329f74a
2 parents ff45d1c + e362985
commit 329f74a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,18 @@
 # Changelog
 
 
-## 3.9.5 (2024-04-22)
+## 3.9.6 (2024-04-24)
 
-### Fix
+### New
 
-* Fixed caching with png diagrams with no links (fixes #27) [Michele Tessaro]
+* `cachedir` is auto-created if missing (implements #96) [Michele Tessaro]
 
-### Other
 
-* @łip. [Michele Tessaro]
+## 3.9.5 (2024-04-22)
+
+### Fix
+
+* Fixed caching with png diagrams without hyperlinks (fixes #27) [Michele Tessaro]
 
 
 ## 3.9.4 (2024-03-26)

diff --git a/plantuml_markdown/plantuml_markdown.py b/plantuml_markdown/plantuml_markdown.py
@@ -338,6 +338,7 @@ def _render_diagram(self, code: str, requested_format: str) -> Tuple[Optional[by
         diagram = None
 
         if self._cachedir:
+            os.makedirs(self._cachedir, exist_ok=True)
             diagram_hash = "%08x" % (adler32(code.encode('UTF-8')) & 0xffffffff)
             cached_diagram_file = os.path.expanduser(
                     os.path.join(self._cachedir, diagram_hash + '.' + requested_format))

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setuptools.setup(
     name="plantuml-markdown",
-    version="3.9.5",
+    version="3.9.6",
     author="Michele Tessaro",
     author_email="michele.tessaro.tex@gmail.com",
     description="A PlantUML plugin for Markdown",

diff --git a/test/test_plantuml.py b/test/test_plantuml.py
@@ -795,3 +795,20 @@ def test_retries(self):
             text = self.text_builder.diagram('A -> B').format('txt').build()
             self.assertEqual('<pre><code class="text">dummy</code></pre>',
                              self.md.convert(text))
+
+    def test_cachedir(self):
+        """
+        Verify that `cachedir` is created if it does not exist
+        """
+        temp_dir = tempfile.TemporaryDirectory()
+        cache_dir = os.path.join(temp_dir.name, 'cache', 'dir')
+        self.md = markdown.Markdown(extensions=['plantuml_markdown'],
+                                    extension_configs={
+                                        'plantuml_markdown': {
+                                            'cachedir': cache_dir,
+                                        }
+                                    })
+        text = self.text_builder.diagram("A --> B").build()
+        self.md.convert(text)
+        self.assertTrue(os.path.exists(cache_dir))
+        temp_dir.cleanup()