Re-implement a few remote post related types

Author: crazytonyli

WordPressKit.xcodeproj/project.pbxproj

@@ -1,7 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "BlogServiceRemoteREST.h"
 #import "NSMutableDictionary+Helpers.h"
-#import "RemotePostType.h"
 #import "WPKit-Swift.h"
 @import NSObject_SafeExpectations;
 @import WordPressShared;

WordPressKit/BlogServiceRemoteREST.m

@@ -1,6 +1,5 @@
 #import "BlogServiceRemoteXMLRPC.h"
 #import "NSMutableDictionary+Helpers.h"
-#import "RemotePostType.h"
 #import "WPKit-Swift.h"
 @import NSObject_SafeExpectations;
 @import WordPressShared;

WordPressKit/BlogServiceRemoteXMLRPC.m

@@ -0,0 +1,16 @@
+extension NSObject {
+
+    var allProperties: [String: Any] {
+        let properties = Mirror(reflecting: self)
+            .children
+            .compactMap { child in
+                if let label = child.label {
+                    return (label, child.value)
+                } else {
+                    return nil
+                }
+            }
+        return Dictionary(properties) { (_, new) in new }
+    }
+
+}

WordPressKit/NSObject+Debug.swift

@@ -1,6 +1,4 @@
 #import "PostServiceRemoteREST.h"
-#import "RemotePost.h"
-#import "RemotePostCategory.h"
 #import "RemoteUser.h"
 #import "WPKit-Swift.h"
 @import WordPressShared;

WordPressKit/PostServiceRemoteREST.m

@@ -1,6 +1,4 @@
 #import "PostServiceRemoteXMLRPC.h"
-#import "RemotePost.h"
-#import "RemotePostCategory.h"
 #import "NSMutableDictionary+Helpers.h"
 #import "WPKit-Swift.h"
 @import NSObject_SafeExpectations;
@@ -54,7 +52,14 @@ - (void)getPostsOfType:(NSString *)postType
                options:(NSDictionary *)options
                success:(void (^)(NSArray <RemotePost *> *remotePosts))success
                failure:(void (^)(NSError *error))failure {
-    NSArray *statuses = @[PostStatusDraft, PostStatusPending, PostStatusPrivate, PostStatusPublish, PostStatusScheduled, PostStatusTrash];
+    NSArray *statuses = @[
+        RemotePost.statusDraft,
+        RemotePost.statusPending,
+        RemotePost.statusPrivate,
+        RemotePost.statusPublish,
+        RemotePost.statusScheduled,
+        RemotePost.statusTrash
+    ];
     NSString *postStatus = [statuses componentsJoinedByString:@","];
     NSDictionary *extraParameters = @{
                                       @"number": @40,
@@ -343,8 +348,8 @@ - (NSString *)statusForPostStatus:(NSString *)status andDate:(NSDate *)date
 {
     // Scheduled posts are synced with a post_status of 'publish' but we want to
     // work with a status of 'future' from within the app.
-    if ([status isEqualToString:PostStatusPublish] && date == [date laterDate:[NSDate date]]) {
-        return PostStatusScheduled;
+    if ([status isEqualToString:RemotePost.statusPublish] && date == [date laterDate:[NSDate date]]) {
+        return RemotePost.statusScheduled;
     }
     return status;
 }
@@ -426,8 +431,8 @@ - (NSDictionary *)parametersWithRemotePost:(RemotePost *)post
     // This is an apparent inconsistency in the XML-RPC API as 'future' should
     // be a valid status.
     // https://codex.wordpress.org/Post_Status_Transitions
-    if (post.status == nil || [post.status isEqualToString:PostStatusScheduled]) {
-        post.status = PostStatusPublish;
+    if (post.status == nil || [post.status isEqualToString:RemotePost.statusScheduled]) {
+        post.status = RemotePost.statusPublish;
     }
 
     // At least as of 5.2.2, Private and/or Password Protected posts can't be stickied.
@@ -439,7 +444,7 @@ - (NSDictionary *)parametersWithRemotePost:(RemotePost *)post
     //
     // https://github.com/WordPress/WordPress/blob/master/wp-includes/class-wp-xmlrpc-server.php
     //
-    BOOL shouldIncludeStickyField = ![post.status isEqualToString:PostStatusPrivate] && post.password == nil;
+    BOOL shouldIncludeStickyField = ![post.status isEqualToString:RemotePost.statusPrivate] && post.password == nil;
 
     if (post.isStickyPost != nil && shouldIncludeStickyField) {
         postParams[@"sticky"] = post.isStickyPost.boolValue ? @"true" : @"false";

WordPressKit/PostServiceRemoteXMLRPC.m

@@ -0,0 +1,81 @@
+import Foundation
+import ObjectiveC
+
+@objcMembers public class RemotePost: NSObject {
+
+    public static let statusDraft = "draft"
+    public static let statusPending = "pending"
+    public static let statusPrivate = "private"
+    public static let statusPublish = "publish"
+    public static let statusScheduled = "future"
+    public static let statusTrash = "trash"
+    public static let statusDeleted = "deleted" // Returned by wpcom REST API when a post is permanently deleted.
+
+    public var postID: NSNumber?
+    public var siteID: NSNumber?
+    public var authorAvatarURL: String?
+    public var authorDisplayName: String?
+    public var authorEmail: String?
+    public var authorURL: String?
+    public var authorID: NSNumber?
+    public var date: NSDate?
+    public var dateModified: NSDate?
+    public var title: String?
+    public var URL: NSURL?
+    public var shortURL: NSURL?
+    public var content: String?
+    public var excerpt: String?
+    public var slug: String?
+    public var suggestedSlug: String?
+    public var status: String?
+    public var password: String?
+    public var parentID: NSNumber?
+    public var postThumbnailID: NSNumber?
+    public var postThumbnailPath: String?
+    public var type: String?
+    public var format: String?
+
+    /**
+     * A snapshot of the post at the last autosave.
+     *
+     * This is nullable.
+     */
+    public var autosave: RemotePostAutosave?
+
+    public var commentCount: NSNumber?
+    public var likeCount: NSNumber?
+
+    public var categories: NSArray?
+    public var revisions: NSArray?
+    public var tags: NSArray?
+    public var pathForDisplayImage: String?
+    public var isStickyPost: NSNumber?
+    public var isFeaturedImageChanged: Bool = false
+
+    /**
+     Array of custom fields. Each value is a dictionary containing {ID, key, value}
+     */
+    public var metadata: [[String: Any]]?
+
+    // Featured images?
+    // Geolocation?
+    // Attachments?
+    // Metadata?
+
+    public override init() {
+        super.init()
+    }
+
+    public init(siteID: NSNumber, status: String, title: String?, content: String?) {
+        super.init()
+        self.siteID = siteID
+        self.status = status
+        self.title = title
+        self.content = content
+    }
+
+    public override var debugDescription: String {
+        "\(super.description) (\(allProperties))"
+    }
+
+}