Center align, perf & fix stuck width

CHANGELOG.md

@@ -1,11 +1,23 @@
 # Change Log
 
+## [1.0.0-alpha.1](https://github.com/cfilipov/TextTable/releases/tag/v1.0.0-alpha.1)
+
+* Support for center alignment.
+* If all columns have explicit width, then width calculations are skipped.
+* Escape strings in certain formats (HTML & Latex, for example).
+* Fixed: `TextTable` config persists calculated column widths. This results in widths getting stuck from the first call to `print` or `string(for:)`.
+
+##### Known Issues in 1.0.0-alpha.1
+
+* Very little effort has but put into performance optimizations.
+* It should be possible to create columns without headers, but this hasn't been tested and likely doesn't work yet.
+
 ## [1.0.0-alpha.0](https://github.com/cfilipov/TextTable/releases/tag/v1.0.0-alpha.0)
 
-* Breaking change: completely re-written API. No more conforming to a protocol, instead a `TextTable` class is used in similar to `NSFormatter`. This offers much more flexibility.
+* Breaking change: completely re-written API. No more conforming to a protocol, instead a `TextTable` class is used in a similar way to `NSFormatter`. This offers much more flexibility.
 * Many more output formats. Similar to what you get from Python's [tabulate](https://pypi.python.org/pypi/tabulate) lib.
 
-### Known Issues in 1.0.0-alpha.0
+##### Known Issues in 1.0.0-alpha.0
 
 * No attempt at optimizing performance has been made yet. Even when widths are provided, an expensive calculation is still performed.
 * No escaping is being done. None of the formatters even attempt to sanitize the input strings.

README.md

