Add test and fix bug in extract

Author: InAnYan

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

@@ -413,7 +413,13 @@ mod private
         let mut ncol = 0;
         let mut ncol_vis = 0;
 
-        let fields : Vec< ( Cow< 't, str >, [ usize ; 2 ] ) > = row_iter
+        // This type stores these data:
+        //                      index     cell data     size of cell
+        //                   of the column
+        //
+        // We have to store index of the column in order to NOT rely on order of the
+        // `Cells::cells`.
+        let mut fields : Vec< ( usize, Cow< 't, str >, [ usize ; 2 ] ) > = row_iter
         .filter_map
         (
           | ( key, val ) |
@@ -459,11 +465,14 @@ mod private
             });
 
             row.height = row.height.max( sz[ 1 ] );
-            return Some( ( val, sz ) );
+            return Some( ( key_to_ikey[ key ], val, sz ) );
           }
         )
         .collect();
 
+        fields.sort_by( | ( i1, _, _ ), ( i2, _, _ ) | i1.cmp( i2 ) );
+        let fields : Vec< ( Cow< 't, str >, [ usize ; 2 ] ) > = fields.into_iter().map( | ( _, k, v ) | ( k, v ) ).collect();
+
         mcells[ 0 ] = mcells[ 0 ].max( ncol );
         mcells_vis[ 0 ] = mcells_vis[ 0 ].max( ncol_vis );
 

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

@@ -79,9 +79,6 @@ mod private
   /// Marker trait to tag structures for which table trait deducing should be done from trait Fields, which is reflection.
   pub trait TableWithFields {}
 
-  impl TableWithFields for HashMap< String, String > {}
-  impl TableWithFields for HashMap< &str, String > {}
-
   // =
 
   /// A trait for iterating over all cells of a row.
@@ -99,6 +96,16 @@ mod private
     ;
   }
 
+  impl Cells< str > for HashMap< String, String >
+  {
+    fn cells< 'a, 'b >( &'a self ) -> impl IteratorTrait< Item = ( &'b str, Option< Cow< 'b, str > > ) >
+    where
+      'a : 'b,
+    {
+      self.iter().map( | ( k, v ) | ( k.as_str(), Some( Cow::from( v ) ) ) )
+    }
+  }
+
   impl< Row, CellKey > Cells< CellKey >
   for Row
   where
@@ -195,7 +202,7 @@ mod private
     > + 'k + 'v,
 
     RowKey : table::RowKey,
-    Row : TableWithFields + Cells< CellKey >,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -271,7 +278,7 @@ mod private
   where
     Self : TableRows< RowKey = RowKey, Row = Row, CellKey = CellKey >,
     RowKey : table::RowKey,
-    Row : TableWithFields + Cells< CellKey >,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {

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

@@ -411,30 +411,21 @@ fn vec_of_hashmap()
       let mut map = HashMap::new();
       map.insert( "id".to_string(), "1".to_string() );
       map.insert( "created_at".to_string(), "1627845583".to_string() );
-      map.insert( "file_ids".to_string(), "[ file1, file2 ]".to_string() );
-      map.insert( "tools".to_string(), "".to_string() );
       map
     },
     {
       let mut map = HashMap::new();
       map.insert( "id".to_string(), "2".to_string() );
       map.insert( "created_at".to_string(), "13".to_string() );
-      map.insert( "file_ids".to_string(), "[ file3, file4 ]".to_string() );
-      map.insert( "tools".to_string(), "tool1".to_string() );
       map
     },
   ];
 
-  use the_module::Fields;
-
   use std::borrow::Cow;
 
-  // let _ = <HashMap<std::string::String, std::string::String> as Fields<String, Option<Cow<'_, str>>>>::fields(&map);
-
   use the_module::TableFormatter;
-  let _as_table : AsTable< '_, Vec< HashMap< String, String > >, &str, HashMap< String, String >, str> = AsTable::new( &data );
 
-  /*
+  let _as_table : AsTable< '_, Vec< HashMap< String, String > >, &str, HashMap< String, String >, str> = AsTable::new( &data );
   let as_table = AsTable::new( &data );
 
   let rows = TableRows::rows( &as_table );
@@ -447,59 +438,9 @@ fn vec_of_hashmap()
 
   let got = as_table.table_to_string();
 
-  assert!( got.contains( "│ id │ created_at │          file_ids          │           tools            │" ) );
-  assert!( got.contains( "│     13     │ [                          │ [                          │" ) );
-  assert!( got.contains( "│ 1627845583 │        [                   │                            │" ) );
-  */
-}
-
-#[ test ]
-fn vec_of_hashmap_str()
-{
-  let data : Vec< HashMap< &str, String > > = vec!
-  [
-    {
-      let mut map = HashMap::new();
-      map.insert( "id", "1".to_string() );
-      map.insert( "created_at", "1627845583".to_string() );
-      map.insert( "file_ids", "[ file1, file2 ]".to_string() );
-      map.insert( "tools", "".to_string() );
-      map
-    },
-    {
-      let mut map = HashMap::new();
-      map.insert( "id", "2".to_string() );
-      map.insert( "created_at", "13".to_string() );
-      map.insert( "file_ids", "[ file3, file4 ]".to_string() );
-      map.insert( "tools", "tool1".to_string() );
-      map
-    },
-  ];
-
-  use the_module::Fields;
-
-  use std::borrow::Cow;
-
-  // let _ = <HashMap<std::string::String, std::string::String> as Fields<String, Option<Cow<'_, str>>>>::fields(&map);
-
-  use the_module::TableFormatter;
-  //let _as_table : AsTable< '_, Vec< HashMap< &str, String > >, &str, HashMap< &str, String >, str> = AsTable::new( &data );
-
-  /*
-  let as_table = AsTable::new( &data );
-
-  let rows = TableRows::rows( &as_table );
-  assert_eq!( rows.len(), 2 );
+  println!("{}", got);
 
-  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 got = as_table.table_to_string();
-
-  assert!( got.contains( "│ id │ created_at │          file_ids          │           tools            │" ) );
-  assert!( got.contains( "│     13     │ [                          │ [                          │" ) );
-  assert!( got.contains( "│ 1627845583 │        [                   │                            │" ) );
-  */
+  assert!( got.contains( "│ id │ created_at │" ) || got.contains( "│ created_at │ id │" ) );
+  assert!( got.contains( "│ 1  │ 1627845583 │" ) || got.contains( "│ 1627845583 │ 1  │" ) );
+  assert!( got.contains( "│ 2  │     13     │" ) || got.contains( "│     13     │ 2  │" ) );
 }