Implement Codable conformance

Author: bcylin

iCookTV/Models/Category.swift

@@ -24,9 +24,10 @@
 //  SOFTWARE.
 //
 
+import Foundation
 import Freddy
 
-struct Category: JSONDecodable {
+struct Category: Codable, JSONDecodable {
 
   let id: String
   let name: String
@@ -40,4 +41,34 @@ struct Category: JSONDecodable {
     coverURLs = try value.getArray(at: "attributes", "cover-urls").map(String.init)
   }
 
+  // MARK: - Codable
+
+  private enum CodingKeys: String, CodingKey {
+    case id
+    case attributes
+  }
+
+  private enum AttributesCodingKeys: String, CodingKey {
+    case name
+    case coverURLs = "cover-urls"
+  }
+
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    id = try container.decode(String.self, forKey: .id)
+
+    let attributes = try container.nestedContainer(keyedBy: AttributesCodingKeys.self, forKey: .attributes)
+    name = try attributes.decode(String.self, forKey: .name)
+    coverURLs = try attributes.decode([String].self, forKey: .coverURLs)
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(id, forKey: .id)
+
+    var attributes = container.nestedContainer(keyedBy: AttributesCodingKeys.self, forKey: .attributes)
+    try attributes.encode(name, forKey: .name)
+    try attributes.encode(coverURLs, forKey: .coverURLs)
+  }
+
 }

iCookTV/Models/Video.swift

@@ -27,7 +27,7 @@
 import Foundation
 import Freddy
 
-struct Video: JSONDecodable, JSONEncodable {
+struct Video: Codable, JSONDecodable, JSONEncodable {
 
   let id: String
   let title: String
@@ -93,4 +93,51 @@ struct Video: JSONDecodable, JSONEncodable {
     return .dictionary(json)
   }
 
+  // MARK: - Codable
+
+  private enum CodingKeys: String, CodingKey {
+    case id
+    case attributes
+  }
+
+  private enum AttributesCodingKeys: String, CodingKey {
+    case title
+    case subtitle
+    case description
+    case length
+    case youtube = "embed-url"
+    case source = "video-url"
+    case cover = "cover-url"
+  }
+
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    id = try container.decode(String.self, forKey: .id)
+
+    let attributes = try container.nestedContainer(keyedBy: AttributesCodingKeys.self, forKey: .attributes)
+    title = try attributes.decode(String.self, forKey: .title)
+    subtitle = try? attributes.decode(String.self, forKey: .subtitle)
+    description = try? attributes.decode(String.self, forKey: .description)
+    length = (try? attributes.decode(Int.self, forKey: .length)) ?? 0
+    youtube = try attributes.decode(String.self, forKey: .youtube)
+    source = try? attributes.decode(String.self, forKey: .source)
+    cover = try attributes.decode(String.self, forKey: .cover)
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(id, forKey: .id)
+
+    var attributes = container.nestedContainer(keyedBy: AttributesCodingKeys.self, forKey: .attributes)
+    try attributes.encode(title, forKey: .title)
+    try attributes.encode(length, forKey: .length)
+    try attributes.encode(youtube, forKey: .youtube)
+    try attributes.encode(cover, forKey: .cover)
+
+    // Optional values
+    try subtitle.map { try attributes.encode($0, forKey: .subtitle) }
+    try description.map { try attributes.encode($0, forKey: .description) }
+    try source.map { try attributes.encode($0, forKey: .source) }
+  }
+
 }

iCookTVTests/CategorySpec.swift

@@ -25,7 +25,6 @@
 //
 
 @testable import iCookTV
-import Freddy
 import Nimble
 import Quick
 
@@ -35,10 +34,10 @@ class CategorySpec: QuickSpec {
 
     let data: Data = Resources.testData(named: "Category.json")!
 
-    describe("init(json:)") {
+    describe("decoding") {
       it("should parse JSON as Category") {
-        let json = try! JSON(data: data)
-        let category = try! Category(json: json)
+        let decoder = JSONDecoder()
+        let category = try! decoder.decode(Category.self, from: data)
 
         expect(category.id).to(equal("9527"))
         expect(category.name).to(equal("愛料理廚房"))

iCookTVTests/VideoSpec.swift

@@ -35,9 +35,11 @@ class VideoSpec: QuickSpec {
 
     let data: Data = Resources.testData(named: "Video.json")!
     let json = try! JSON(data: data as Data)
-    let video = try! Video(json: json)
 
-    describe("init(json:)") {
+    let decoder = JSONDecoder()
+    let video = try! decoder.decode(Video.self, from: data)
+
+    describe("decoding") {
       it("should parse JSON as Video") {
         expect(video.id).to(equal("42"))
         expect(video.title).to(equal("Lorem"))