F!! MarkdownTable allows consistent width

Author: ScottBob

approvaltests-util/src/main/java/com/spun/util/MarkdownTable.java

@@ -6,6 +6,11 @@
 public class MarkdownTable implements MarkdownCompatible
 {
   public Queryable<MarkdownTableElement> markdown = new Queryable<MarkdownTableElement>(MarkdownTableElement.class);
+  private boolean fixedWidth = false;
+  
+  public void setColumnsConsistentWidth(boolean setting) {
+    fixedWidth = setting;
+  }
   public static <I, O> MarkdownTable create(I[] inputs, Function1<I, O> o, String column1, String column2)
   {
     MarkdownTable table = new MarkdownTable().withColumnHeaders(column1, column2);
@@ -48,8 +53,23 @@ public String toString()
   @Override
   public String toMarkdown()
   {
+    handleFixedWidth();
     return render(markdown);
   }
+
+  private void handleFixedWidth() {
+    if (!fixedWidth) { return; }
+    Queryable<Queryable<MarkdownTableElement>> rows = markdown.split(e -> e == MarkdownTableElement.NEWLINE);
+    for (int column = 0; column < rows.get(0).size(); column++) {
+      int col = column;
+      if (rows.get(0).get(column) instanceof MarkdownTableContents) {
+          Queryable<MarkdownTableContents> select = rows.select(e -> e.get(col)).where(e -> e instanceof MarkdownTableContents).select(e -> (MarkdownTableContents) e);
+          int length = select.max(e -> e.getLength()).getLength();
+          select.forEach(e -> e.setPadding(length));
+      }
+    }
+  }
+
   public static String printColumnHeaders(String... headers)
   {
     return render(constructColumnHeaders(headers));

approvaltests-util/src/main/java/com/spun/util/MarkdownTableContents.java

@@ -1,14 +1,23 @@
 package com.spun.util;
 
-public class MarkdownTableContents {
+public class MarkdownTableContents implements MarkdownTableElement {
     private String contents;
+    private int padUntil;
 
     public MarkdownTableContents(String contents) {
         this.contents = contents;
     }
 
     @Override
     public String toString() {
-        return " " + contents + " ";
+        return " " + StringUtils.pad(contents, padUntil) + " ";
+    }
+
+    public int getLength() {
+        return contents.length();
+    }
+
+    public void setPadding(int length) {
+        padUntil = length;
     }
 }

approvaltests-util/src/main/java/com/spun/util/StringUtils.java

@@ -603,4 +603,14 @@ public static String replaceAll(String input, Pattern pattern, Function1<String,
     }
     return input;
   }
+
+  public static String pad(String contents, int targetLength) {
+    while(contents.length() < targetLength) {
+      contents += " ";
+      if (contents.length() < targetLength) {
+        contents = " " + contents;
+      }
+    }
+    return contents;
+  }
 }

approvaltests-util/src/main/java/org/lambda/query/Queryable.java

@@ -1,6 +1,7 @@
 package org.lambda.query;
 
 import com.spun.util.ClassUtils;
+import com.spun.util.MarkdownTableContents;
 import com.spun.util.ObjectUtils;
 import org.lambda.Extendable;
 import org.lambda.functions.Function1;
@@ -172,4 +173,19 @@ public <Out> String join(String joinCharacter, Function1<In, Out> transformer)
   {
     return String.join(joinCharacter, this.select(t -> "" + transformer.call(t)));
   }
+
+  public Queryable<Queryable<In>> split(Function1<In, Boolean> function) {
+    Queryable<Queryable<In>> results = new Queryable<>();
+    Queryable<In> part = new Queryable<>();
+    for (In in : this) {
+      if (function.call(in)) {
+        results.add(part);
+        part = new Queryable<>();
+      }
+      else {
+        part.add(in);
+      }
+    }
+    return results;
+  }
 }

approvaltests-util/src/main/java/org/lambda/utils/Grid.java

@@ -29,8 +29,9 @@ public static String printMarkdown(int width, int height, Function2<Integer, Int
   {
     Queryable<Integer> numbers = Range.getAsQueryable(0, width - 1);
     Queryable<String> asQueryable = numbers.select(i -> "" + i);
-    asQueryable.add(0, "   ");
+    asQueryable.add(0, " ");
     MarkdownTable table = MarkdownTable.withHeaders(asQueryable.asArray());
+    table.setColumnsConsistentWidth(true);
     for (int y = 0; y < height; y++) {
       int y2 = y;
       Queryable<String> row = numbers.select(x -> f2.call(x, y2)).select(c -> c == null ? "" : c);

todo.md

@@ -1,5 +1,5 @@
 # Code
-* Refactor Grid to use MarkdownTables
+* Change MarkdownTable to have a header element which expands with dashes
 * Refactor PairwiseTest to use MarkdownTables
 * Consider splitting MarkdownTables into VerifiableMarkdownTables (or generally handle the allowing of MarkdownTables in production code)
 * Update koans