Add Site and Blog URL from WordPress (#49)

brightdigit · Aug 3, 2023 · 67f398a · 67f398a
1 parent 238c8d8
commit 67f398a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/CoreOffice/XMLCoder", from: "0.16.0")
+    .package(url: "https://github.com/CoreOffice/XMLCoder", from: "0.17.1")
   ],
   targets: [
     .target(

diff --git a/Sources/SyndiKit/Formats/Feeds/RSS/Enclosure.swift b/Sources/SyndiKit/Formats/Feeds/RSS/Enclosure.swift
@@ -12,7 +12,7 @@ public struct Enclosure: Codable {
   }
 
   public init(from decoder: Decoder) throws {
-    let container = try decoder.container(keyedBy: Self.CodingKeys)
+    let container = try decoder.container(keyedBy: Self.CodingKeys.self)
     url = try container.decode(UTF8EncodedURL.self, forKey: .url).value
     type = try container.decode(String.self, forKey: .type)
     if container.contains(.length) {

diff --git a/Sources/SyndiKit/Formats/Feeds/RSS/RSSChannel.swift b/Sources/SyndiKit/Formats/Feeds/RSS/RSSChannel.swift
@@ -42,6 +42,8 @@ public struct RSSChannel: Codable {
   public let author: Author?
   public let wpCategories: [WordPressElements.Category]
   public let wpTags: [WordPressElements.Tag]
+  public let wpBaseSiteURL: URL?
+  public let wpBaseBlogURL: URL?
 
   enum CodingKeys: String, CodingKey {
     case title
@@ -61,6 +63,8 @@ public struct RSSChannel: Codable {
     case author
     case wpCategories = "wp:category"
     case wpTags = "wp:tag"
+    case wpBaseSiteURL = "wp:baseSiteUrl"
+    case wpBaseBlogURL = "wp:baseBlogUrl"
   }
 }
 

diff --git a/Tests/SyndiKitTests/WordpressTests.swift b/Tests/SyndiKitTests/WordpressTests.swift
@@ -3,6 +3,18 @@ import Foundation
 import XCTest
 
 final class WordpressTests: XCTestCase {
+
+  static let baseSiteURLs : [String : URL] = [
+    "articles" : URL(string: "https://brightdigit.com/")!,
+    "tutorials" : URL(string: "https://brightdigit.com/")!
+  ]
+
+
+  static let baseBlogURLs : [String : URL] = [
+    "articles" : URL(string: "https://brightdigit.com")!,
+    "tutorials" : URL(string: "https://learningswift.brightdigit.com")!
+  ]
+
   func testDateDecoder() {
     let dateDecoder = DateFormatterDecoder.RSS.decoder
     let result = dateDecoder.decodeString("Fri, 06 Oct 2017 17:21:35 +0000")
@@ -38,6 +50,10 @@ final class WordpressTests: XCTestCase {
         continue
       }
 
+      XCTAssertNotNil(feed.channel.wpBaseSiteURL)
+      XCTAssertNotNil(feed.channel.wpBaseBlogURL)
+      XCTAssertEqual(feed.channel.wpBaseSiteURL, Self.baseSiteURLs[name])
+      XCTAssertEqual(feed.channel.wpBaseBlogURL, Self.baseBlogURLs[name])
       XCTAssertGreaterThan(feed.channel.wpTags.count, 0)
       XCTAssertGreaterThan(feed.channel.wpCategories.count, 0)
       let notPostIndex = feed.channel.items.firstIndex(where: {