refactor: Clean up Makefile and improve code readability in PDF render objects

Author: philprime

Makefile

@@ -11,9 +11,6 @@
 # CONFIGURATION
 # ============================================================================
 
-# Xcode project used to build TPPDF
-XCODE_PROJECT = TPPDF.xcodeproj
-
 # Xcode scheme used to build TPPDF
 XCODE_SCHEME = TPPDF
 
@@ -209,7 +206,6 @@ test-disable:
 .PHONY: test-ios
 test-ios: build-ios test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=iOS Simulator,OS=$(IOS_SIMULATOR_OS),name=$(IOS_DEVICE_NAME)' \
 		test | tee raw-test-ios.log | xcbeautify --preserve-unbeautified
@@ -221,7 +217,6 @@ test-ios: build-ios test-enable
 .PHONY: test-macos
 test-macos: build-macos test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=macOS' \
 		test | tee raw-test-macos.log | xcbeautify --preserve-unbeautified
@@ -233,7 +228,6 @@ test-macos: build-macos test-enable
 .PHONY: test-maccatalyst
 test-maccatalyst: build-maccatalyst test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=macOS,variant=Mac Catalyst' \
 		test | tee raw-test-maccatalyst.log | xcbeautify --preserve-unbeautified
@@ -245,7 +239,6 @@ test-maccatalyst: build-maccatalyst test-enable
 .PHONY: test-tvos
 test-tvos: build-tvos test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=tvOS Simulator,OS=$(TVOS_SIMULATOR_OS),name=$(TVOS_DEVICE_NAME)' \
 		test | tee raw-test-tvos.log | xcbeautify --preserve-unbeautified
@@ -257,7 +250,6 @@ test-tvos: build-tvos test-enable
 .PHONY: test-watchos
 test-watchos: build-watchos test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=watchOS Simulator,OS=$(WATCHOS_SIMULATOR_OS),name=$(WATCHOS_DEVICE_NAME)' \
 		test | tee raw-test-watchos.log | xcbeautify --preserve-unbeautified
@@ -269,7 +261,6 @@ test-watchos: build-watchos test-enable
 .PHONY: test-visionos
 test-visionos: build-visionos test-enable
 	set -o pipefail && NSUnbufferedIO=YES xcrun xcodebuild \
-		-project $(XCODE_PROJECT) \
 		-scheme $(XCODE_SCHEME) \
 		-destination 'platform=visionOS Simulator,OS=$(VISION_OS_SIMULATOR_OS),name=$(VISION_OS_DEVICE_NAME)' \
 		test | tee raw-test-visionos.log | xcbeautify --preserve-unbeautified

Source/API/Utils/PDFRenderObject.swift

@@ -22,7 +22,7 @@ public class PDFRenderObject: CustomStringConvertible {
 
     ///  Attributes set for this object, and their calculated frame
     var attributes: [(attribute: PDFObjectAttribute, frame: CGRect)] = []
-    
+
     init(frame: CGRect = .null, attributes: [(attribute: PDFObjectAttribute, frame: CGRect)] = []) {
         self.frame = frame
         self.attributes = attributes

Source/Internal/Table/PDFTableObject.swift

@@ -272,7 +272,7 @@ class PDFTableObject: PDFRenderObject {
         return NSAttributedString(string: text, attributes: attributes)
     }
 
-    func createRenderObjects( // swiftlint:disable:this cyclomatic_complexity
+    func createRenderObjects(
         generator: PDFGenerator,
         container: PDFContainer,
         cells: [PDFTableCalculatedCell],
@@ -304,7 +304,7 @@ class PDFTableObject: PDFRenderObject {
                     cellFrame.origin.y += table.margin
                     contentFrame.origin.y -= startPosition.y - minOffset
                     contentFrame.origin.y += table.margin
-                    
+
                     // Maintain pageStart and pageEnd
                     pageStart.x = min(cellFrame.minX, pageStart.x)
                     pageStart.y = min(cellFrame.minY, pageStart.y)
@@ -401,7 +401,7 @@ class PDFTableObject: PDFRenderObject {
                                                     maxOffset: maxOffset)
                 result += try sliceObject.calculate(generator: generator, container: container)
             }
-            
+
             // Draw the table outline for the page
             let tableOutlineObject = PDFRectangleObject(lineStyle: table.style.outline, frame: CGRect(
                 x: pageStart.x - table.margin,
@@ -410,13 +410,13 @@ class PDFTableObject: PDFRenderObject {
                 height: pageEnd.y - pageStart.y + table.margin*2
             ))
             result += [(container, tableOutlineObject)]
-            
+
             if !nextPageCells.isEmpty {
                 result += try PDFPageBreakObject().calculate(generator: generator, container: container)
                 firstPage = false
             }
         } while !nextPageCells.isEmpty
-        
+
         return (objects: result, offset: pageEnd.y + table.margin)
     }
 
@@ -515,7 +515,7 @@ class PDFTableObject: PDFRenderObject {
     ///   - frame: Frame of cell
     /// - Returns: Calculated `PDFRectangleObject`
     func createCellBackgroundObject(style: PDFTableCellStyle, frame: CGRect) -> PDFRenderObject {
-        return PDFRectangleObject(lineStyle: .none, frame: frame, fillColor: style.colors.fill)
+        PDFRectangleObject(lineStyle: .none, frame: frame, fillColor: style.colors.fill)
     }
 
     /**

Tests/TPPDFTests/Layout/PDFLayout_Spec.swift

@@ -64,8 +64,8 @@ class PDFLayout_Spec: QuickSpec {
             it("can set content offset in heights") {
                 expect(PDFContainer.all).to(allPass {
                     let random = CGFloat(arc4random())
-                    layout.setContentOffset(in: $0, to: random)
-                    return layout.getContentOffset(in: $0) == random
+                    layout.setContentOffset(in: $0!, to: random)
+                    return layout.getContentOffset(in: $0!) == random
                 })
             }