Merge branch 'trunk' into woomob-965-yosemite-update

Author: itsmeichigo

Modules/Sources/Networking/Mapper/JetpackConnectionDataMapper.swift

@@ -21,15 +21,19 @@ public struct JetpackConnectionData: Decodable, GeneratedFakeable, GeneratedCopi
     /// Whether the site is already registered with Jetpack.
     /// This field is available only from Jetpack 14.4, so would be nil on older versions.
     /// Ref: pe5sF9-401-p2
+    /// periphery: ignore - used in UI module
     public let isRegistered: Bool?
 
     /// Username of the Jetpack connection owner.
     /// This field is non-nil for sites that already register a connection with Jetpack.
+    /// periphery: ignore - used in UI module
     public let connectionOwner: String?
 
     /// WP blog ID, available only if site has once connected to Jetpack.
+    /// periphery: ignore - used in UI module
     public let blogID: Int64?
 
+    /// periphery: ignore - used by codegen
     public init(currentUser: JetpackUser,
                 isRegistered: Bool?,
                 connectionOwner: String?,

Modules/Sources/Networking/Mapper/JetpackConnectionProvisionMapper.swift

@@ -2,6 +2,7 @@ import Foundation
 
 /// Mapper: Jetpack connection registration
 ///
+/// periphery: ignore - used in `JetpackConnectionRemote`
 struct JetpackConnectionProvisionMapper: Mapper {
 
     /// (Attempts) to extract the updated `currentUser` field from a given JSON Encoded response.

Modules/Sources/Networking/Mapper/JetpackConnectionRegistrationMapper.swift

@@ -2,6 +2,7 @@ import Foundation
 
 /// Mapper: Jetpack connection registration
 ///
+/// periphery: ignore - used in `JetpackConnectionRemote`
 struct JetpackConnectionRegistrationMapper: Mapper {
 
     /// (Attempts) to extract the updated `currentUser` field from a given JSON Encoded response.

Modules/Sources/Networking/Model/JetpackUser.swift

@@ -23,6 +23,7 @@ public struct JetpackUser: Decodable, GeneratedFakeable, GeneratedCopiable {
     public let blogID: Int64?
 
     /// Member-wise initializer
+    /// periphery: ignore - used by codegen
     public init(isConnected: Bool,
                 isPrimary: Bool,
                 username: String,

Modules/Sources/Networking/Model/Product/Product.swift

@@ -795,13 +795,6 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
 
 }
 
-public extension Product {
-    /// Default product URL {site_url}?post_type=product&p={product_id} works for all sites.
-    func alternativePermalink(with siteURL: String) -> String {
-        String(format: "%@?post_type=product&p=%d", siteURL, productID)
-    }
-}
-
 /// Defines all of the Product CodingKeys
 ///
 private extension Product {

Modules/Sources/Networking/Remote/JetpackConnectionRemote.swift

@@ -59,6 +59,7 @@ public final class JetpackConnectionRemote: Remote {
 
     /// Establishes a site-level connection between the site and WordPress.com using Jetpack.
     /// Returns WPCom `blogID` of the connected site.
+    /// periphery: ignore - used in `JetpackConnectionStore` later
     ///
     public func registerSite() async throws -> Int64 {
         let request = RESTRequest(siteURL: siteURL, method: .post, path: Path.jetpackConnectionRegister)
@@ -74,6 +75,7 @@ public final class JetpackConnectionRemote: Remote {
 
     /// Provisions the connection between the site and WordPress.com using Jetpack.
     /// Returns a response containing scope and secret to be sent for finalizing the connection.
+    /// periphery: ignore - used in `JetpackConnectionStore` later
     ///
     public func provisionConnection() async throws -> JetpackConnectionProvisionResponse {
         let request = RESTRequest(siteURL: siteURL, method: .post, path: Path.jetpackConnectionProvision)
@@ -82,6 +84,7 @@ public final class JetpackConnectionRemote: Remote {
     }
 }
 
+/// periphery: ignore - used in test module and on the UI layer
 public enum JetpackConnectionError: Error, Equatable {
     case malformedURL
     case accountConnectionURLNotFound

Modules/Sources/Networking/Remote/SiteRemote.swift

@@ -43,6 +43,8 @@ public protocol SiteRemoteProtocol {
     ///   - siteID: Remote ID of the site
     ///   - siteURL: URL of the site
     ///   - provisionResponse: Response from the provision connection call
+    /// periphery: ignore - used in test module
+    ///
     func finalizeJetpackConnection(siteID: Int64,
                                    siteURL: String,
                                    provisionResponse: JetpackConnectionProvisionResponse) async throws
@@ -172,6 +174,7 @@ public class SiteRemote: Remote, SiteRemoteProtocol {
     }
 
     /// Finalizes the Jetpack connection by sending a request to WPCom.
+    /// periphery: ignore - used in `JetpackConnectionStore` later
     ///
     public func finalizeJetpackConnection(siteID: Int64,
                                           siteURL: String,

Modules/Sources/Yosemite/Tools/ResultsController.swift

@@ -51,7 +51,7 @@ public class GenericResultsController<T: ResultsControllerMutableType, Output> {
 
     /// Internal NSFetchedResultsController Instance.
     ///
-    private lazy var controller: NSFetchedResultsController<T> = {
+    public private(set) lazy var controller: NSFetchedResultsController<T> = {
         viewStorage.createFetchedResultsController(
                 fetchRequest: fetchRequest,
                 sectionNameKeyPath: sectionNameKeyPath,
@@ -65,10 +65,6 @@ public class GenericResultsController<T: ResultsControllerMutableType, Output> {
     // swiftlint:disable:next weak_delegate
     private let internalDelegate = FetchedResultsControllerDelegateWrapper()
 
-    /// NotificationCenter ObserverBlock Token
-    ///
-    private var notificationCenterToken: Any?
-
     /// Closure to be executed before the results are changed.
     ///
     public var onWillChangeContent: (() -> Void)?

Modules/Tests/NetworkingTests/Mapper/ProductMapperTests.swift

@@ -29,8 +29,6 @@ final class ProductMapperTests: XCTestCase {
             XCTAssertEqual(product.name, "Book the Green Room")
             XCTAssertEqual(product.slug, "book-the-green-room")
             XCTAssertEqual(product.permalink, "https://example.com/product/book-the-green-room/")
-            XCTAssertEqual(product.alternativePermalink(with: "https://example.com"),
-                           "https://example.com?post_type=product&p=\(dummyProductID)")
 
             let dateCreated = DateFormatter.Defaults.dateTimeFormatter.date(from: "2019-02-19T17:33:31")
             let dateModified = DateFormatter.Defaults.dateTimeFormatter.date(from: "2019-02-19T17:48:01")

Modules/Tests/YosemiteTests/Tools/ResultsControllerTests.swift

@@ -56,7 +56,6 @@ final class ResultsControllerTests: XCTestCase {
     ///
     func testResultsControllerPicksUpEntitiesAvailablePriorToInstantiation() {
         storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
 
         let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage, sortedBy: [sampleSortDescriptor])
         try? resultsController.performFetch()
@@ -70,12 +69,11 @@ final class ResultsControllerTests: XCTestCase {
     /// Verifies that ResultsController does pick up entities inserted after being instantiated.
     ///
     func testResultsControllerPicksUpEntitiesInsertedAfterInstantiation() {
+        storageManager.insertSampleAccount()
+
         let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage, sortedBy: [sampleSortDescriptor])
         try? resultsController.performFetch()
 
-        storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
-
         XCTAssertEqual(resultsController.sections.count, 1)
         XCTAssertEqual(resultsController.sections.first?.objects.count, 1)
         XCTAssertEqual(resultsController.sections.first?.numberOfObjects, 1)
@@ -85,18 +83,16 @@ final class ResultsControllerTests: XCTestCase {
     /// Verifies that `sectionNameKeyPath` effectively causes the ResultsController to produce multiple sections, based on the grouping parameter.
     ///
     func testResultsControllerGroupSectionsBySectionNameKeypath() {
-        let sectionNameKeyPath = "userID"
-        let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage,
-                                                                   sectionNameKeyPath: sectionNameKeyPath,
-                                                                   sortedBy: [sampleSortDescriptor])
-        try? resultsController.performFetch()
-
         let numberOfAccounts = 100
         for _ in 0 ..< numberOfAccounts {
             storageManager.insertSampleAccount()
         }
 
-        viewStorage.saveIfNeeded()
+        let sectionNameKeyPath = "userID"
+        let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage,
+                                                                   sectionNameKeyPath: sectionNameKeyPath,
+                                                                   sortedBy: [sampleSortDescriptor])
+        try? resultsController.performFetch()
 
         XCTAssertEqual(resultsController.sections.count, numberOfAccounts)
 
@@ -109,15 +105,13 @@ final class ResultsControllerTests: XCTestCase {
     /// Verifies that `object(at indexPath:)` effectively returns the expected (ReadOnly) Entity.
     ///
     func testObjectAtIndexPathReturnsExpectedEntity() {
+        let mutableAccount = storageManager.insertSampleAccount()
         let sectionNameKeyPath = "userID"
         let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage,
                                                                    sectionNameKeyPath: sectionNameKeyPath,
                                                                    sortedBy: [sampleSortDescriptor])
         try? resultsController.performFetch()
 
-        let mutableAccount = storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
-
         let indexPath = IndexPath(row: 0, section: 0)
         let readOnlyAccount = resultsController.object(at: indexPath)
 
@@ -144,7 +138,6 @@ final class ResultsControllerTests: XCTestCase {
         }
 
         storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
 
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
@@ -167,7 +160,6 @@ final class ResultsControllerTests: XCTestCase {
         }
 
         storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
 
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
@@ -189,7 +181,6 @@ final class ResultsControllerTests: XCTestCase {
         }
 
         storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
 
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
@@ -211,7 +202,6 @@ final class ResultsControllerTests: XCTestCase {
         }
 
         storageManager.insertSampleAccount()
-        viewStorage.saveIfNeeded()
 
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
@@ -228,7 +218,6 @@ final class ResultsControllerTests: XCTestCase {
         let second = storageManager.insertSampleAccount().toReadOnly()
         let expected = [first.userID: first, second.userID: second]
 
-        viewStorage.saveIfNeeded()
 
         for retrieved in resultsController.fetchedObjects {
             XCTAssertEqual(retrieved.username, expected[retrieved.userID]?.username)
@@ -239,14 +228,13 @@ final class ResultsControllerTests: XCTestCase {
     /// Verifies that `fetchedObjects` effectively  returns all of the (readOnly) objects that are expected to be available.
     ///
     func testResettingStorageIsMappedIntoOnResetClosure() {
+        storageManager.insertSampleAccount()
+        storageManager.insertSampleAccount()
+
         let sortDescriptor = NSSortDescriptor(key: #selector(getter: StorageAccount.userID).description, ascending: true)
         let resultsController = ResultsController<StorageAccount>(viewStorage: viewStorage, sortedBy: [sortDescriptor])
         try? resultsController.performFetch()
 
-        storageManager.insertSampleAccount()
-        storageManager.insertSampleAccount()
-
-        viewStorage.saveIfNeeded()
         XCTAssertEqual(resultsController.fetchedObjects.count, 2)
 
         let expectation = self.expectation(description: "OnDidReset")
@@ -296,8 +284,6 @@ final class ResultsControllerTests: XCTestCase {
             }
         }
 
-        viewStorage.saveIfNeeded()
-
         for (sectionNumber, sectionObject) in resultsController.sections.enumerated() {
             for (row, object) in sectionObject.objects.enumerated() {
                 let indexPath = IndexPath(row: row, section: sectionNumber)