Convert dateWithWordPressComJSONString: to Swift

This resulted in a change in the Swift API. I think this is acceptable
because the method was not used outside WordPressKit.

See:

- WordPressAuthenticator https://github.com/search?q=repo%3Awordpress-mobile%2FWordPressAuthenticator-iOS%20dateWithWordPressComJSONString&type=code
- WordPress-iOS https://github.com/search?q=repo%3Awordpress-mobile%2FWordPress-iOS+dateWithWordPressComJSONString&type=code

Author: mokagio

WordPressKit/NSDate+RFC3339.swift

@@ -8,6 +8,21 @@ extension NSDate {
         DateFormatter.rfc3339Formatter
     }
 
+    /// Parses a date string
+    ///
+    /// Dates in the format specified in http://www.w3.org/TR/NOTE-datetime should be OK.
+    /// The kind of dates returned by the REST API should match that format, even if the doc promises ISO 8601.
+    ///
+    /// Parsing the full ISO 8601, or even RFC 3339 is more complex than this, and makes no sense right now.
+    ///
+    /// - Warning: This method doesn't support fractional seconds or dates with leap seconds (23:59:60 turns into 23:59:00)
+    //
+    // Needs to be `public` because of the usages in the Objective-C code.
+    @objc(dateWithWordPressComJSONString:)
+    public static func with(wordPressComJSONString jsonString: String) -> Date? {
+        self.rfc3339DateFormatter().date(from: jsonString)
+    }
+
     @objc(WordPressComJSONString)
     public func wordPressComJSONString() -> String {
         NSDate.rfc3339DateFormatter().string(from: self as Date)

WordPressKit/NSDate+WordPressJSON.h

@@ -12,6 +12,6 @@
  @warning this method doesn't support fractional seconds or dates with leap seconds (23:59:60 turns into 23:59:00)
  */
 
-+ (instancetype)dateWithWordPressComJSONString:(NSString *)string;
+//+ (instancetype)dateWithWordPressComJSONString:(NSString *)string;
 
 @end

WordPressKit/RemoteCommentV2.swift

@@ -65,7 +65,7 @@ extension RemoteCommentV2: Decodable {
 
         // since `date_gmt` is already in GMT timezone, manually add the timezone string to make the rfc3339 formatter happy (or it will throw otherwise).
         guard let dateString = try? container.decode(String.self, forKey: .date),
-              let date = NSDate(wordPressComJSONString: dateString + "+00:00") as Date? else {
+              let date = NSDate.with(wordPressComJSONString: dateString + "+00:00") else {
             throw DecodingError.dataCorruptedError(forKey: .date, in: container, debugDescription: "Date parsing failed")
         }
         self.date = date

WordPressKitTests/CommentServiceRemoteREST+APIv2Tests.swift

@@ -41,7 +41,7 @@ final class CommentServiceRemoteREST_APIv2Tests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(firstComment.authorID, 135)
             XCTAssertEqual(firstComment.authorName, "John Doe")
             XCTAssertEqual(firstComment.authorURL, "https://example.com/john-doe")
-            XCTAssertEqual(firstComment.date, NSDate(wordPressComJSONString: "2021-07-01T10:50:11+00:00") as Date)
+            XCTAssertEqual(firstComment.date, NSDate.with(wordPressComJSONString: "2021-07-01T10:50:11+00:00"))
             XCTAssertEqual(firstComment.content, "<p>Some example comment.</p>\n")
             XCTAssertEqual(firstComment.link, "https://example.com/2021/05/25/example-post/comment-page-1/#comment-2")
             XCTAssertEqual(firstComment.status, "approve") // verify that it's converted correctly.

WordPressKitTests/CommentServiceRemoteRESTTests.swift

@@ -50,7 +50,7 @@ final class CommentServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(comment.authorEmail, "[email protected]")
             XCTAssertEqual(comment.authorUrl, "author URL")
             XCTAssertEqual(comment.authorIP, "000.0.00.000")
-            XCTAssertEqual(comment.date, NSDate(wordPressComJSONString: "2021-08-04T07:58:49+00:00") as Date)
+            XCTAssertEqual(comment.date, NSDate.with(wordPressComJSONString: "2021-08-04T07:58:49+00:00"))
             XCTAssertEqual(comment.link, "comment URL")
             XCTAssertEqual(comment.parentID, nil)
             XCTAssertEqual(comment.postID, NSNumber(value: 1))
@@ -91,7 +91,7 @@ final class CommentServiceRemoteRESTTests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(comment.authorEmail, "[email protected]")
             XCTAssertEqual(comment.authorUrl, "author URL")
             XCTAssertEqual(comment.authorIP, "000.0.00.000")
-            XCTAssertEqual(comment.date, NSDate(wordPressComJSONString: "2021-08-04T07:58:49+00:00") as Date)
+            XCTAssertEqual(comment.date, NSDate.with(wordPressComJSONString: "2021-08-04T07:58:49+00:00"))
             XCTAssertEqual(comment.link, "comment URL")
             XCTAssertEqual(comment.parentID, nil)
             XCTAssertEqual(comment.postID, NSNumber(value: 1))

WordPressKitTests/NSDate+RFC3339Tests.swift

@@ -19,17 +19,17 @@ class NSDateRFC3339Tests: XCTestCase {
 
     func testValidRFC3339DateFromString() {
         XCTAssertEqual(
-            NSDate(wordPressComJSONString: "2023-03-19T15:00:00Z"),
-            NSDate(timeIntervalSince1970: 1_679_238_000)
+            NSDate.with(wordPressComJSONString: "2023-03-19T15:00:00Z"),
+            Date(timeIntervalSince1970: 1_679_238_000)
         )
     }
 
     func testInvalidRFC3339DateFromString() {
-        XCTAssertNil(NSDate(wordPressComJSONString: "2024-01-01"))
+        XCTAssertNil(NSDate.with(wordPressComJSONString: "2024-01-01"))
     }
 
     func testInvalidDateFromString() {
-        XCTAssertNil(NSDate(wordPressComJSONString: "not a date"))
+        XCTAssertNil(NSDate.with(wordPressComJSONString: "not a date"))
     }
 
     func testValidRFC3339StringFromDate() {

WordPressKitTests/PostServiceRemoteRESTAutosaveTests.swift

@@ -41,7 +41,7 @@ class PostServiceRemoteRESTAutosaveTests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(remotePost.autosave.content, "<!-- wp:paragraph -->\n<p>Uno.</p>\n<!-- /wp:paragraph -->")
             XCTAssertEqual(remotePost.autosave.excerpt, "abc")
             XCTAssertEqual(remotePost.autosave.previewURL, "https://hello.wordpress.com/2019/10/28/hello-world/?preview=true&preview_nonce=07346f4e5d")
-            XCTAssertEqual(remotePost.autosave.modifiedDate, NSDate(wordPressComJSONString: "2019-10-28T02:06:39+00:00") as Date?)
+            XCTAssertEqual(remotePost.autosave.modifiedDate, NSDate.with(wordPressComJSONString: "2019-10-28T02:06:39+00:00"))
             expect.fulfill()
         }, failure: { _ in
             XCTFail("This callback shouldn't get called")