changed multiline params and logic

hvalev · Aug 14, 2022 · 071617d · 071617d
1 parent abebae0
commit 071617d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/markdownTable/__init__.py b/markdownTable/__init__.py
@@ -37,7 +37,6 @@ class markdownTable():
 
     def __init__(self, data):
         self.data = data
-        self.validate()
         self.row_sep = 'always'
         self.padding_width = 0
         self.padding_weight = 'centerleft'
@@ -46,6 +45,7 @@ def __init__(self, data):
         self.float_rounding = 2
         self.multiline = False
         self.quote = True
+        self.updateMetaParams()
         return
 
     def setParams(
@@ -64,13 +64,16 @@ def setParams(
         self.padding_char = padding_char
         self.newline_char = newline_char
         self.float_rounding = float_rounding
-        self.multiline = multiline
         self.quote = quote
+        self.multiline = multiline
         self.updateMetaParams()
         return self
 
     def updateMetaParams(self):
-        self.var_padding = self.getPadding()
+        if self.multiline:
+            self.var_padding = self.multiline
+        else:
+            self.var_padding = self.getPadding()
         self.var_row_sep = self.getRowSepStr()
         self.var_row_sep_last = self.getRowSepLast()
 
@@ -82,6 +85,13 @@ def validate(self):
             for key in keys:
                 if key not in item:
                     raise Exception('Keys are not uniform')
+        if self.multiline:
+            for row in self.data:
+                for key, item in row.items():
+                    multiline_data = row[key].split(" ")
+                    multiline_max_width = max(multiline_data, key=len)
+                    if (self.var_padding[key]) < len(multiline_max_width):
+                        raise Exception('Contiguous string exists longer than the allocated column width')
 
     def getPadding(self):
         padding = dict()
@@ -91,14 +101,8 @@ def getPadding(self):
             for key in item.keys():
                 if (type(item[key]) is float and self.float_rounding):
                     item[key] = round(item[key], self.float_rounding)
-                if self.multiline:
-                    multiline_data = item[key].split(" ")
-                    multiline_min_width = max(multiline_data, key=len)
-                    if (padding[key]+self.padding_width) < len(multiline_min_width) + self.padding_width:
-                        padding[key] = len(multiline_min_width)+self.padding_width
-                else:
-                    if (padding[key]-self.padding_width) < len(str(item[key])):
-                        padding[key] = len(str(item[key]))+self.padding_width
+                if (padding[key]-self.padding_width) < len(str(item[key])):
+                    padding[key] = len(str(item[key]))+self.padding_width
         return padding
 
     def getRowSepStr(self):
@@ -226,6 +230,7 @@ def getBody(self):
         return rows
 
     def getMarkdown(self):
+        self.validate()
         self.updateMetaParams()
         data = self.getHeader()+self.getBody()
         if self.quote:

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="py-markdown-table",
-    version="0.3.0",
+    version="0.3.1",
     author="hvalev",
     description="A package used to generate basic markdown tables from a list of dicts",
     long_description=long_description,

diff --git a/tests/tests.py b/tests/tests.py
@@ -84,6 +84,6 @@ def test_formatting_padding_char():
 
 
 def test_multiline_data():
-    mt = markdownTable(multiline_data).setParams(padding_width=2, padding_weight="centerleft", multiline=True).getMarkdown()
-    res = '```\n+----------------------------------+\n|      A     |      B     |    C   |\n+------------+------------+--------+\n| row1_A and |   row1_B   | row1_C |\n| additional |            |        |\n|    stuff   |            |        |\n+------------+------------+--------+\n|   row2_A   | row2_B and | row2_C |\n|            | additional |        |\n|            |    stuff   |        |\n+------------+------------+--------+\n|   row3_A   |   row3_B   | row3_C |\n+----------------------------------+```'
+    mt = markdownTable(multiline_data).setParams(padding_width=2, padding_weight="centerleft", multiline={"A": 25, "B": 12, "C": 9}).getMarkdown()
+    res = '```\n+------------------------------------------------+\n|            A            |      B     |    C    |\n+-------------------------+------------+---------+\n|  row1_A and additional  |   row1_B   |  row1_C |\n|          stuff          |            |         |\n+-------------------------+------------+---------+\n|          row2_A         | row2_B and |  row2_C |\n|                         | additional |         |\n|                         |    stuff   |         |\n+-------------------------+------------+---------+\n|          row3_A         |   row3_B   |  row3_C |\n+------------------------------------------------+```'
     assert mt == res