@@ -4,7 +4,7 @@ Easily print textual tables in Swift. Inspired by the Python [tabulate](https://
 
 Latest Version   | 
 ---------------- |
-[1.0.0-alpha.0](https://github.com/cfilipov/TextTable/releases/tag/v1.0.0-alpha.0) |
+[1.0.0-alpha.1](https://github.com/cfilipov/TextTable/releases/tag/v1.0.0-alpha.1) |
 
 ## Features
 
@@ -128,7 +128,7 @@ For a full list of supported formats see [Supported Formats](#supported-formats)
 
 ### Column-Specific Formatters
 
-You can specify a [Formatter](https://developer.apple.com/reference/foundation/nsformatter) on a per-column basis. In this example a `DateFormatter` is used to customize the display of the `Birthday` column.
+You can specify a [Formatter](https://developer.apple.com/reference/foundation/nsformatter) on a per-column basis. In this example a [DateFormatter](https://developer.apple.com/reference/foundation/nsdateformatter) is used to customize the display of the `Birthday` column.
 
 ```Swift
 let dateFormatter = DateFormatter()
@@ -216,7 +216,6 @@ TextTable supports most of the formats as [tabulate](https://pypi.python.org/pyp
 ### Plain
 
 ```
-> table.print(data) // or..
 > table.print(data, format: Format.Plain())
 
 Name  Age Birthday
@@ -230,6 +229,7 @@ Eve   142  8/13/16
 `Simple` is the default format. It corresponds to `simple_tables` in [Pandoc](http://pandoc.org/) Markdown extensions.
 
 ```
+> table.print(data) // or..
 > table.print(data, format: Format.Simple())
 
 Name  Age Birthday

Sources/FancyGridFormat.swift

@@ -14,11 +14,15 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
-        public var row: Int = 0
+        public var align: Alignment = .left
 
+        private var row: Int = 0
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
 
         public func endTable() {
@@ -79,15 +83,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }

Sources/GridFormat.swift

@@ -14,10 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
         public func endTable() { }
         public func beginHeaderRow() { }
@@ -64,15 +68,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }

Sources/HtmlFormat.swift

@@ -14,7 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
+
+        public static func escape(_ s: String) -> String {
+            return s
+                .replacingOccurrences(of: "&", with: "&")
+                .replacingOccurrences(of: "<", with: "&lt;")
+                .replacingOccurrences(of: "<", with: "&gt;")
+        }
 
         public func beginTable() {
             string.append("<table>\n")
@@ -43,14 +50,10 @@ extension Format {
         public func beginHeaderColumn() {
             string.append("<")
             string.append("th")
-            if alignment != nil || width != nil {
-                string.append(" ")
-                string.append("style=\"")
-                if let alignment = alignment {
-                    string.append("text-align:\(alignment.rawValue);")
-                }
-                string.append("\"")
-            }
+            string.append(" ")
+            string.append("style=\"")
+            string.append("text-align:\(align.rawValue);")
+            string.append("\"")
             string.append(">")
         }
 

Sources/LatexFormat.swift

@@ -14,10 +14,24 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+                .replacingOccurrences(of: "#", with: "\\#")
+                .replacingOccurrences(of: "$", with: "\\$")
+                .replacingOccurrences(of: "%", with: "\\%")
+                .replacingOccurrences(of: "&", with: "\\&")
+                .replacingOccurrences(of: "\\", with: "\\textbackslash{}")
+                .replacingOccurrences(of: "^", with: "\\textasciicircum{}")
+                .replacingOccurrences(of: "_", with: "\\_")
+                .replacingOccurrences(of: "{", with: "\\{")
+                .replacingOccurrences(of: "}", with: "\\}")
+                .replacingOccurrences(of: "~", with: "\\textasciitilde{}")
+        }
+
         public func beginTable() {
             string.append("\\begin{tabular}{lr}\n")
         }
@@ -54,18 +68,7 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
-            if let width = width {
-                contentStack.append(pad(length: width, character: " "))
-            } else {
-                contentStack.append(s)
-            }
+            contentStack.append(s)
         }
     }
 }

Sources/OrgFormat.swift

@@ -14,10 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
         public func endTable() { }
         public func beginHeaderRow() { }
@@ -52,15 +56,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }

Sources/PipeFormat.swift

@@ -14,12 +14,16 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var isHeader: Bool = false
         private var contentStack: [String] = []
         private var headerStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
         public func endTable() { }
 
@@ -58,24 +62,16 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             let w = max(width!, 3)
-            contentStack.append(pad(length: w, character: " "))
+            contentStack.append(s.pad(align, length: w))
             if isHeader {
-                switch alignment {
-                case .some(.left):
+                switch align {
+                case .left:
                     headerStack.append(":" + String(repeating: Character("-"), count: w+1))
-                case .some(.right):
+                case .right:
                     headerStack.append(String(repeating: Character("-"), count: w+1) + ":")
-                case .some(.center):
-                    headerStack.append(":" + String(repeating: Character("-"), count: w-2) + ":")
-                case .none: fatalError()
+                case .center:
+                    headerStack.append(":" + String(repeating: Character("-"), count: w) + ":")
                 }
             }
         }

Sources/PlainFormat.swift

@@ -14,10 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
         public func endTable() { }
         public func beginHeaderRow() { }
@@ -42,15 +46,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }

Sources/PsqlFormat.swift

@@ -14,10 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
 
         public func endTable() {
@@ -68,15 +72,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }

Sources/RstFormat.swift

@@ -14,10 +14,14 @@ extension Format {
 
         public var string: String = ""
         public var width: Int? = nil
-        public var alignment: Alignment? = nil
+        public var align: Alignment = .left
 
         private var contentStack: [String] = []
 
+        public static func escape(_ s: String) -> String {
+            return s
+        }
+
         public func beginTable() { }
 
         public func endTable() {
@@ -59,15 +63,8 @@ extension Format {
         public func endColumn() { }
 
         public func content(_ s: String) {
-            let pad: PaddingFunction
-            switch alignment {
-            case .some(.left): pad = s.rightpad
-            case .some(.right): pad = s.leftpad
-            case .some(.center): fatalError()
-            case .none: pad = s.leftpad
-            }
             if let width = width {
-                contentStack.append(pad(length: width, character: " "))
+                contentStack.append(s.pad(align, length: width))
             } else {
                 contentStack.append(s)
             }