Improved table interface

Author: alexrudy

src/bootlace/table/base.py

@@ -113,7 +113,7 @@ def __init__(self, decorated_classes: Iterable[str] | None = None) -> None:
         else:
             self.decorated_classes = set(decorated_classes)
 
-    def render(self, items: list[Any]) -> tags.html_tag:
+    def __call__(self, items: list[Any]) -> tags.html_tag:
         table = tags.table(cls="table")
         table.classes.add(*self.decorated_classes)
         thead = tags.thead()
@@ -127,8 +127,8 @@ def render(self, items: list[Any]) -> tags.html_tag:
             id = getattr(item, "id", None)
             tr = tags.tr(id=f"item-{id}" if id else None)
             for column in self.columns.values():
-                td = column.cell(item)
-                tr.add(td)
+                cell = column.cell(item)
+                tr.add(tags.td(cell))
             tbody.add(tr)
         table.add(tbody)
         return table

src/bootlace/table/columns.py

@@ -2,6 +2,7 @@
 
 import attrs
 from dominate import tags
+from dominate.util import text
 from flask import url_for
 
 from bootlace.icon import Icon
@@ -13,7 +14,7 @@
 class Column(ColumnBase):
 
     def cell(self, value: Any) -> tags.html_tag:
-        return tags.td(getattr(value, self.attribute))
+        return text(str(getattr(value, self.attribute)))
 
 
 @attrs.define
@@ -22,7 +23,7 @@ class EditColumn(ColumnBase):
 
     def cell(self, value: Any) -> tags.html_tag:
         id = getattr(value, "id", None)
-        return tags.td(tags.a(getattr(value, self.attribute), href=url_for(self.endpoint, id=id)))
+        return tags.a(getattr(value, self.attribute), href=url_for(self.endpoint, id=id))
 
 
 @attrs.define
@@ -33,12 +34,12 @@ class CheckColumn(ColumnBase):
 
     def cell(self, value: Any) -> tags.html_tag:
         if getattr(value, self.attribute):
-            return tags.td(as_tag(self.yes))
-        return tags.td(as_tag(self.no))
+            return as_tag(self.yes)
+        return as_tag(self.no)
 
 
 @attrs.define
 class Datetime(ColumnBase):
 
     def cell(self, value: Any) -> tags.html_tag:
-        return tags.td(getattr(value, self.attribute).isoformat())
+        return text(getattr(value, self.attribute).isoformat())

tests/table/test_table.py

@@ -31,7 +31,7 @@ def test_basic_table(items: list[Item], table: type[Table]) -> None:
     assert len(table.columns) == 2
 
     table = table()
-    rendered = table.render(items).render()
+    rendered = table(items).render()
 
     print(rendered)
 
@@ -60,7 +60,7 @@ def test_basic_table(items: list[Item], table: type[Table]) -> None:
 def test_table_with_decorated_classes(items: list[Item], table: type[Table]) -> None:
 
     table = table(decorated_classes=["table-striped", "table-bordered"])
-    rendered = table.render(items).render()
+    rendered = table(items).render()
 
     print(rendered)