Merge branch 'develop'

mikitex70 · Aug 1, 2022 · 0f21494 · 0f21494
2 parents 9f968f6 + 55170a1
commit 0f21494
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,4 @@ env_test
 .env
 .eggs
 .env*
+/config.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 
 
+## 3.6.3 (2022-08-01)
+
+### Fix
+
+* Removed unused `plantuml` import. [Michele Tessaro]
+
+* Doc: fix typos. [Kian-Meng Ang]
+
+
 ## 3.6.2 (2022-07-25)
 
 ### Fix

diff --git a/plantuml_markdown.py b/plantuml_markdown.py
@@ -411,22 +411,22 @@ def _readFileRec(self, lines: List[str], directory: str) -> List[str]:
         result: List[str] = []
 
         for line in lines:
-            line = line.strip()
+            line_striped = line.strip()
 
             # preprocessor, define variable, new syntax
-            match = re.search(r'!(?P<varname>\$?\w+)\s+=\s+"(?P<value>.*)"', line)
+            match = re.search(r'!(?P<varname>\$?\w+)\s+=\s+"(?P<value>.*)"', line_striped)
 
             if not match:
                 # preprocessor, define variable, old syntax
-                match = re.search(r'^!define (?P<varname>\w+)\s+(?P<value>.*)', line)
+                match = re.search(r'^!define (?P<varname>\w+)\s+(?P<value>.*)', line_striped)
 
             if match:
                 # variable definition, save the mapping as the value can be used in !include directives
                 self._definitions[match.group('varname')] = match.group('value')
                 result.append(line)
-            elif line.startswith("!include"):
-                result.append(self._readInclLine(line, directory))
-            elif line.startswith("@startuml") or line.startswith("@enduml"):
+            elif line_striped.startswith("!include"):
+                result.append(self._readInclLine(line_striped, directory))
+            elif line_striped.startswith("@startuml") or line_striped.startswith("@enduml"):
                 # remove startuml and enduml tags as plantuml POST method doesn't like it in include files
                 # we will wrap the whole combined text between start and end tags at the end
                 continue

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setuptools.setup(
     name="plantuml-markdown",
-    version="3.6.2",
+    version="3.6.3",
     author="Michele Tessaro",
     author_email="[email protected]",
     description="A PlantUML plugin for Markdown",

diff --git a/test/data/yaml_diagram.html b/test/data/yaml_diagram.html
@@ -0,0 +1 @@
+<p><img src="data:image/png;base64,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" class="uml" alt="uml diagram" title="" /></p>
diff --git a/test/plantuml b/test/plantuml
@@ -1,4 +1,4 @@
 #!/bin/sh
-PLANTUML_VER="1.2021.12"
+PLANTUML_VER="1.2022.6"
 [ -f "/tmp/plantuml.${PLANTUML_VER}.jar" ] || wget -q "http://sourceforge.net/projects/plantuml/files/plantuml.${PLANTUML_VER}.jar/download" -O /tmp/plantuml.${PLANTUML_VER}.jar
 java -Djava.awt.headless=true -jar /tmp/plantuml.${PLANTUML_VER}.jar ${@}
diff --git a/test/test_plantuml.py b/test/test_plantuml.py
@@ -515,6 +515,31 @@ def test_json(self):
                color          Red  
 </code></pre>''', self.md.convert(text))
 
+#     def test_yaml(self):
+#         """
+#         Verify that spaces are not removed
+#         """
+#         text = self.text_builder.diagram('''
+# @startyaml
+# fruit: Apple
+# size: Large
+# color:
+#   background: Red
+#   foreground: Green
+#   other:
+#     data1: 1
+#     data2:
+#       - x
+#       - y
+# @endyaml
+#         ''').format("png").build()
+#         generated = self.md.convert(text)
+#
+#         with open('/tmp/test.html', 'w') as f:
+#             f.write(generated)
+#
+#         self.assertEqual(self._load_file('yaml_diagram.html'), generated)
+
     def test_source(self):
         include_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
         configs = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,3 +59,4 @@ env_test @@
     .env
     .eggs
     .env*
+    /config.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<p><img src="data:image/png;base64,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" class="uml" alt="uml diagram" title="" /></p>