🐛 Summary rows must infer the name from the functions

Author: ronisbr

src/main.jl

@@ -399,7 +399,7 @@ function _pretty_table(
     end
 
     if !isnothing(summary_rows) && isnothing(summary_row_labels)
-        summary_row_labels = SummaryLabelIterator(length(summary_rows))
+        summary_row_labels = SummaryLabelIterator(summary_rows)
     end
 
     if show_first_column_label_only

src/precompile.jl

@@ -80,6 +80,7 @@ PrecompileTools.@setup_workload begin
         # -- Text --------------------------------------------------------------------------
 
         pretty_table(matrix)
+        pretty_table(matrix; summary_rows = [sum, sum, sum])
 
         pretty_table(
             types;

src/types.jl

@@ -262,11 +262,15 @@ end
 # Type to lazily construct the summary row / column label if the user does not pass this
 # information.
 struct SummaryLabelIterator <: AbstractVector{String}
-    length::Int
+    summary_rows::Vector{Any}
 end
 
-Base.size(s::SummaryLabelIterator) = (s.length,)
-Base.getindex(::SummaryLabelIterator, i::Int) = "Summary $i"
+Base.size(s::SummaryLabelIterator) = (length(s.summary_rows),)
+function Base.getindex(s::SummaryLabelIterator, i::Int)
+    f_str = string(s.summary_rows[i])
+    first(f_str) == '#' && return "Summary $i"
+    return f_str
+end
 
 # == PrettyTable ===========================================================================
 

test/internal/cell_alignment.jl

@@ -20,7 +20,6 @@
             row_labels                     = ["Row 1", "Row 2", "Row 3"],
             row_group_labels               = [2 => "Row Group"],
             summary_rows                   = [(data, i) -> i, (data, i) -> 2i],
-            summary_row_labels             = ["Summary 1", "Summary 2"],
             footnotes                      = [(:data, 1, 1) => "Footnote", (:data, 2, 2) => "Footnote"],
             source_notes                   = "Source Notes",
             title_alignment                = :r,

test/internal/cell_data.jl

@@ -14,6 +14,8 @@
             9 10 11 12
         ]
 
+        summary_rows = [(data, j) -> 20j, (data, j) -> 30j, sum]
+
         td = PrettyTables.TableData(
             ;
             data,
@@ -25,8 +27,8 @@
             row_number_column_label     = "Row Number",
             row_labels                  = ["Row 1", "Row 2", "Row 3"],
             row_group_labels            = [2 => "Row Group"],
-            summary_rows                = [(data, j) -> 20j, (data, j) -> 30j, sum],
-            summary_row_labels          = PrettyTables.SummaryLabelIterator(3),
+            summary_rows                = summary_rows,
+            summary_row_labels          = PrettyTables.SummaryLabelIterator(summary_rows),
             footnotes                   = [(:data, 1, 1) => "Footnote 1", (:data, 2, 2) => "Footnote 2"],
             source_notes                = "Source Notes",
             data_alignment              = [:l, :c, :r, :l],
@@ -132,7 +134,7 @@
 
             action, rs, ps = PrettyTables._next(ps, td)
             cell = PrettyTables._current_cell(action, ps, td)
-            @test cell == "Summary $i"
+            @test cell == (i == 3 ? "sum" : "Summary $i")
 
             for j in 1:4
                 action, rs, ps = PrettyTables._next(ps, td)
@@ -179,6 +181,7 @@
             5  6  7  8
             9 10 11 12
         ]
+        summary_rows = [(data, j) -> 20j, (data, j) -> 30j, sum]
 
         td = PrettyTables.TableData(
             ;
@@ -191,8 +194,8 @@
             row_number_column_label     = "Row Number",
             row_labels                  = ["Row 1", "Row 2", "Row 3"],
             row_group_labels            = [2 => "Row Group"],
-            summary_rows                = [(data, j) -> 20j, (data, j) -> 30j, sum],
-            summary_row_labels          = PrettyTables.SummaryLabelIterator(3),
+            summary_rows                = summary_rows,
+            summary_row_labels          = PrettyTables.SummaryLabelIterator(summary_rows),
             footnotes                   = [(:data, 1, 1) => "Footnote 1", (:data, 2, 2) => "Footnote 2"],
             source_notes                = "Source Notes",
             merge_column_label_cells    = [MergeCells(1, 2, 2, "Merged #1"), MergeCells(2, 1, 2, "Merged #2")],
@@ -312,7 +315,7 @@
 
             action, rs, ps = PrettyTables._next(ps, td)
             cell = PrettyTables._current_cell(action, ps, td)
-            @test cell == "Summary $i"
+            @test cell == (i == 3 ? "sum" : "Summary $i")
 
             for j in 1:4
                 action, rs, ps = PrettyTables._next(ps, td)

test/internal/print_state.jl

@@ -269,6 +269,8 @@
         @testset "Bottom Vertical Cropping" begin
             # == Create the Table Data =====================================================
 
+            summary_rows = [(data, i) -> i, (data, i) -> 2i]
+
             td = PrettyTables.TableData(
                 ;
                 data                      = rand(6, 4),
@@ -280,8 +282,8 @@
                 row_number_column_label   = "Row Number",
                 row_labels                = ["Row 1", "Row 2", "Row 3"],
                 row_group_labels          = [2 => "Row Group 1", 4 => "Row Group 1"],
-                summary_rows              = [(data, i) -> i, (data, i) -> 2i],
-                summary_row_labels        = PrettyTables.SummaryLabelIterator(2),
+                summary_rows              = summary_rows,
+                summary_row_labels        = PrettyTables.SummaryLabelIterator(summary_rows),
                 footnotes                 = [(:data, 1, 1) => "Footnote", (:data, 2, 2) => "Footnote"],
                 source_notes              = "Source Notes",
                 num_rows                  = 6,
@@ -504,6 +506,8 @@
         @testset "Middle Vertical Cropping" begin
             # == Create the Table Data =====================================================
 
+            summary_rows = [(data, i) -> i, (data, i) -> 2i]
+
             td = PrettyTables.TableData(
                 ;
                 data                      = rand(6, 4),
@@ -515,8 +519,8 @@
                 row_number_column_label   = "Row Number",
                 row_labels                = ["Row 1", "Row 2", "Row 3"],
                 row_group_labels          = [2 => "Row Group 1", 6 => "Row Group 2"],
-                summary_rows              = [(data, i) -> i, (data, i) -> 2i],
-                summary_row_labels        = PrettyTables.SummaryLabelIterator(2),
+                summary_rows              = summary_rows,
+                summary_row_labels        = PrettyTables.SummaryLabelIterator(summary_rows),
                 footnotes                 = [(:data, 1, 1) => "Footnote", (:data, 2, 2) => "Footnote"],
                 source_notes              = "Source Notes",
                 num_rows                  = 6,
@@ -792,6 +796,8 @@
 
             # == Create the Table Data =====================================================
 
+            summary_rows = [(data, i) -> i, (data, i) -> 2i]
+
             td = PrettyTables.TableData(
                 ;
                 data                      = rand(3, 4),
@@ -802,8 +808,8 @@
                 show_row_number_column    = true,
                 row_number_column_label   = "Row Number",
                 row_labels                = ["Row 1", "Row 2", "Row 3"],
-                summary_rows              = [(data, i) -> i, (data, i) -> 2i],
-                summary_row_labels        = ["Summary 1", "Summary 2"],
+                summary_rows              = summary_rows,
+                summary_row_labels        = PrettyTables.SummaryLabelIterator(summary_rows),
                 footnotes                 = [(:data, 1, 1) => "Footnote", (:data, 2, 2) => "Footnote"],
                 source_notes              = "Source Notes",
                 num_rows                  = 3,