Create a new router for presenting new post editor

Tests/KeystoneTests/Tests/Features/CustomPostTypes/BlogCustomPostTypesTests.swift

@@ -0,0 +1,40 @@
+import Testing
+
+@testable import WordPress
+@testable import WordPressData
+
+@MainActor
+struct BlogCustomPostTypesTests {
+    @Test("uses Custom Post Types views when XML-RPC is disabled on self-hosted")
+    func usesCustomPostTypeViews() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext)
+            .isNotHostedAtWPcom()
+            .build()
+        blog.account = nil
+        blog.isXMLRPCDisabled = true
+
+        #expect(blog.usesCustomPostTypeViewsForPostsAndPages)
+    }
+
+    @Test("does not use Custom Post Types views when XML-RPC is enabled")
+    func doesNotUseCustomPostTypeViewsWithXMLRPC() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        blog.isXMLRPCDisabled = false
+
+        #expect(!blog.usesCustomPostTypeViewsForPostsAndPages)
+    }
+
+    @Test("does not use Custom Post Types views for WordPress.com")
+    func doesNotUseCustomPostTypeViewsForWordPressCom() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext)
+            .isHostedAtWPcom()
+            .withAnAccount()
+            .build()
+        blog.isXMLRPCDisabled = true
+
+        #expect(!blog.usesCustomPostTypeViewsForPostsAndPages)
+    }
+}

Tests/KeystoneTests/Tests/Features/CustomPostTypes/PostEditorRouterTests.swift

