Merge pull request #2725 from jonathan-3play/fix_table_box_rendering_order

fix table rendering order of box elements

Author: willmcgugan

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed 
+
+- Improved detection of `attrs` library, that isn't confused by the presence of the `attr` library.
+- Fixed `Table` rendering of box elements so "footer" elements truly appear at bottom of table, "mid" elements in main table body.
+
 ## [13.7.1] - 2024-02-28
 
 ### Fixed
@@ -124,6 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added Polish README
 
+
 ### Changed
 
 - `rich.progress.track()` will now show the elapsed time after finishing the task https://github.com/Textualize/rich/pull/2659

CONTRIBUTORS.md

@@ -15,6 +15,7 @@ The following people have contributed to the development of Rich:
 - [Ed Davis](https://github.com/davised)
 - [Pete Davison](https://github.com/pd93)
 - [James Estevez](https://github.com/jstvz)
+- [Jonathan Eunice](https://github.com/jonathan-3play)
 - [Aryaz Eghbali](https://github.com/AryazE)
 - [Oleksis Fraga](https://github.com/oleksis)
 - [Andy Gimblett](https://github.com/gimbo)

rich/table.py

@@ -775,16 +775,16 @@ def _render(
                     _Segment(_box.head_right, border_style),
                     _Segment(_box.head_vertical, border_style),
                 ),
-                (
-                    _Segment(_box.foot_left, border_style),
-                    _Segment(_box.foot_right, border_style),
-                    _Segment(_box.foot_vertical, border_style),
-                ),
                 (
                     _Segment(_box.mid_left, border_style),
                     _Segment(_box.mid_right, border_style),
                     _Segment(_box.mid_vertical, border_style),
                 ),
+                (
+                    _Segment(_box.foot_left, border_style),
+                    _Segment(_box.foot_right, border_style),
+                    _Segment(_box.foot_vertical, border_style),
+                ),
             ]
             if show_edge:
                 yield _Segment(_box.get_top(widths), border_style)

tests/test_table.py

@@ -1,6 +1,7 @@
 # encoding=utf-8
 
 import io
+from textwrap import dedent
 
 import pytest
 
@@ -234,6 +235,134 @@ def test_section():
     assert output == expected
 
 
+@pytest.mark.parametrize(
+    "show_header,show_footer,expected",
+    [
+        (
+            False,
+            False,
+            dedent(
+                """
+                abbbbbcbbbbbbbbbcbbbbcbbbbbd
+                1Dec  2Skywalker2275M2375M 3
+                4May  5Solo     5275M5393M 6
+                ijjjjjkjjjjjjjjjkjjjjkjjjjjl
+                7Dec  8Last Jedi8262M81333M9
+                qrrrrrsrrrrrrrrrsrrrrsrrrrrt
+                """
+            ).lstrip(),
+        ),
+        (
+            True,
+            False,
+            dedent(
+                """
+                abbbbbcbbbbbbbbbcbbbbcbbbbbd
+                1Month2Nickname 2Cost2Gross3
+                efffffgfffffffffgffffgfffffh
+                4Dec  5Skywalker5275M5375M 6
+                4May  5Solo     5275M5393M 6
+                ijjjjjkjjjjjjjjjkjjjjkjjjjjl
+                7Dec  8Last Jedi8262M81333M9
+                qrrrrrsrrrrrrrrrsrrrrsrrrrrt
+                """
+            ).lstrip(),
+        ),
+        (
+            False,
+            True,
+            dedent(
+                """
+                abbbbbcbbbbbbbbbcbbbbcbbbbbd
+                1Dec  2Skywalker2275M2375M 3
+                4May  5Solo     5275M5393M 6
+                ijjjjjkjjjjjjjjjkjjjjkjjjjjl
+                4Dec  5Last Jedi5262M51333M6
+                mnnnnnonnnnnnnnnonnnnonnnnnp
+                7MONTH8NICKNAME 8COST8GROSS9
+                qrrrrrsrrrrrrrrrsrrrrsrrrrrt
+                """
+            ).lstrip(),
+        ),
+        (
+            True,
+            True,
+            dedent(
+                """
+                abbbbbcbbbbbbbbbcbbbbcbbbbbd
+                1Month2Nickname 2Cost2Gross3
+                efffffgfffffffffgffffgfffffh
+                4Dec  5Skywalker5275M5375M 6
+                4May  5Solo     5275M5393M 6
+                ijjjjjkjjjjjjjjjkjjjjkjjjjjl
+                4Dec  5Last Jedi5262M51333M6
+                mnnnnnonnnnnnnnnonnnnonnnnnp
+                7MONTH8NICKNAME 8COST8GROSS9
+                qrrrrrsrrrrrrrrrsrrrrsrrrrrt
+                """
+            ).lstrip(),
+        ),
+    ],
+)
+def test_placement_table_box_elements(show_header, show_footer, expected):
+    """Ensure box drawing characters correctly positioned."""
+
+    table = Table(
+        box=box.ASCII, show_header=show_header, show_footer=show_footer, padding=0
+    )
+
+    # content rows indicated by numerals, pure dividers by letters
+    table.box.__dict__.update(
+        top_left="a",
+        top="b",
+        top_divider="c",
+        top_right="d",
+        head_left="1",
+        head_vertical="2",
+        head_right="3",
+        head_row_left="e",
+        head_row_horizontal="f",
+        head_row_cross="g",
+        head_row_right="h",
+        mid_left="4",
+        mid_vertical="5",
+        mid_right="6",
+        row_left="i",
+        row_horizontal="j",
+        row_cross="k",
+        row_right="l",
+        foot_left="7",
+        foot_vertical="8",
+        foot_right="9",
+        foot_row_left="m",
+        foot_row_horizontal="n",
+        foot_row_cross="o",
+        foot_row_right="p",
+        bottom_left="q",
+        bottom="r",
+        bottom_divider="s",
+        bottom_right="t",
+    )
+
+    # add content - note headers title case, footers upper case
+    table.add_column("Month", "MONTH", width=5)
+    table.add_column("Nickname", "NICKNAME", width=9)
+    table.add_column("Cost", "COST", width=4)
+    table.add_column("Gross", "GROSS", width=5)
+
+    table.add_row("Dec", "Skywalker", "275M", "375M")
+    table.add_row("May", "Solo", "275M", "393M")
+    table.add_section()
+    table.add_row("Dec", "Last Jedi", "262M", "1333M")
+
+    console = Console(record=True, width=28)
+    console.print(table)
+    output = console.export_text()
+    print(repr(output))
+
+    assert output == expected
+
+
 if __name__ == "__main__":
     render = render_tables()
     print(render)