data-flow-diagram 1.11.1.post2__tar.gz → 1.12.0__tar.gz

{data_flow_diagram-1.11.1.post2 → data_flow_diagram-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-flow-diagram
-Version: 1.11.1.post2
+Version: 1.12.0
 Summary: Commandline tool to generate data flow diagrams from text
 Home-page: https://github.com/pbauermeister/dfd
 Author: Pascal Bauermeister

{data_flow_diagram-1.11.1.post2 → data_flow_diagram-1.12.0}/setup.py

@@ -8,6 +8,10 @@ from setuptools import setup, find_packages
 import pathlib
 
 CHANGES = """
+
+## Version 1.12.0:
+- Support style (and hence attrib) on Stores and Channels.
+
 ## Version 1.11.1.post2:
 
 Bug fixes:

{data_flow_diagram-1.11.1.post2 → data_flow_diagram-1.12.0}/src/data_flow_diagram/dfd.py

@@ -99,12 +99,12 @@ class Generator:
                     f'{attrs}]'
                 )
             case model.STORE:
-                d = self._item_to_html_dict(copy)
+                d = self._attrib_to_dict(copy, attrs)
                 line = TMPL.STORE.format(**d)
             case model.NONE:
                 line = f'"{copy.name}" [shape=none label="{copy.text}" {attrs}]'
             case model.CHANNEL:
-                d = self._item_to_html_dict(copy)
+                d = self._attrib_to_dict(copy, attrs)
                 if self.graph_options.is_vertical:
                     line = TMPL.CHANNEL_HORIZONTAL.format(**d)
                 else:
@@ -116,6 +116,15 @@ class Generator:
                 )
         self.append(line, item)
 
+    def _attrib_to_dict(self, item: model.Item, attrs: str) -> dict[str, str]:
+        d = self._item_to_html_dict(item)
+        d.update({'fontcolor': 'black', 'color': 'black'})
+        attrs_d = {
+            k: v for k, v in [each.split('=', 1) for each in attrs.split()]
+        }
+        d.update(attrs_d)
+        return d
+
     def _item_to_html_dict(self, item: model.Item) -> dict[str, Any]:
         d = item.__dict__
         d['text'] = d['text'].replace('\\n', '<br/>')

{data_flow_diagram-1.11.1.post2 → data_flow_diagram-1.12.0}/src/data_flow_diagram/dfd_dot_templates.py

@@ -1,9 +1,9 @@
 STORE = """
 "{name}" [shape=none label=<
   <TABLE BORDER="0">
-    <TR><TD BGCOLOR="black" WIDTH="6"></TD></TR>
-    <TR><TD>{text}</TD></TR>
-    <TR><TD BGCOLOR="black" WIDTH="6"></TD></TR>
+    <TR><TD BGCOLOR="{color}" WIDTH="6"></TD></TR>
+    <TR><TD><FONT COLOR="{fontcolor}">{text}</FONT></TD></TR>
+    <TR><TD BGCOLOR="{color}" WIDTH="6"></TD></TR>
   </TABLE>>]
 """.strip()
 
@@ -13,11 +13,11 @@ CHANNEL = """
   <TABLE BORDER="0">
     <TR>
       <TD WIDTH="48"></TD>
-      <TD BGCOLOR="black" WIDTH="0" PORT="x"><BR/><BR/></TD>
+      <TD BGCOLOR="{color}" WIDTH="0" PORT="x"><BR/><BR/></TD>
       <TD WIDTH="48"></TD>
     </TR>
     <TR>
-      <TD COLSPAN="3">{text}</TD>
+      <TD COLSPAN="3"><FONT COLOR="{fontcolor}">{text}</FONT></TD>
     </TR>
   </TABLE>>]
 """.strip()
@@ -26,8 +26,8 @@ CHANNEL = """
 CHANNEL_HORIZONTAL = """
 "{name}" [shape=none label=<
   <TABLE BORDER="0">
-    <TR><TD BGCOLOR="black" PORT="x"></TD></TR>
-    <TR><TD>{text}</TD></TR>
+    <TR><TD BGCOLOR="{color}" PORT="x"></TD></TR>
+    <TR><TD><FONT COLOR="{fontcolor}">{text}</FONT></TD></TR>
   </TABLE>>]
 """.strip()
 

{data_flow_diagram-1.11.1.post2 → data_flow_diagram-1.12.0}/src/data_flow_diagram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-flow-diagram
-Version: 1.11.1.post2
+Version: 1.12.0
 Summary: Commandline tool to generate data flow diagrams from text
 Home-page: https://github.com/pbauermeister/dfd
 Author: Pascal Bauermeister