Re-implement a few model types in Swift

WordPressKit/AccountServiceRemote.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
-#import <WordPressKit/RemoteUser.h>
 
 @class WPAccount;
+@class RemoteUser;
 
 static NSString * const AccountServiceRemoteErrorDomain = @"AccountServiceErrorDomain";
 

WordPressKit/CommentServiceRemote.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import <WordPressKit/RemoteComment.h>
 
+@class RemoteComment;
 
 // Used to determine which 'status' parameter to use when fetching Comments.
 typedef enum {

WordPressKit/CommentServiceRemoteREST.m

@@ -1,7 +1,5 @@
 #import "CommentServiceRemoteREST.h"
 #import "WPKit-Swift.h"
-#import "RemoteComment.h"
-#import "RemoteUser.h"
 
 @import NSObject_SafeExpectations;
 @import WordPressShared;

WordPressKit/CommentServiceRemoteXMLRPC.m

@@ -1,6 +1,5 @@
 #import "CommentServiceRemoteXMLRPC.h"
 #import "WPKit-Swift.h"
-#import "RemoteComment.h"
 
 @import wpxmlrpc;
 @import WordPressShared;

WordPressKit/MediaServiceRemoteREST.m

@@ -1,5 +1,4 @@
 #import "MediaServiceRemoteREST.h"
-#import "RemoteMedia.h"
 #import "WPKit-Swift.h"
 @import WordPressShared;
 @import NSObject_SafeExpectations;

WordPressKit/MediaServiceRemoteXMLRPC.m

@@ -1,5 +1,4 @@
 #import "MediaServiceRemoteXMLRPC.h"
-#import "RemoteMedia.h"
 #import "WPKit-Swift.h"
 
 @import WordPressShared;

WordPressKit/PostServiceRemoteREST.h

@@ -1,10 +1,10 @@
 #import <Foundation/Foundation.h>
 #import <WordPressKit/PostServiceRemote.h>
 #import <WordPressKit/SiteServiceRemoteWordPressComREST.h>
-#import <WordPressKit/RemoteMedia.h>
 
 @class RemoteUser;
 @class RemoteLikeUser;
+@class RemoteMedia;
 
 @interface PostServiceRemoteREST : SiteServiceRemoteWordPressComREST <PostServiceRemote>
 

WordPressKit/PostServiceRemoteREST.m

@@ -1,5 +1,4 @@
 #import "PostServiceRemoteREST.h"
-#import "RemoteUser.h"
 #import "WPKit-Swift.h"
 @import WordPressShared;
 @import NSObject_SafeExpectations;

WordPressKit/ReaderPostServiceRemote.m

@@ -1,6 +1,5 @@
 #import "ReaderPostServiceRemote.h"
 #import "RemoteReaderPost.h"
-#import "RemoteSourcePostAttribution.h"
 #import "ReaderTopicServiceRemote.h"
 #import "WPKit-Swift.h"
 @import NSObject_SafeExpectations;

WordPressKit/RemoteComment.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+@objcMembers public class RemoteComment: NSObject {
+
+    public var commentID: NSNumber?
+    public var authorID: NSNumber?
+    public var author: String?
+    public var authorEmail: String?
+    public var authorUrl: String?
+    public var authorAvatarURL: String?
+    public var authorIP: String?
+    public var content: String?
+    public var rawContent: String?
+    public var date: Date?
+    public var link: String?
+    public var parentID: NSNumber?
+    public var postID: NSNumber?
+    public var postTitle: String?
+    public var status: String?
+    public var type: String?
+    public var isLiked: Bool = false
+    public var likeCount: NSNumber?
+    public var canModerate: Bool = false
+
+}

WordPressKit/RemoteMedia.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+@objcMembers public class RemoteMedia: NSObject {
+
+    public var mediaID: NSNumber?
+    public var url: URL?
+    public var localURL: URL?
+    public var largeURL: URL?
+    public var mediumURL: URL?
+    public var guid: URL?
+    public var date: Date?
+    public var postID: NSNumber?
+    public var file: String?
+    public var mimeType: String?
+    public var `extension`: String?
+    public var title: String?
+    public var caption: String?
+    public var descriptionText: String?
+    public var alt: String?
+    public var height: NSNumber?
+    public var width: NSNumber?
+    public var shortcode: String?
+    public var exif: NSDictionary?
+    public var videopressGUID: String?
+    public var length: NSNumber?
+    public var remoteThumbnailURL: String?
+
+}

WordPressKit/RemoteReaderPost.m

@@ -1,5 +1,4 @@
 #import "RemoteReaderPost.h"
-#import "RemoteSourcePostAttribution.h"
 #import "WPKit-Swift.h"
 
 @import NSObject_SafeExpectations;

WordPressKit/RemoteSourcePostAttribution.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+@objcMembers public class RemoteSourcePostAttribution: NSObject {
+
+    public var permalink: String?
+    public var authorName: String?
+    public var authorURL: String?
+    public var blogName: String?
+    public var blogURL: String?
+    public var avatarURL: String?
+    public var blogID: NSNumber?
+    public var postID: NSNumber?
+    public var likeCount: NSNumber?
+    public var commentCount: NSNumber?
+    public var taxonomies: [String]?
+
+}

WordPressKit/RemoteTheme.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+@objcMembers public class RemoteTheme: NSObject {
+
+    public var active: Bool = false
+    public var author: String?
+    public var authorUrl: String?
+    public var desc: String?
+    public var demoUrl: String?
+    public var themeUrl: String?
+    public var downloadUrl: String?
+    public var launchDate: Date?
+    public var name: String?
+    public var order: NSInteger = 0
+    public var popularityRank: NSNumber?
+    public var previewUrl: String?
+    public var price: String?
+    public var purchased: NSNumber?
+    public var screenshotUrl: String?
+    public var stylesheet: String?
+    public var themeId: String?
+    public var trendingRank: NSNumber?
+    public var version: String?
+
+}

WordPressKit/RemoteUser.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+@objcMembers public class RemoteUser: NSObject {
+
+    public var userID: NSNumber?
+    public var username: String?
+    public var email: String?
+    public var displayName: String?
+    public var primaryBlogID: NSNumber?
+    public var avatarURL: String?
+    public var dateCreated: Date?
+    public var emailVerified: Bool = false
+    public var linkedUserID: NSNumber?
+
+}

WordPressKit/ThemeServiceRemote.m

@@ -1,6 +1,4 @@
 #import "ThemeServiceRemote.h"
-
-#import "RemoteTheme.h"
 #import "WPKit-Swift.h"
 @import NSObject_SafeExpectations;
 

WordPressKit/WordPressKit.h

@@ -35,13 +35,8 @@ FOUNDATION_EXPORT const unsigned char WordPressKitVersionString[];
 #import <WordPressKit/ThemeServiceRemote.h>
 #import <WordPressKit/WordPressComServiceRemote.h>
 
-#import <WordPressKit/RemoteComment.h>
-#import <WordPressKit/RemoteMedia.h>
 #import <WordPressKit/RemoteReaderPost.h>
-#import <WordPressKit/RemoteSourcePostAttribution.h>
 #import <WordPressKit/RemoteTaxonomyPaging.h>
-#import <WordPressKit/RemoteTheme.h>
-#import <WordPressKit/RemoteUser.h>
 
 #import <WordPressKit/NSDate+WordPressJSON.h>
 #import <WordPressKit/NSString+MD5.h>