Keep orginal API and auto add tab

allaboutevemirolive · allaboutevemirolive · commit 9cfb306c4485 · 2023-10-30T15:03:08.000-04:00
diff --git a/examples/basic.rs b/examples/basic.rs
@@ -15,7 +15,6 @@ fn main() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Text(" | ".into()),
-        tab_size: 8,
     });
 
     for i in 0..48 {
diff --git a/examples/big.rs b/examples/big.rs
@@ -8,7 +8,6 @@ fn main() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Text(" | ".into()),
-        tab_size: 8,
     });
 
     let mut n: u64 = 1234;
diff --git a/src/lib.rs b/src/lib.rs
@@ -16,7 +16,6 @@
 //! let mut grid = Grid::new(GridOptions {
 //!     filling: Filling::Spaces(1),
 //!     direction: Direction::LeftToRight,
-//!     tab_size: 8,
 //! });
 //!
 //! for s in &["one", "two", "three", "four", "five", "six", "seven",
@@ -42,7 +41,7 @@
 //! To add data to a grid, first create a new [`Grid`] value, and then add
 //! cells to them with the `add` function.
 //!
-//! There are three options that must be specified in the [`GridOptions`] value
+//! There are two options that must be specified in the [`GridOptions`] value
 //! that dictate how the grid is formatted:
 //!
 //! - `filling`: what to put in between two columns — either a number of
@@ -55,8 +54,6 @@
 //!     - `Direction::TopToBottom` starts them in the top left and moves
 //!        *downwards*, going to the top of a new column after reaching the final
 //!        row.
-//! - `tab_size`: the size of the tab field (default: 8 spaces) that will replace 8
-//!    consecutive spaces with a tab in the separator.
 //!
 //!
 //! ## Displaying a grid
@@ -181,9 +178,6 @@ pub struct GridOptions {
 
     /// The number of spaces to put in between each column of cells.
     pub filling: Filling,
-
-    /// The size of the tab field based on space (default: 8 spaces).
-    pub tab_size: i32,
 }
 
 #[derive(PartialEq, Eq, Debug)]
@@ -418,13 +412,8 @@ impl fmt::Display for Display<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         let separator = match &self.grid.options.filling {
             Filling::Spaces(n) => {
-                if self.grid.options.tab_size <= 0 {
-                    " ".to_string().repeat(*n)
-                } else {
-                    let tab_count = n / self.grid.options.tab_size as usize;
-                    let remaining_spaces = n % self.grid.options.tab_size as usize;
-                    "\t".repeat(tab_count) + &" ".repeat(remaining_spaces)
-                }
+                // Calculate tab count and remaining spaces
+                "\t".repeat(n / 8) + &" ".repeat(n % 8)
             }
             Filling::Text(s) => s.clone(),
         };
