Move post revision related functions to Swift (#25009)

* Move BasePost.hasContent and isContentEmpty to Swift

* Move AbstractPost.cloneFrom to Swift

* Delete `AbstractPost.updatePostFrom`

* Move AbstractPost.createRevision to Swift

* Move AbstractPost.deleteRevision

* Move AbstractPost.applyRevision to Swift

* Move AbstractPost.isRevision and isOriginal to Swift

* Move AbstractPost.hasRevision to Swift

* Move AbstractPost.latest to Swift

* Rewrite AbstractPost.hasContent and isContentEmpty

Author: crazytonyli

Sources/WordPressData/Objective-C/AbstractPost.m

@@ -38,85 +38,6 @@ - (void)save
 #pragma mark -
 #pragma mark Revision management
 
-- (AbstractPost *)cloneFrom:(AbstractPost *)source
-{
-    for (NSString *key in [[[source entity] attributesByName] allKeys]) {
-        if (![key isEqualToString:@"permalink"]) {
-            [self setValue:[source valueForKey:key] forKey:key];
-        }
-    }
-    for (NSString *key in [[[source entity] relationshipsByName] allKeys]) {
-        if ([key isEqualToString:@"original"] || [key isEqualToString:@"revision"]) {
-            continue;
-        } else if ([key isEqualToString:@"comments"]) {
-            [self setComments:[source comments]];
-        } else {
-            [self setValue: [source valueForKey:key] forKey: key];
-        }
-    }
-
-    return self;
-}
-
-- (AbstractPost *)createRevision
-{
-    NSParameterAssert(self.revision == nil);
-
-    AbstractPost *post = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass(self.class) inManagedObjectContext:self.managedObjectContext];
-    [post cloneFrom:self];
-    post.remoteStatus = AbstractPostRemoteStatusLocalRevision;
-    [post setValue:self forKey:@"original"];
-    [post setValue:nil forKey:@"revision"];
-    return post;
-}
-
-- (void)deleteRevision
-{
-    if (self.revision) {
-        [self.managedObjectContext performBlockAndWait :^{
-            [self.managedObjectContext deleteObject:self.revision];
-            [self willChangeValueForKey:@"revision"];
-            [self setPrimitiveValue:nil forKey:@"revision"];
-            [self didChangeValueForKey:@"revision"];
-        }];
-    }
-}
-
-- (void)applyRevision
-{
-    if ([self isOriginal]) {
-        [self cloneFrom:self.revision];
-    }
-}
-
-- (AbstractPost *)updatePostFrom:(AbstractPost *)revision
-{
-    for (NSString *key in [[[revision entity] attributesByName] allKeys]) {
-        if ([key isEqualToString:@"postTitle"] ||
-            [key isEqualToString:@"content"]) {
-            [self setValue:[revision valueForKey:key] forKey:key];
-        } else if ([key isEqualToString:@"dateModified"]) {
-            [self setValue:[NSDate date] forKey:key];
-        }
-    }
-    return self;
-}
-
-- (BOOL)isRevision
-{
-    return (![self isOriginal]);
-}
-
-- (BOOL)isOriginal
-{
-    return ([self original] == nil);
-}
-
-- (AbstractPost *)latest
-{
-    return [self hasRevision] ? [[self revision] latest] : self;
-}
-
 - (AbstractPost *)revision
 {
     [self willAccessValueForKey:@"revision"];
@@ -186,11 +107,6 @@ - (BOOL)hasTags
     return NO;
 }
 
