Merge pull request #206 from techprimate/release/2.0.1

Release/2.0.1

CHANGELOG.md

@@ -5,14 +5,28 @@
 
 **Implemented enhancements:**
 
-- Added deprecation for JSON representation
+**Fixed bugs:**
+
+**Closed issues:**
+
+**Merged pull requests:**
+
+
+## [2.0.1](https://github.com/techprimate/TPPDF/tree/2.0.1) (2020-05-31)
+[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.0.0...2.0.1)
+
+**Implemented enhancements:**
+
+- Removed JSON representation
 - Added deprecation for `table.generateCells`
 
 **Fixed bugs:**
 
+- Missing page break after space which overlaps page end (#204)
+
 **Closed issues:**
 
-**Merged pull requests:**
+- #204
 
 ## [2.0.0](https://github.com/techprimate/TPPDF/tree/2.0.0) (2020-05-19)
 [Full Changelog](https://github.com/techprimate/TPPDF/compare/1.6.0...2.0.0)

Example iOS-SwiftPM/Example.xcodeproj/project.pbxproj

@@ -156,23 +156,23 @@
 		D498551D2461FB0B00D54270 /* Examples */ = {
 			isa = PBXGroup;
 			children = (
-				D498551E2461FB0B00D54270 /* PaginationExampleFactory.swift */,
-				D498551F2461FB0B00D54270 /* TableOfContentsExampleFactory.swift */,
-				D49855202461FB0B00D54270 /* TableExampleFactory.swift */,
-				D49855212461FB0B00D54270 /* LineSeparatorExampleFactory.swift */,
-				D49855222461FB0B00D54270 /* TextStylesExampleFactory.swift */,
-				D49855232461FB0B00D54270 /* MultiSectionExampleFactory.swift */,
+				D49855552461FB9A00D54270 /* Examples.swift */,
+				D498552B2461FB0B00D54270 /* ExperimentFactory.swift */,
+				D49855262461FB0B00D54270 /* ExternalDocumentExampleFactory.swift */,
 				D49855242461FB0B00D54270 /* GroupExampleFactory.swift */,
 				D49855252461FB0B00D54270 /* HeaderFooterExampleFactory.swift */,
-				D49855262461FB0B00D54270 /* ExternalDocumentExampleFactory.swift */,
-				D49855272461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift */,
-				D49855282461FB0B00D54270 /* ListExampleFactory.swift */,
-				D49855292461FB0B00D54270 /* TextExampleFactory.swift */,
-				D498552A2461FB0B00D54270 /* ObjectAttributesExampleFactory.swift */,
-				D498552B2461FB0B00D54270 /* ExperimentFactory.swift */,
 				D498552C2461FB0B00D54270 /* ImageExampleFactory.swift */,
+				D49855212461FB0B00D54270 /* LineSeparatorExampleFactory.swift */,
+				D49855282461FB0B00D54270 /* ListExampleFactory.swift */,
 				D498552D2461FB0B00D54270 /* MetadataExampleFactory.swift */,
-				D49855552461FB9A00D54270 /* Examples.swift */,
+				D49855272461FB0B00D54270 /* MultipleDocumentsExampleFactory.swift */,
+				D49855232461FB0B00D54270 /* MultiSectionExampleFactory.swift */,
+				D498552A2461FB0B00D54270 /* ObjectAttributesExampleFactory.swift */,
+				D498551E2461FB0B00D54270 /* PaginationExampleFactory.swift */,
+				D49855202461FB0B00D54270 /* TableExampleFactory.swift */,
+				D498551F2461FB0B00D54270 /* TableOfContentsExampleFactory.swift */,
+				D49855292461FB0B00D54270 /* TextExampleFactory.swift */,
+				D49855222461FB0B00D54270 /* TextStylesExampleFactory.swift */,
 			);
 			path = Examples;
 			sourceTree = "<group>";

Shared iOS/UI/ExamplesListViewController.swift

@@ -11,6 +11,11 @@ import UIKit
 
 class ExamplesListViewController: UITableViewController {
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidLoad()
+        //performSegue(withIdentifier: "show-example", sender: IndexPath(row: 0, section: 1))
+    }
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return Examples.factories.count
     }

Shared/Examples/TextExampleFactory.swift

@@ -63,6 +63,9 @@ class TextExampleFactory: ExampleFactory {
         document.set(font: UIFont.italicSystemFont(ofSize: 13))
         document.add(text: LoremIpsum.get(words: 100))
 
+        document.add(space: 300)
+        document.add(text: "Test text here")
+
         return [document]
     }
 }

Source/API/Graphics/PDFLineStyle.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  This struct defines how a line or border of a table is drawn.
  */
-public struct PDFLineStyle: PDFJSONSerializable {
+public struct PDFLineStyle {
 
     /**
      Defines the type of this line

Source/API/Graphics/PDFLineType.swift

@@ -35,24 +35,3 @@ public enum PDFLineType {
     case dotted
 
 }
-
-// MARK: - JSON Serialization
-
-extension PDFLineType: PDFJSONSerializable {
-
-    /**
-     Creates a serializable object
-     */
-    public var JSONRepresentation: AnyObject {
-        switch self {
-        case .none:
-            return 0 as AnyObject
-        case .full:
-            return 1 as AnyObject
-        case .dashed:
-            return 2 as AnyObject
-        case .dotted:
-            return 3 as AnyObject
-        }
-    }
-}

Source/API/Groups/PDFGroup.swift

@@ -11,7 +11,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFGroup: PDFJSONSerializable {
+public class PDFGroup {
 
     // MARK: - PUBLIC VARS
 

Source/API/Groups/PDFGroupContainer.swift

@@ -60,24 +60,3 @@ public enum PDFGroupContainer {
         }
     }
 }
-
-// MARK: - JSON Serialization
-
-extension PDFGroupContainer: PDFJSONSerializable {
-
-    /**
-     Creates a representable object
-     */
-    public var JSONRepresentation: AnyObject {
-        switch self {
-        case .none:
-            return 0 as AnyObject
-        case .left:
-            return 1 as AnyObject
-        case .center:
-            return 2 as AnyObject
-        case .right:
-            return 3 as AnyObject
-        }
-    }
-}

Source/API/Image/PDFImage.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  Image element for the PDF document. Contains all information about an image, including the caption.
  */
-public class PDFImage: PDFDocumentObject, PDFJSONSerializable {
+public class PDFImage: PDFDocumentObject {
 
     /**
      The actual image

Source/API/Image/PDFImageSizeFit.swift

@@ -26,22 +26,3 @@ public enum PDFImageSizeFit {
     case widthHeight
 
 }
-
-// MARK: - JSON Serialization
-
-extension PDFImageSizeFit: PDFJSONSerializable {
-
-    /**
-     Creates representable object
-     */
-    public var JSONRepresentation: AnyObject {
-        switch self {
-        case .width:
-            return 0 as AnyObject
-        case .height:
-            return 1 as AnyObject
-        case .widthHeight:
-            return 2 as AnyObject
-        }
-    }
-}

Source/API/Layout/PDFContainer.swift

@@ -130,36 +130,3 @@ public enum PDFContainer: CaseIterable {
         ]
     }
 }
-
-// MARK: - JSON Serialization
-
-extension PDFContainer: PDFJSONSerializable {
-
-    /**
-     Creates a representable object
-     */
-    public var JSONRepresentation: AnyObject {
-        switch self {
-        case .none:
-            return 0 as AnyObject
-        case .headerLeft:
-            return 1 as AnyObject
-        case .headerCenter:
-            return 2 as AnyObject
-        case .headerRight:
-            return 3 as AnyObject
-        case .contentLeft:
-            return 4 as AnyObject
-        case .contentCenter:
-            return 5 as AnyObject
-        case .contentRight:
-            return 6 as AnyObject
-        case .footerLeft:
-            return 7 as AnyObject
-        case .footerCenter:
-            return 8 as AnyObject
-        case .footerRight:
-            return 9 as AnyObject
-        }
-    }
-}

Source/API/Layout/PDFPageLayout.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  Contains all relevant layout informations of a pdf document
  */
-public struct PDFPageLayout: PDFJSONSerializable {
+public struct PDFPageLayout {
 
     // MARK: - PUBLIC VARS
 

Source/API/List/PDFList.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFList: PDFDocumentObject, PDFJSONSerializable {
+public class PDFList: PDFDocumentObject {
 
     /**
      TODO: Documentation

Source/API/List/PDFListItem.swift

@@ -80,27 +80,6 @@ public class PDFListItem: PDFDocumentObject {
     }
 }
 
-extension PDFListItem: PDFJSONSerializable {
-
-    /**
-     TODO: documentation
-     */
-    public var JSONRepresentation: AnyObject {
-        var representation: [String: AnyObject] = [:]
-        if let content = content {
-            representation["content"] = content as AnyObject
-        }
-        representation["symbol"] = symbol.JSONRepresentation
-
-        if let children = children {
-            let result = children.map(\.JSONRepresentation) as AnyObject
-
-            representation["children"] = result
-        }
-        return representation as AnyObject
-    }
-}
-
 extension PDFListItem: CustomDebugStringConvertible {
 
     public var debugDescription: String {

Source/API/List/PDFListItemSymbol.swift

@@ -8,7 +8,7 @@
 /**
  TODO: documentation
  */
-public enum PDFListItemSymbol: RawRepresentable, PDFJSONSerializable {
+public enum PDFListItemSymbol: RawRepresentable {
 
     /**
      TODO: documentation
@@ -112,11 +112,4 @@ public enum PDFListItemSymbol: RawRepresentable, PDFJSONSerializable {
             }
         }
     }
-
-    /**
-     TODO: documentation
-     */
-    public var JSONRepresentation: AnyObject {
-        self.rawValue as AnyObject
-    }
 }

Source/API/Metadata/PDFInfo.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  Information saved in PDF file metadata.
  */
-public class PDFInfo: PDFJSONSerializable {
+public class PDFInfo {
 
     /**
      Title of document.

Source/API/PDFDocument.swift

@@ -8,10 +8,8 @@
 /**
  The main class users interact with.
  This object holds the information about the document and also all PDF objects.
-
- It is possible to create a JSON representation using the `PDFJSONSerializable` protocol.
  */
-public class PDFDocument: CustomStringConvertible, PDFJSONSerializable {
+public class PDFDocument: CustomStringConvertible {
 
     // MARK: - PUBLIC VARS
 

Source/API/Section/PDFSection.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFSection: PDFDocumentObject, PDFJSONSerializable {
+public class PDFSection: PDFDocumentObject {
 
 	/**
 	List of section columns.

Source/API/Section/PDFSectionColumn.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFSectionColumn: PDFDocumentObject, PDFJSONSerializable {
+public class PDFSectionColumn: PDFDocumentObject {
 
 	// MARK: - PUBLIC VARS
 

Source/API/Table Of Content/PDFTableOfContent.swift

@@ -15,7 +15,7 @@ internal typealias WeakPDFTextStyleRef = WeakRef<PDFTextStyle>
 /**
  TODO: Documentation
  */
-public class PDFTableOfContent: PDFDocumentObject, PDFJSONSerializable {
+public class PDFTableOfContent: PDFDocumentObject {
 
     /**
      TODO: Documentation

Source/API/Table/Content/PDFTableContent+ContentType.swift

@@ -13,7 +13,7 @@ extension PDFTableContent {
     /**
      TODO: Documentation
      */
-    internal enum ContentType: PDFJSONSerializable {
+    internal enum ContentType {
 
         /**
          TODO: Documentation
@@ -34,21 +34,6 @@ extension PDFTableContent {
          TODO: Documentation
          */
         case image
-
-        /**
-         TODO: Documentation
-         */
-        internal var JSONRepresentation: AnyObject {
-            switch self {
-            case .none:
-                return 0 as AnyObject
-            case .string:
-                return 1 as AnyObject
-            case .attributedString:
-                return 2 as AnyObject
-            case .image:
-                return 3 as AnyObject
-            }
-        }
+
     }
 }

Source/API/Table/Content/PDFTableContent.swift

@@ -10,7 +10,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFTableContent: PDFJSONSerializable {
+public class PDFTableContent {
 
     /**
      TODO: Documentation

Source/API/Table/PDFTable.swift

@@ -11,7 +11,7 @@ import UIKit
  A table is a two dimensional list.
  It can be styled and can contain different data.
  */
-public class PDFTable: PDFDocumentObject, PDFJSONSerializable {
+public class PDFTable: PDFDocumentObject {
 
     /**
      Styling used for drawing