[269] Removed PDFTable size defaults

CHANGELOG.md

@@ -8,10 +8,12 @@
 **Fixed bugs:**
 
 - Fixed `PDFList` not calculating available content height correctly (#267)
+- Removed `PDFTable` initializer size defaults (#269)
 
 **Closed issues:**
 
 - Issue #267
+- Issue #269
 
 **Merged pull requests:**
 

Documentation/Usage.md

@@ -299,10 +299,10 @@ document.add(list: list)
 
 ### Table
 
-Create a `PDFTable` element, which will now be customized.
+Create a `PDFTable` element of a given size, which will now be customized.
 
 ```swift
-let table = PDFTable()
+let table = PDFTable(rows: 3, columns: 4)
 ```
 
 Each cell has an optional `content` of type `PDFTableContent`, an optional `style` of `PDFTableCellStyle` and always an `alignment` of `PDFTableCellAlignment`.

Source/API/PDFGenerator+Generation.swift

@@ -141,7 +141,6 @@ extension PDFGenerator {
 
         // Iterate all objects and let them calculate the required rendering bounds
         var needsPageBreak = false
-        var prevPDFObject: PDFLocatedRenderObject?
         for (pdfObjectIdx, locatedPdfObject) in contentObjects.enumerated() {
             let (container, pdfObject) = locatedPdfObject
             if let tocObject = pdfObject as? PDFTableOfContentObject {
@@ -183,7 +182,6 @@ extension PDFGenerator {
                 prevObj = obj
             }
             progress.completedUnitCount += 1
-            prevPDFObject = locatedPdfObject
         }
 
         let result = currentPage

Source/API/Table/PDFTable.swift

@@ -57,14 +57,20 @@ public class PDFTable: PDFDocumentObject {
      */
     public private(set) var size: (rows: Int, columns: Int)
 
-    public convenience init(size: (rows: Int, columns: Int) = (0, 0)) {
+    /// Creates a new table with the given size and populates it with empty cells
+    ///
+    /// - Parameter size: Row and column count of table
+    public convenience init(size: (rows: Int, columns: Int)) {
         self.init(rows: size.rows, columns: size.columns)
     }
 
-    /**
-     Creates a new table with the given size and populates it with empty cells.
-     */
-    public init(rows: Int = 0, columns: Int = 0) {
+    /// Creates a new table with the given size and populates it with empty cells.
+    /// - Parameters:
+    ///   - rows: Rows of table, must be greater than 0
+    ///   - columns: Columns of table, must be greater than 0
+    public init(rows: Int, columns: Int) {
+        assert(rows >= 0, "Can't create a table with negative row count")
+        assert(columns >= 0, "Can't create a table with negative column count")
         self.size = (rows: rows, columns: columns)
         self.cells = (0..<rows).map({ _ in (0..<columns).map({ _ in PDFTableCell() }) })
         self.widths = (0..<columns).map({ _ in 1.0 / CGFloat(columns) })
@@ -74,7 +80,7 @@ public class PDFTable: PDFDocumentObject {
      Creates a new `PDFTable` with the same properties
      */
     internal var copy: PDFTable {
-        let table = PDFTable()
+        let table = PDFTable(size: self.size)
         table.style = self.style
         table.cells = self.cells
         table.widths = self.widths

Tests/TPPDFTests/Internal/Table/PDFTableMergeUtil_Spec.swift

@@ -19,7 +19,7 @@ class PDFTableMergeUtilSpec: QuickSpec {
             let ROWS = 10
             let COLS = 10
 
-            var table = PDFTable()
+            var table = PDFTable(rows: ROWS, columns: COLS)
 
             beforeEach {
                 table = PDFTable(rows: ROWS, columns: COLS)

Tests/TPPDFTests/PDFDocument+Objects_Spec.swift

@@ -281,7 +281,7 @@ class PDFDocument_Objects_Spec: QuickSpec {
 
                 context("table") {
 
-                    let table = PDFTable()
+                    let table = PDFTable(rows: 0, columns: 0)
 
                     it("is possible to add a table into the default container") {
                         document.add(table: table)

Tests/TPPDFTests/Table/PDFTable+Equatable_Spec.swift

@@ -20,22 +20,22 @@ class PDFTable_Equatable_Spec: QuickSpec {
                 var table: PDFTable!
 
                 beforeEach {
-                    table = PDFTable()
+                    table = PDFTable(rows: 0, columns: 0)
                 }
 
                 it("is equal") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     expect(table) == otherTable
                 }
 
                 it("is not equal with different style") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.style = PDFTableStyle(rowHeaderCount: 2)
                     expect(table) != otherTable
                 }
 
                 it("is not equal with different cells") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.cells = [[PDFTableCell(), PDFTableCell()]]
                     expect(table) != otherTable
 
@@ -44,25 +44,25 @@ class PDFTable_Equatable_Spec: QuickSpec {
                 }
 
                 it("is not equal with different widths") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.widths = [0.25, 0.75]
                     expect(table) != otherTable
                 }
 
                 it("is not equal with different padding") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.padding = 100
                     expect(table) != otherTable
                 }
 
                 it("is not equal with different margin") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.margin = 100
                     expect(table) != otherTable
                 }
 
                 it("is not equal with different showHeadersOnEveryPage") {
-                    let otherTable = PDFTable()
+                    let otherTable = PDFTable(rows: 0, columns: 0)
                     otherTable.showHeadersOnEveryPage = !table.showHeadersOnEveryPage
                     expect(table) != otherTable
                 }

Tests/TPPDFTests/Table/PDFTable_Spec.swift

@@ -18,7 +18,7 @@ class PDFTable_Spec: QuickSpec {
 
             context("variables") {
 
-                let table = PDFTable()
+                let table = PDFTable(rows: 0, columns: 0)
 
                 it("has a default style") {
                     expect(table.style) == PDFTableStyleDefaults.simple
@@ -48,7 +48,7 @@ class PDFTable_Spec: QuickSpec {
             context("cell style") {
 
                 it("can set style of cell") {
-                    let table = PDFTable()
+                    let table = PDFTable(rows: 0, columns: 0)
                     table.cells = [[PDFTableCell()]]
 
                     let style = PDFTableCellStyle(colors: (fill: Color.green, text: Color.orange))