-- (BOOL)hasRevision
-{
-    return self.revision != nil;
-}
-
 - (BOOL)hasRemote
 {
     return ((self.postID != nil) && ([self.postID longLongValue] > 0));

Sources/WordPressData/Objective-C/BasePost.m

@@ -21,18 +21,4 @@ @implementation BasePost
 @dynamic suggested_slug;
 @dynamic pathForDisplayImage;
 
-- (BOOL)hasContent
-{
-    BOOL titleIsEmpty = self.postTitle ? self.postTitle.isEmpty : YES;
-    BOOL contentIsEmpty = [self isContentEmpty];
-
-    return !titleIsEmpty || !contentIsEmpty;
-}
-
-- (BOOL)isContentEmpty
-{
-    BOOL isContentAnEmptyGBParagraph = [self.content isEqualToString:@"<!-- wp:paragraph -->\n<p></p>\n<!-- /wp:paragraph -->"];
-    return  self.content ? (self.content.isEmpty || isContentAnEmptyGBParagraph) : YES;
-}
-
 @end

Sources/WordPressData/Objective-C/include/AbstractPost.h

@@ -62,29 +62,11 @@ typedef NS_ENUM(NSUInteger, AbstractPostRemoteStatus) {
 
 @property (nonatomic, strong, nullable) NSString *voiceContent;
 
-// Revision management
-- (AbstractPost *)createRevision;
-- (void)deleteRevision;
-- (void)applyRevision;
-- (AbstractPost *)updatePostFrom:(AbstractPost *)revision;
-- (BOOL)isRevision;
-- (BOOL)isOriginal;
-
-/// Returns the latest revision of a post.
-///
-- (AbstractPost *)latest;
-- (AbstractPost *)cloneFrom:(AbstractPost *)source;
 - (BOOL)hasPhoto;
 - (BOOL)hasVideo;
 - (BOOL)hasCategories;
 - (BOOL)hasTags;
 
-/**
- *  @brief      Call this method to know whether this post has a revision or not.
- *
- *  @returns    YES if this post has a revision, NO otherwise.
- */
-- (BOOL)hasRevision;
 
 #pragma mark - Conveniece Methods
 - (BOOL)shouldPublishImmediately;

Sources/WordPressData/Objective-C/include/BasePost.h

@@ -27,12 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong, nullable) NSString *pathForDisplayImage;
 
-// Returns true if title or content is non empty
-- (BOOL)hasContent;
-
-// True if the content field is empty, independent of the title field.
-- (BOOL)isContentEmpty;
-
 @end
 
 NS_ASSUME_NONNULL_END

Sources/WordPressData/Swift/AbstractPost.swift

@@ -254,4 +254,78 @@ public extension AbstractPost {
     override func contentPreviewForDisplay() -> String? {
         mt_excerpt
     }
+
+    @objc(cloneFrom:)
+    func clone(from source: AbstractPost) {
+        for key in source.entity.attributesByName.keys {
+            if key != "permalink" {
+                setValue(source.value(forKey: key), forKey: key)
+            }
+        }
+
+        for key in source.entity.relationshipsByName.keys {
+            if key == "original" || key == "revision" {
+                continue
+            } else if key == "comments" {
+                comments = source.comments
+            } else {
+                setValue(source.value(forKey: key), forKey: key)
+            }
+        }
+    }
+
+    @objc
+    func createRevision() -> AbstractPost {
+        precondition(managedObjectContext != nil)
+        precondition(revision == nil, "This post must not already have a revision")
+
+        let post = Self(context: managedObjectContext!)
+        post.clone(from: self)
+        post.remoteStatus = .localRevision
+        post.setValue(self, forKey: "original")
+        post.setValue(nil, forKey: "revision")
+        return post
+    }
+
+    @objc
+    func deleteRevision() {
+        guard let revision, let context = managedObjectContext else {
+            return
+        }
+
+        context.performAndWait {
+            context.delete(revision)
+            willChangeValue(forKey: "revision")
+            setPrimitiveValue(nil, forKey: "revision")
+            didChangeValue(forKey: "revision")
+        }
+    }
+
+    @objc
+    func applyRevision() {
+        guard isOriginal(), let revision else {
+            return
+        }
+        clone(from: revision)
+    }
+
+    @objc
+    func isRevision() -> Bool {
+        !isOriginal()
+    }
+
+    @objc
+    func isOriginal() -> Bool {
+        original == nil
+    }
+
+    @objc
+    func latest() -> AbstractPost {
+        revision?.latest() ?? self
+    }
+
+    @objc
+    func hasRevision() -> Bool {
+        revision != nil
+    }
 }

Sources/WordPressData/Swift/BasePost.swift

@@ -83,4 +83,21 @@ extension BasePost {
             date_created_gmt = newValue
         }
     }
+
+    /// Returns true if title or content is non empty
+    public func hasContent() -> Bool {
+        if let postTitle, !postTitle.isEmpty {
+            return true
+        }
+
+        return !isContentEmpty()
+    }
+
+    /// True if the content field is empty, independent of the title field.
+    public func isContentEmpty() -> Bool {
+        guard let content else { return true }
+
+        let emptyGBParagraph = "<!-- wp:paragraph -->\n<p></p>\n<!-- /wp:paragraph -->"
+        return content.isEmpty || content == emptyGBParagraph
+    }
 }