fixing format_tools

Author: Wandalen

module/core/format_tools/src/format/output_format.rs

@@ -1,6 +1,6 @@
 //! Customizable format of printing table.
 //!
-//! # Example of ordinary format
+//! # Example of table format
 //!
 //! ```text
 //!  sid | sname | gap
@@ -74,13 +74,13 @@ mod private
     #[ inline( always ) ]
     fn default() -> Self
     {
-      super::ordinary::Ordinary::instance()
+      super::table::Table::instance()
     }
   }
 
 }
 
-mod ordinary;
+mod table;
 mod records;
 
 #[ allow( unused_imports ) ]
@@ -97,7 +97,7 @@ pub mod own
   #[ doc( inline ) ]
   pub use
   {
-    ordinary::Ordinary,
+    table::Table,
     records::Records,
   };
 

module/core/format_tools/src/format/output_format/ordinary.rs renamed to module/core/format_tools/src/format/output_format/table.rs

@@ -24,7 +24,7 @@ use std::sync::OnceLock;
 
 /// A struct representing the classic table output format.
 ///
-/// `Ordinary` provides a standard implementation for table formatting,
+/// `Table` provides a standard implementation for table formatting,
 /// supporting a classic style with default settings.
 ///
 /// # Example
@@ -37,7 +37,7 @@ use std::sync::OnceLock;
 ///   10 | Boris |   5
 /// ```
 #[ derive( Debug ) ]
-pub struct Ordinary
+pub struct Table
 {
   /// Delimitting header with grid line or not.
   pub delimitting_header : bool,
@@ -77,7 +77,7 @@ pub struct Ordinary
   pub corner_rb : char,
 }
 
-impl Default for Ordinary
+impl Default for Table
 {
   fn default() -> Self
   {
@@ -127,30 +127,30 @@ impl Default for Ordinary
   }
 }
 
-impl Default for &'static Ordinary
+impl Default for &'static Table
 {
   fn default() -> Self
   {
     // qqq : find a better solution
-    static STYLES : OnceLock< Ordinary > = OnceLock::new();
+    static STYLES : OnceLock< Table > = OnceLock::new();
     STYLES.get_or_init( ||
     {
-      Ordinary::default()
+      Table::default()
     })
   }
 }
 
-impl Ordinary
+impl Table
 {
 
-  /// Returns a reference to a static instance of `Ordinary`.
+  /// Returns a reference to a static instance of `Table`.
   ///
-  /// This method provides access to a single shared instance of `Ordinary`,
+  /// This method provides access to a single shared instance of `Table`,
   /// ensuring efficient reuse of the classic table output format.
   pub fn instance() -> & 'static dyn TableOutputFormat
   {
 
-    static INSTANCE : OnceLock< Ordinary > = OnceLock::new();
+    static INSTANCE : OnceLock< Table > = OnceLock::new();
     INSTANCE.get_or_init( ||
     {
       Self::default()
@@ -159,7 +159,7 @@ impl Ordinary
   }
 }
 
-impl TableOutputFormat for Ordinary
+impl TableOutputFormat for Table
 {
   fn extract_write< 'buf, 'data >( &self, x : &InputExtract< 'data >, c : &mut Context< 'buf > ) -> fmt::Result
   {

module/core/format_tools/src/format/print.rs

@@ -166,7 +166,7 @@ mod private
     /// A `String` containing the formatted table.
     fn table_to_string( &'data self ) -> String
     {
-      self.table_to_string_with_format( &output_format::Ordinary::default() )
+      self.table_to_string_with_format( &output_format::Table::default() )
     }
 
     /// Converts the table to a string representation specifying printer.

module/core/format_tools/tests/inc/format_ordinary_test.rs

@@ -99,7 +99,7 @@ fn custom_format()
   // use the_module::TableFormatter;
   let test_objects = test_object::test_objects_gen();
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();
@@ -140,7 +140,7 @@ fn custom_format()
 
   use the_module::TableFormatter;
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();
@@ -175,7 +175,7 @@ fn filter_col_none()
 {
   let test_objects = test_object::test_objects_gen();
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();
@@ -210,7 +210,7 @@ fn filter_col_callback()
 {
   let test_objects = test_object::test_objects_gen();
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();
@@ -254,7 +254,7 @@ fn filter_row_none()
 {
   let test_objects = test_object::test_objects_gen();
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();
@@ -286,7 +286,7 @@ fn filter_row_callback()
 {
   let test_objects = test_object::test_objects_gen();
 
-  let mut format = output_format::Ordinary::default();
+  let mut format = output_format::Table::default();
   format.cell_prefix = "( ".into();
   format.cell_postfix = " )".into();
   format.cell_separator = "|".into();

module/core/format_tools/tests/inc/mod.rs

@@ -7,7 +7,6 @@ mod fundamental
   use super::*;
 
   mod test_object;
-  mod test_object_without_impl;
 
   mod table_test;
   mod tabe_foreign_test;

module/core/format_tools/tests/inc/tabe_foreign_test.rs

@@ -1,4 +1,3 @@
-#[ allow( unused_imports ) ]
 use super::*;
 
 use the_module::
@@ -18,7 +17,7 @@ use std::
 //
 
 #[ test ]
-fn iterator_over_optional_cow()
+fn iterator_over_objects_without_impl()
 {
   use the_module::TestObjectWithoutImpl as TestObjectWithoutImpl;
   use the_module::
@@ -28,6 +27,7 @@ fn iterator_over_optional_cow()
     TableWithFields,
     WithRef,
     OptionalCow,
+    output_format,
   };
 
   #[ derive( Debug, Clone ) ]
@@ -78,7 +78,10 @@ fn iterator_over_optional_cow()
 
   let mut output = String::new();
   let mut context = the_module::print::Context::new( &mut output, Default::default() );
-  let _got = the_module::TableFormatter::fmt( &as_table, &mut context );
+  let _result = the_module::TableFormatter::fmt( &as_table, &mut context );
+
+  // = output as table
+
   let got = as_table.table_to_string();
   assert!( got.contains( "│ id │ created_at │          file_ids          │           tools            │" ) );
   assert!( got.contains( "│     13     │ [                          │ [                          │" ) );
@@ -89,4 +92,28 @@ fn iterator_over_optional_cow()
   assert!( got.contains( "│     13     │ [                          │ [                          │" ) );
   assert!( got.contains( "│ 1627845583 │        [                   │                            │" ) );
 
+  let got = AsTable::new( &data ).table_to_string_with_format( &output_format::Table::default() );
+  assert!( got.contains( "│ id │ created_at │          file_ids          │           tools            │" ) );
+  assert!( got.contains( "│     13     │ [                          │ [                          │" ) );
+  assert!( got.contains( "│ 1627845583 │        [                   │                            │" ) );
+
+  // = output as records
+
+  // let format = output_format::Records::default();
+  let mut output = String::new();
+  let format = the_module::output_format::Records::default();
+  let printer = the_module::print::Printer::with_format( &format );
+  let mut context = the_module::print::Context::new( &mut output, printer );
+  let got = the_module::TableFormatter::fmt( &as_table, &mut context );
+  assert!( got.is_ok() );
+  println!( "{}", &output );
+
+  let got = AsTable::new( &data ).table_to_string_with_format( &output_format::Records::default() );
+  assert!( got.contains( "│ id         │ 1            │" ) );
+  assert!( got.contains( "│ created_at │ 1627845583   │" ) );
+  assert!( got.contains( "│ id         │ 2                          │" ) );
+  assert!( got.contains( "│ created_at │ 13                         │" ) );
+
+  // assert!( false );
+
 }