diff --git a/tests/test.rs b/tests/test.rs
@@ -5,7 +5,6 @@ fn no_items() {
     let grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     let display = grid.fit_into_width(40).unwrap();
@@ -17,7 +16,6 @@ fn one_item() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from("1"));
@@ -31,7 +29,6 @@ fn one_item_exact_width() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from("1234567890"));
@@ -45,7 +42,6 @@ fn one_item_just_over() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from("1234567890!"));
@@ -58,7 +54,6 @@ fn two_small_items() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from("1"));
@@ -75,7 +70,6 @@ fn two_medium_size_items() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from("hello there"));
@@ -92,7 +86,6 @@ fn two_big_items() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::TopToBottom,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     grid.add(Cell::from(
@@ -110,7 +103,6 @@ fn that_example_from_earlier() {
     let mut grid = Grid::new(GridOptions {
         filling: Filling::Spaces(1),
         direction: Direction::LeftToRight,
-        tab_size: 8,
     });
 
     for s in &[
@@ -130,7 +122,6 @@ fn number_grid_with_pipe() {
     let mut grid = Grid::new(GridOptions {
         filling: Filling::Text("|".into()),
         direction: Direction::LeftToRight,
-        tab_size: 8,
     });
 
     for s in &[
@@ -150,7 +141,6 @@ fn huge_separator() {
     let mut grid = Grid::new(GridOptions {
         filling: Filling::Spaces(100),
         direction: Direction::LeftToRight,
-        tab_size: 8,
     });
 
     grid.add("a".into());
@@ -164,7 +154,6 @@ fn huge_yet_unused_separator() {
     let mut grid = Grid::new(GridOptions {
         filling: Filling::Spaces(100),
         direction: Direction::LeftToRight,
-        tab_size: 8,
     });
 
     grid.add("abcd".into());
@@ -183,7 +172,6 @@ fn emoji() {
     let mut grid = Grid::new(GridOptions {
         direction: Direction::LeftToRight,
         filling: Filling::Spaces(2),
-        tab_size: 8,
     });
 
     for s in ["🦀", "hello", "👩‍🔬", "hello"] {
@@ -218,7 +206,6 @@ mod uutils_ls {
             let mut grid = Grid::new(GridOptions {
                 direction: Direction::TopToBottom,
                 filling: Filling::Spaces(2),
-                tab_size: 8,
             });
 
             for s in [
@@ -240,7 +227,6 @@ mod uutils_ls {
         let mut grid = Grid::new(GridOptions {
             direction: Direction::LeftToRight,
             filling: Filling::Spaces(2),
-            tab_size: 8,
         });
 
         for s in [
@@ -264,7 +250,6 @@ mod uutils_ls {
         let mut grid = Grid::new(GridOptions {
             direction: Direction::TopToBottom,
             filling: Filling::Spaces(2),
-            tab_size: 8,
         });
 
         for s in [
@@ -288,7 +273,6 @@ mod uutils_ls {
         let mut grid = Grid::new(GridOptions {
             direction: Direction::TopToBottom,
             filling: Filling::Spaces(2),
-            tab_size: 8,
         });
 
         for s in ["a", "b", "a-long-name", "z"] {
@@ -304,7 +288,6 @@ mod uutils_ls {
         let mut grid = Grid::new(GridOptions {
             filling: Filling::Spaces(10),
             direction: Direction::LeftToRight,
-            tab_size: 8,
         });
 
         for s in &[
@@ -330,7 +313,6 @@ ten  	  eleven	  twelve
         let mut grid = Grid::new(GridOptions {
             filling: Filling::Spaces(30),
             direction: Direction::LeftToRight,
-            tab_size: 8,
         });
 
         for s in &[
@@ -352,11 +334,10 @@ nine			      ten			      eleven			      twelve
     }
 
     #[test]
-    fn zero_tab_size() {
+    fn six_tabs_two_spaces() {
         let mut grid = Grid::new(GridOptions {
-            filling: Filling::Spaces(10),
+            filling: Filling::Spaces(50),
             direction: Direction::LeftToRight,
-            tab_size: 0,
         });
 
         for s in &[
@@ -366,36 +347,12 @@ nine			      ten			      eleven			      twelve
             grid.add(Cell::from(*s));
         }
 
-        let display = grid.fit_into_width(50).unwrap();
-        assert_eq!(
-            r"one           two          three           four
-five          six          seven           eight
-nine          ten          eleven          twelve
-",
-            display.to_string()
-        );
-    }
-
-    #[test]
-    fn negative_tab_size() {
-        let mut grid = Grid::new(GridOptions {
-            filling: Filling::Spaces(10),
-            direction: Direction::LeftToRight,
-            tab_size: -1,
-        });
-
-        for s in &[
-            "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
-            "eleven", "twelve",
-        ] {
-            grid.add(Cell::from(*s));
-        }
+        let display = grid.fit_into_width(250).unwrap();
 
-        let display = grid.fit_into_width(50).unwrap();
         assert_eq!(
-            r"one           two          three           four
-five          six          seven           eight
-nine          ten          eleven          twelve
+            r"one 						  two						  three 						  four
+five						  six						  seven 						  eight
+nine						  ten						  eleven						  twelve
 ",
             display.to_string()
         );