@@ -0,0 +1,187 @@
+import Foundation
+import Testing
+
+@testable import WordPress
+@testable import WordPressData
+
+@MainActor
+struct PostEditorRouterTests {
+    @Test("selects Core REST for sites using Custom Post Types views")
+    func selectsCoreREST() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        blog.isXMLRPCDisabled = true
+        #expect(PostEditorRouter.destination(for: blog) == .coreREST)
+    }
+
+    @Test("selects legacy for other sites")
+    func selectsLegacy() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        blog.isXMLRPCDisabled = false
+        #expect(PostEditorRouter.destination(for: blog) == .legacy)
+    }
+
+    @Test("converts title content and tags for Core REST")
+    func convertsCoreRESTValues() throws {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        let context = NewPostEditorContext(
+            title: "Title",
+            content: "<!-- wp:paragraph --><p>Body</p><!-- /wp:paragraph -->",
+            tags: "swift, ios"
+        )
+
+        #expect(try context.makeEditorContent().title == "Title")
+        #expect(try context.makeEditorContent().content.contains("Body"))
+        #expect(
+            context.makePostSettings(for: blog).tags == [
+                PostSettings.Term(id: 0, name: "swift"),
+                PostSettings.Term(id: 0, name: "ios")
+            ]
+        )
+    }
+
+    @Test("preserves initial media order as Core REST blocks")
+    func preservesMediaOrder() throws {
+        let contextManager = ContextManager.forTesting()
+        let first = MediaBuilder(contextManager.mainContext).build()
+        first.mediaID = 1
+        first.mediaType = .image
+        first.remoteURL = "https://example.com/one.jpg"
+        let second = MediaBuilder(contextManager.mainContext).build()
+        second.mediaID = 2
+        second.mediaType = .video
+        second.remoteURL = "https://example.com/two.mp4"
+
+        let html = try NewPostEditorContext(initialMedia: [first, second])
+            .makeEditorContent()
+            .content
+        let firstRange = try #require(html.range(of: "one.jpg"))
+        let secondRange = try #require(html.range(of: "two.mp4"))
+
+        #expect(firstRange.lowerBound < secondRange.lowerBound)
+        #expect(html.contains("<!-- wp:image"))
+        #expect(html.contains("<!-- wp:video"))
+    }
+
+    @Test("throws for invalid uploaded Core REST media")
+    func rejectsInvalidMedia() {
+        let contextManager = ContextManager.forTesting()
+        let media = MediaBuilder(contextManager.mainContext).build()
+        media.mediaID = 1
+        media.mediaType = .image
+
+        var didThrow = false
+        do {
+            _ = try NewPostEditorContext(initialMedia: [media]).makeEditorContent()
+        } catch {
+            didThrow = true
+        }
+
+        #expect(didThrow)
+    }
+
+    @Test("throws for an empty Core REST media URL")
+    func rejectsEmptyMediaURL() {
+        let contextManager = ContextManager.forTesting()
+        let media = MediaBuilder(contextManager.mainContext).build()
+        media.mediaID = 1
+        media.mediaType = .image
+        media.remoteURL = ""
+
+        #expect(throws: (any Error).self) {
+            try NewPostEditorContext(initialMedia: [media]).makeEditorContent()
+        }
+    }
+
+    @Test("throws for a relative Core REST media URL")
+    func rejectsRelativeMediaURL() {
+        let contextManager = ContextManager.forTesting()
+        let media = MediaBuilder(contextManager.mainContext).build()
+        media.mediaID = 1
+        media.mediaType = .image
+        media.remoteURL = "uploads/image.jpg"
+
+        #expect(throws: (any Error).self) {
+            try NewPostEditorContext(initialMedia: [media]).makeEditorContent()
+        }
+    }
+
+    @Test("serializes the normalized Core REST media URL")
+    func serializesNormalizedMediaURL() throws {
+        let contextManager = ContextManager.forTesting()
+        let media = MediaBuilder(contextManager.mainContext).build()
+        media.mediaID = 3
+        media.mediaType = .document
+        media.filename = "July Summary.pdf"
+        media.remoteURL = "https://example.com/July Summary.pdf?download=1&source=app"
+
+        let html = try NewPostEditorContext(initialMedia: [media])
+            .makeEditorContent()
+            .content
+
+        #expect(
+            html.contains(
+                #"<!-- wp:file {"id":3,"href":"https://example.com/July%20Summary.pdf?download=1&source=app"} -->"#
+            )
+        )
+        #expect(
+            html.contains(
+                #"<a href="https://example.com/July%20Summary.pdf?download=1&amp;source=app">July Summary.pdf</a>"#
+            )
+        )
+    }
+
+    @Test("preserves blogging prompt identity in Core REST settings")
+    func preservesBloggingPromptMetadata() throws {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        let prompt = try #require(BloggingPrompt.newObject(in: contextManager.mainContext))
+        prompt.promptID = 42
+        prompt.text = "What did you learn today?"
+        prompt.additionalPostTags = ["learning", "daily"]
+        let context = NewPostEditorContext(prompt: prompt)
+
+        let settings = context.makePostSettings(for: blog)
+        #expect(settings.bloggingPromptID == "42")
+        #expect(
+            settings.makeCreateParameters().meta?
+                .valueForKey(
+                    key: "_jetpack_blogging_prompt_key"
+                ) == .string("42")
+        )
+        #expect(try context.makeEditorContent().content.contains(prompt.text))
+        #expect(
+            settings.tags.map(\.name) == [
+                "dailyprompt", "dailyprompt-42", "learning", "daily"
+            ]
+        )
+    }
+
+    @Test("runs the Core REST dismissal callback once after view disappearance")
+    func callsCoreRESTDismissalOnceAfterViewDisappears() {
+        var callbackCount = 0
+        let controller = CoreRESTPostEditorHostingController {
+            callbackCount += 1
+        }
+
+        #expect(callbackCount == 0)
+        controller.viewDidDisappear(false)
+        controller.viewDidDisappear(false)
+        #expect(callbackCount == 1)
+    }
+
+    @Test("applies values through the legacy adapter")
+    func appliesLegacyPostValues() {
+        let contextManager = ContextManager.forTesting()
+        let blog = BlogBuilder(contextManager.mainContext).build()
+        let context = NewPostEditorContext(title: "Title", content: "Body", tags: "swift")
+        let post = blog.createDraftPost()
+        context.applyLegacyValues(to: post)
+
+        #expect(post.postTitle == "Title")
+        #expect(post.content == "Body")
+        #expect(post.tags == "swift")
+    }
+}

WordPress/Classes/Apps/Reader/Home/ReaderHomeViewController.swift

