Refactor and add ascii delimiter option

README.md

@@ -20,7 +20,7 @@ That is why I started this project.
 <dependency>
   <groupId>com.github.snowphone</groupId>
   <artifactId>cjk-table</artifactId>
-  <version>0.3</version>
+  <version>0.4</version>
 </dependency>
 ```
 
@@ -31,7 +31,7 @@ repositories {
   maven { url="https://jitpack.io".let(::uri) }
 }
 dependencies {
-  implementation("com.github.snowphone:cjk-table:0.3")
+  implementation("com.github.snowphone:cjk-table:0.4")
 }
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>kr.sixtyfive</groupId>
     <artifactId>cjk-table</artifactId>
-    <version>0.3</version>
+    <version>0.4</version>
 
     <licenses>
         <license>

src/main/kotlin/kr/sixtyfive/AlignLeft.kt → src/main/kotlin/kr/sixtyfive/Alignment/LeftAlign.kt

@@ -1,6 +1,6 @@
 package kr.sixtyfive
 
-object AlignLeft : Alignment {
+object LeftAlign : Alignment {
 	override fun pad(): (String, Int, Char) -> String {
 		return String::padEnd
 	}

src/main/kotlin/kr/sixtyfive/AlignRight.kt → src/main/kotlin/kr/sixtyfive/Alignment/RightAlign.kt

@@ -1,6 +1,6 @@
 package kr.sixtyfive
 
-object AlignRight : Alignment {
+object RightAlign : Alignment {
 	override fun pad(): (String, Int, Char) -> String {
 		return String::padStart
 	}

src/main/kotlin/kr/sixtyfive/Delimiter/AsciiDelimiter.kt

@@ -0,0 +1,10 @@
+package kr.sixtyfive
+
+object AsciiDelimiter : Delimiter {
+	override val vertical = '|'
+	override val horizontal = '-'
+	override val cross = '+'
+	override val topCross = '+'
+	override val bottomCross = '+'
+}
+

src/main/kotlin/kr/sixtyfive/Delimiter/Delimiter.kt

@@ -0,0 +1,10 @@
+package kr.sixtyfive
+
+interface Delimiter {
+	val vertical: Char
+	val horizontal: Char
+	val cross: Char
+	val topCross: Char
+	val bottomCross: Char
+}
+

src/main/kotlin/kr/sixtyfive/Delimiter/FancyDelimiter.kt

@@ -0,0 +1,10 @@
+package kr.sixtyfive
+
+object FancyDelimiter : Delimiter {
+	override val vertical = '│'
+	override val horizontal = '─'
+	override val cross = '┼'
+	override val topCross = '┬'
+	override val bottomCross = '┴'
+}
+

src/main/kotlin/kr/sixtyfive/Table.kt

@@ -1,17 +1,17 @@
 package kr.sixtyfive
 
-
 /**
  * @param alignment A rule for an alignment. Either of `AlignLeft` or `AlignRight` is allowed.
  */
 class Table(
-	alignment: Alignment = AlignRight
+	alignment: Alignment = RightAlign,
+	delimiterSet: Delimiter = FancyDelimiter
 ) {
-	private val delimiter = '│'
-	private val horizontalLine = '─'
-	private val cross = '┼'
-	private val topCross = '┬'
-	private val bottomCross = '┴'
+	private val delimiter = delimiterSet.vertical
+	private val horizontalLine = delimiterSet.horizontal
+	private val cross = delimiterSet.cross
+	private val topCross = delimiterSet.topCross
+	private val bottomCross = delimiterSet.bottomCross
 
 	private val table = mutableListOf<List<String>>()
 	private val lineIndices = mutableSetOf<Int>()
@@ -38,7 +38,7 @@ class Table(
 	 */
 	fun render(): String {
 		val colLen = table.map { it.size }.maxOrNull() ?: 0
-		val widths = (0 until colLen).map(this::calcWidth).toList()
+		val widths = (0 until colLen).map(this::calculateWidth).toList()
 		val builder = StringBuilder()
 		(0..table.size).forEach { r ->
 			if (r in lineIndices) {
@@ -79,17 +79,18 @@ class Table(
 		return builder.toString()
 	}
 
-	private fun calcWidth(colIndex: Int): Int {
+	/**
+	 * Return maximum length in `colIndex`th column.
+	 * Note that the length is in half-width.
+	 */
+	private fun calculateWidth(colIndex: Int): Int {
 		val vertLine = table.map { if (colIndex in it.indices) it[colIndex] else "" }
-		return (vertLine.map(this::len).maxOrNull() ?: 0)
+		return (vertLine.map(this::strLenInHalfWidth).maxOrNull() ?: 0)
 	}
 
-	/**
-	 * Return length by bytes (half-width)
-	 */
-	private fun len(s: String): Int {
+	private fun strLenInHalfWidth(s: String): Int {
 		return s.map {
 			if (it.isFullWidth()) 2 else 1
 		}.sum()
 	}
-}
+}

src/test/kotlin/kr/sixtyfive/TableTest.kt

@@ -4,6 +4,15 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class TableTest {
+	@Test
+	fun testLength() {
+		val obj = Table()
+		val method = obj.javaClass.getDeclaredMethod("strLenInHalfWidth", String::class.java)
+		method.isAccessible = true
+
+		assertEquals(7, method.invoke(obj, "안녕 hi"))
+	}
+
 	@Test
 	fun chainCall() {
 		val expected =
@@ -29,11 +38,11 @@ internal class TableTest {
 	}
 
 	@Test
-	fun twoColumns() {
+	fun twoColumnsWithLeftAlignment() {
 		val expected =
-			"ID│  Name\n" +
-			"10│한국어\n"
-		val table = Table()
+			"ID│Name  \n" +
+					"10│한국어\n"
+		val table = Table(LeftAlign)
 		table.addRow("ID", "Name")
 		table.addRow(10, "한국어")
 
@@ -44,32 +53,54 @@ internal class TableTest {
 	fun oneColumnHorizontalLine() {
 		val expected =
 			"Language\n" +
-		    "────────\n" +
-		    "  한국어\n"
+					"────────\n" +
+					"  한국어\n"
 
-		val table = Table()
+		val table = Table(RightAlign)
 		table.addRow("Language")
 		table.addLine()
 		table.addRow("한국어")
 
 		assertEquals(expected, table.render())
 	}
 
+	@Test
+	fun asciiDelimiter() {
+		val expected =
+			"--+------\n" +
+					"ID|  Name\n" +
+					"--+------\n" +
+					"10|한국어\n" +
+					"--+------\n"
+		val table = Table(delimiterSet = AsciiDelimiter)
+		table.addLine()
+		table.addRow("ID", "Name")
+		table.addLine()
+		table.addRow("10", "한국어")
+		table.addLine()
+
+		print(table.render())
+
+		assertEquals(expected, table.render())
+	}
+
 	@Test
 	fun twoColumnsHorizontalLine() {
 		val expected =
 			"──┬──────\n" +
-			"ID│  Name\n" +
-			"──┼──────\n" +
-			"10│한국어\n" +
-			"──┴──────\n"
+					"ID│  Name\n" +
+					"──┼──────\n" +
+					"10│한국어\n" +
+					"──┴──────\n"
 		val table = Table()
 		table.addLine()
 		table.addRow("ID", "Name")
 		table.addLine()
 		table.addRow("10", "한국어")
 		table.addLine()
 
+		print(table.render())
+
 		assertEquals(expected, table.render())
 	}
 
@@ -84,4 +115,4 @@ internal class TableTest {
 
 		assertEquals(expected, table.render())
 	}
-}
+}