Add basic example of nested table + remove trailing newline from table (#22)

Author: devashishdxt

cli-table/examples/nested.rs

@@ -0,0 +1,27 @@
+use std::io::Result;
+
+use cli_table::{format::Justify, Cell, Style, Table};
+
+fn main() -> Result<()> {
+    let nested_table = vec![vec![20.cell()]].table();
+
+    let table = vec![
+        vec!["Tom".cell(), 10.cell().justify(Justify::Right)],
+        vec!["Jerry".cell(), 15.cell().justify(Justify::Right)],
+        vec!["Scooby Doo".cell(), 20.cell().justify(Justify::Right)],
+        vec![
+            "Nested".cell(),
+            nested_table.display()?.cell().justify(Justify::Right),
+        ],
+    ]
+    .table()
+    .title(vec![
+        "Name".cell().bold(true),
+        "Age (in years)".cell().bold(true),
+    ])
+    .bold(true);
+
+    println!("{}", table.display()?);
+
+    Ok(())
+}

cli-table/src/buffers.rs

@@ -39,15 +39,6 @@ impl<'a> Buffers<'a> {
         Ok(())
     }
 
-    pub fn end(&mut self) -> Result<()> {
-        if let Some(mut current_buffer) = self.current_buffer.take() {
-            current_buffer.reset()?;
-            self.buffers.push(current_buffer);
-        }
-
-        Ok(())
-    }
-
     pub fn into_vec(self) -> Result<Vec<Buffer>> {
         let mut buffers = self.buffers;
 

cli-table/src/display.rs

@@ -15,6 +15,6 @@ impl TableDisplay {
 
 impl fmt::Display for TableDisplay {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.inner)
+        write!(f, "{}", self.inner.trim())
     }
 }

cli-table/src/row.rs

@@ -6,7 +6,7 @@ use crate::{
     buffers::Buffers,
     cell::{Cell, CellStruct, Dimension as CellDimension},
     table::{Dimension as TableDimension, TableFormat},
-    utils::{print_char, print_vertical_line, println_str, transpose},
+    utils::{print_char, print_vertical_line, println, transpose},
 };
 
 /// Concrete row of a table
@@ -72,9 +72,7 @@ impl RowStruct {
                 }
             }
 
-            println_str(&mut buffers, "", color_spec)?;
-
-            buffers.end()?;
+            println(&mut buffers)?;
         }
 
         buffers.into_vec()

cli-table/src/table.rs

@@ -122,6 +122,7 @@ impl TableStruct {
             &self.format,
             &color_spec,
         )?;
+        println(&mut buffers)?;
 
         if let Some(ref title) = self.title {
             let title_dimension = row_dimensions.next().unwrap();
@@ -147,6 +148,8 @@ impl TableStruct {
                     &color_spec,
                 )?
             }
+
+            println(&mut buffers)?;
         }
 
         let mut rows = self.rows.iter().zip(row_dimensions).peekable();
@@ -172,6 +175,10 @@ impl TableStruct {
                     &color_spec,
                 )?,
             }
+
+            if rows.peek().is_some() {
+                println(&mut buffers)?;
+            }
         }
 
         buffers.into_vec()

cli-table/src/utils.rs

@@ -97,9 +97,9 @@ pub(crate) fn print_horizontal_line(
                 }
                 None => {
                     if table_format.border.right.is_some() {
-                        println_char(buffers, line.right_end, color_spec)?;
+                        print_char(buffers, line.right_end, color_spec)?;
                     } else {
-                        println_str(buffers, "", color_spec)?;
+                        print_str(buffers, "", color_spec)?;
                     }
                 }
             }
@@ -126,28 +126,12 @@ pub(crate) fn print_str(buffers: &mut Buffers<'_>, s: &str, color_spec: &ColorSp
     buffers.reset()
 }
 
-pub(crate) fn println_str(
-    buffers: &mut Buffers<'_>,
-    s: &str,
-    color_spec: &ColorSpec,
-) -> Result<()> {
-    buffers.set_color(color_spec)?;
-    writeln!(buffers, "{}", s)?;
-    buffers.reset()
-}
-
 pub(crate) fn print_char(buffers: &mut Buffers<'_>, c: char, color_spec: &ColorSpec) -> Result<()> {
     buffers.set_color(color_spec)?;
     write!(buffers, "{}", c)?;
     buffers.reset()
 }
 
-pub(crate) fn println_char(
-    buffers: &mut Buffers<'_>,
-    c: char,
-    color_spec: &ColorSpec,
-) -> Result<()> {
-    buffers.set_color(color_spec)?;
-    writeln!(buffers, "{}", c)?;
-    buffers.reset()
+pub(crate) fn println(buffers: &mut Buffers<'_>) -> Result<()> {
+    writeln!(buffers)
 }