@@ -16,7 +16,12 @@ final class ReaderHomeViewController: ReaderStreamViewController {
         titleView.textLabel.text = SharedStrings.Reader.home
         navigationItem.titleView = titleView
 
-        navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(named: "wpl-add-card")?.resized(to: CGSize(width: 28, height: 28)), style: .plain, target: self, action: #selector(buttonCreatePostTapped))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(
+            image: UIImage(named: "wpl-add-card")?.resized(to: CGSize(width: 28, height: 28)),
+            style: .plain,
+            target: self,
+            action: #selector(buttonCreatePostTapped)
+        )
     }
 
     override func headerForStream(_ topic: ReaderAbstractTopic?, container: UITableViewController) -> UIView? {
@@ -44,12 +49,18 @@ final class ReaderHomeViewController: ReaderStreamViewController {
     }
 
     private func showCreatePostScreen(blog: Blog) {
-        let editorVC = EditPostViewController(blog: blog)
-        editorVC.entryPoint = .dashboard
-        present(editorVC, animated: true)
+        PostEditorRouter.showNewPost(
+            for: blog,
+            from: self,
+            context: NewPostEditorContext(entryPoint: .dashboard)
+        )
     }
 }
 
 private enum Strings {
-    static let homeDetails = NSLocalizedString("reader.home.header.details", value: "Stay current with the blogs you've subscribed to.", comment: "Screen header details")
+    static let homeDetails = NSLocalizedString(
+        "reader.home.header.details",
+        value: "Stay current with the blogs you've subscribed to.",
+        comment: "Screen header details"
+    )
 }

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -1,50 +1,33 @@
 import Foundation
 import WordPressData
 
-extension Post {
-
-    func prepareForPrompt(_ prompt: BloggingPrompt?) {
-        guard let prompt else {
-            return
-        }
-
-        content = promptContent(withPromptText: prompt.text)
-        bloggingPromptID = String(prompt.promptID)
-
-        if let currentTags = tags {
-            tags = "\(currentTags), \(Strings.promptTag)"
-        } else {
-            tags = Strings.promptTag
-        }
-
-        tags?.append(", \(Strings.promptTag)-\(prompt.promptID)")
-
-        // add any additional tags for the prompt.
-        if let additionalPostTags = prompt.additionalPostTags, !additionalPostTags.isEmpty {
-            additionalPostTags
-                .map { ", \($0)" }
-                .forEach { self.tags?.append($0) }
-        }
+extension BloggingPrompt {
+    var editorContent: String {
+        """
+        <!-- wp:pullquote -->
+        <figure class="wp-block-pullquote"><blockquote><p>\(text)</p></blockquote></figure>
+        <!-- /wp:pullquote -->
+        <!-- wp:paragraph -->
+        <p></p>
+        <!-- /wp:paragraph -->
+        """
     }
 
-    private func promptContent(withPromptText promptText: String) -> String {
-        return pullquoteBlock(promptText: promptText) + Strings.emptyParagraphBlock
+    var editorTags: [String] {
+        [Post.Strings.promptTag, "\(Post.Strings.promptTag)-\(promptID)"] + (additionalPostTags ?? [])
     }
+}
 
-    private func pullquoteBlock(promptText: String) -> String {
-        return """
-            <!-- wp:pullquote -->
-            <figure class="wp-block-pullquote"><blockquote><p>\(promptText)</p></blockquote></figure>
-            <!-- /wp:pullquote -->
-            """
+extension Post {
+    func prepareForPrompt(_ prompt: BloggingPrompt?) {
+        guard let prompt else { return }
+        content = prompt.editorContent
+        bloggingPromptID = String(prompt.promptID)
+        tags = (AbstractPost.makeTags(from: tags ?? "") + prompt.editorTags)
+            .joined(separator: ", ")
     }
 
     enum Strings {
         static let promptTag = "dailyprompt"
-        fileprivate static let emptyParagraphBlock = """
-        <!-- wp:paragraph -->
-        <p></p>
-        <!-- /wp:paragraph -->
-        """
     }
 }