Extract Gutenberg content processors to WordPressShared

jkmassel · jkmassel · commit 6e9a61ae45c7 · 2026-07-22T11:56:34.000-06:00
Move GutenbergContentParser, the GutenbergProcessor protocol, and the image,
gallery, and file upload processors into WordPressShared, and relocate their
tests. The Cover/Video/VideoPress/Audio processors and PostCoordinator stay in
the app and now import WordPressShared.
diff --git a/Modules/Sources/WordPressShared/Gutenberg/GutenbergContentParser.swift b/Modules/Sources/WordPressShared/Gutenberg/GutenbergContentParser.swift
diff --git a/Modules/Sources/WordPressShared/Gutenberg/GutenbergFileUploadProcessor.swift b/Modules/Sources/WordPressShared/Gutenberg/GutenbergFileUploadProcessor.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-class GutenbergFileUploadProcessor: GutenbergProcessor {
+public class GutenbergFileUploadProcessor: GutenbergProcessor {
     private struct FileBlockKeys {
         static var name = "wp:file"
         static var id = "id"
@@ -11,7 +11,7 @@ class GutenbergFileUploadProcessor: GutenbergProcessor {
     let remoteURLString: String
     let serverMediaID: Int
 
-    init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {
+    public init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {
         self.mediaUploadID = mediaUploadID
         self.serverMediaID = serverMediaID
         self.remoteURLString = remoteURLString
@@ -34,7 +34,7 @@ class GutenbergFileUploadProcessor: GutenbergProcessor {
         }
     }
 
-    func process(_ blocks: [GutenbergParsedBlock]) {
+    public func process(_ blocks: [GutenbergParsedBlock]) {
         processFileBlocks(blocks)
     }
 }
diff --git a/Modules/Sources/WordPressShared/Gutenberg/GutenbergGalleryUploadProcessor.swift b/Modules/Sources/WordPressShared/Gutenberg/GutenbergGalleryUploadProcessor.swift
@@ -1,7 +1,7 @@
 import Foundation
 import SwiftSoup
 
-class GutenbergGalleryUploadProcessor: GutenbergProcessor {
+public class GutenbergGalleryUploadProcessor: GutenbergProcessor {
 
     let mediaUploadID: Int32
     let remoteURLString: String
@@ -12,7 +12,7 @@ class GutenbergGalleryUploadProcessor: GutenbergProcessor {
 
     static let imgClassIDPrefixAttribute = "wp-image-"
 
-    init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String, mediaLink: String) {
+    public init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String, mediaLink: String) {
         self.mediaUploadID = mediaUploadID
         self.serverMediaID = serverMediaID
         self.remoteURLString = remoteURLString
@@ -139,7 +139,7 @@ class GutenbergGalleryUploadProcessor: GutenbergProcessor {
         }
     }
 
-    func process(_ blocks: [GutenbergParsedBlock]) {
+    public func process(_ blocks: [GutenbergParsedBlock]) {
         processGalleryBlocks(blocks)
     }
 }
diff --git a/Modules/Sources/WordPressShared/Gutenberg/GutenbergImgUploadProcessor.swift b/Modules/Sources/WordPressShared/Gutenberg/GutenbergImgUploadProcessor.swift
@@ -1,13 +1,13 @@
 import Foundation
 
-class GutenbergImgUploadProcessor: GutenbergProcessor {
+public class GutenbergImgUploadProcessor: GutenbergProcessor {
 
     let mediaUploadID: Int32
     let remoteURLString: String
     let serverMediaID: Int
     static let imgClassIDPrefixAttribute = "wp-image-"
 
-    init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {
+    public init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {
         self.mediaUploadID = mediaUploadID
         self.serverMediaID = serverMediaID
         self.remoteURLString = remoteURLString
@@ -63,7 +63,7 @@ class GutenbergImgUploadProcessor: GutenbergProcessor {
         }
     }
 
-    func process(_ blocks: [GutenbergParsedBlock]) {
+    public func process(_ blocks: [GutenbergParsedBlock]) {
         processImageBlocks(blocks)
         processMediaTextBlocks(blocks)
     }
diff --git a/Modules/Sources/WordPressShared/Gutenberg/GutenbergProcessor.swift b/Modules/Sources/WordPressShared/Gutenberg/GutenbergProcessor.swift
diff --git a/Modules/Tests/WordPressSharedTests/GutenbergContentParserTests.swift b/Modules/Tests/WordPressSharedTests/GutenbergContentParserTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class GutenbergContentParserTests: XCTestCase {
     let singleBlock = """
diff --git a/Modules/Tests/WordPressSharedTests/GutenbergFileUploadProcessorTests.swift b/Modules/Tests/WordPressSharedTests/GutenbergFileUploadProcessorTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class GutenbergFileUploadProcessorTests: XCTestCase {
 
diff --git a/Modules/Tests/WordPressSharedTests/GutenbergGalleryUploadProcessorTests.swift b/Modules/Tests/WordPressSharedTests/GutenbergGalleryUploadProcessorTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class GutenbergGalleryUploadProcessorTests: XCTestCase {
 
diff --git a/Modules/Tests/WordPressSharedTests/GutenbergImgUploadProcessorTests.swift b/Modules/Tests/WordPressSharedTests/GutenbergImgUploadProcessorTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class GutenbergImgUploadProcessorTests: XCTestCase {
 
diff --git a/Modules/Tests/WordPressSharedTests/GutenbergRefactoredGalleryUploadProcessorTests.swift b/Modules/Tests/WordPressSharedTests/GutenbergRefactoredGalleryUploadProcessorTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class GutenbergRefactoredGalleryUploadProcessorTests: XCTestCase {
     struct ImageUploadJob {
diff --git a/Modules/Tests/WordPressSharedTests/MediaUploadHashTests.swift b/Modules/Tests/WordPressSharedTests/MediaUploadHashTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import XCTest
 
-@testable import WordPress
-
 class MediaUploadHashTests: XCTestCase {
 
     override func setUp() {
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergAudioUploadProcessor.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import Aztec
 
 class GutenbergAudioUploadProcessor: Processor {
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergBlockProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergBlockProcessor.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import Aztec
 
 /// Struct to represent a Gutenberg block element
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergCoverUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergCoverUploadProcessor.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import Aztec
 
 class GutenbergCoverUploadProcessor: Processor {
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergVideoPressUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergVideoPressUploadProcessor.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import Aztec
 
 class GutenbergVideoPressUploadProcessor: Processor {
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergVideoUploadProcessor.swift b/WordPress/Classes/ViewRelated/Gutenberg/Processors/GutenbergVideoUploadProcessor.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import Aztec
 
 class GutenbergVideoUploadProcessor: Processor {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import Foundation`
`2`	`2`
`3`		`-class GutenbergFileUploadProcessor: GutenbergProcessor {`
	`3`	`+public class GutenbergFileUploadProcessor: GutenbergProcessor {`
`4`	`4`	`private struct FileBlockKeys {`
`5`	`5`	`static var name = "wp:file"`
`6`	`6`	`static var id = "id"`
`@@ -11,7 +11,7 @@ class GutenbergFileUploadProcessor: GutenbergProcessor {`
`11`	`11`	`let remoteURLString: String`
`12`	`12`	`let serverMediaID: Int`
`13`	`13`
`14`		`- init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {`
	`14`	`+ public init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String) {`
`15`	`15`	`self.mediaUploadID = mediaUploadID`
`16`	`16`	`self.serverMediaID = serverMediaID`
`17`	`17`	`self.remoteURLString = remoteURLString`
`@@ -34,7 +34,7 @@ class GutenbergFileUploadProcessor: GutenbergProcessor {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- func process(_ blocks: [GutenbergParsedBlock]) {`
	`37`	`+ public func process(_ blocks: [GutenbergParsedBlock]) {`
`38`	`38`	`processFileBlocks(blocks)`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import Foundation`
`2`	`2`	`import SwiftSoup`
`3`	`3`
`4`		`-class GutenbergGalleryUploadProcessor: GutenbergProcessor {`
	`4`	`+public class GutenbergGalleryUploadProcessor: GutenbergProcessor {`
`5`	`5`
`6`	`6`	`let mediaUploadID: Int32`
`7`	`7`	`let remoteURLString: String`
`@@ -12,7 +12,7 @@ class GutenbergGalleryUploadProcessor: GutenbergProcessor {`
`12`	`12`
`13`	`13`	`static let imgClassIDPrefixAttribute = "wp-image-"`
`14`	`14`
`15`		`- init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String, mediaLink: String) {`
	`15`	`+ public init(mediaUploadID: Int32, serverMediaID: Int, remoteURLString: String, mediaLink: String) {`
`16`	`16`	`self.mediaUploadID = mediaUploadID`
`17`	`17`	`self.serverMediaID = serverMediaID`
`18`	`18`	`self.remoteURLString = remoteURLString`
`@@ -139,7 +139,7 @@ class GutenbergGalleryUploadProcessor: GutenbergProcessor {`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`- func process(_ blocks: [GutenbergParsedBlock]) {`
	`142`	`+ public func process(_ blocks: [GutenbergParsedBlock]) {`
`143`	`143`	`processGalleryBlocks(blocks)`
`144`	`144`	`}`
`145`	`145`	`}`