Replace JSONEncodable with Encodable

Author: bcylin

iCookTV/Controllers/HistoryViewController.swift

@@ -77,7 +77,8 @@ class HistoryViewController: UIViewController,
     isLoading = true
     DispatchQueue.global().async {
       do {
-        let history = try HistoryManager.history.map(Video.init)
+        let decoder = JSONDecoder()
+        let history = try HistoryManager.history.map { try decoder.decode(Video.self, from: $0) }
         DispatchQueue.main.sync {
           self.dataSource.append(history, toCollectionView: self.collectionView)
           self.setOverlayViewHidden(self.dataSource.numberOfItems > 0, animated: true)

iCookTV/Controllers/LaunchViewController.swift

@@ -26,7 +26,6 @@
 
 import UIKit
 import Alamofire
-import Freddy
 
 class LaunchViewController: UIViewController, DataFetching {
 

iCookTV/Helpers/HistoryManager.swift

@@ -25,7 +25,6 @@
 //
 
 import Foundation
-import Freddy
 
 struct HistoryManager {
 
@@ -46,16 +45,11 @@ struct HistoryManager {
   // MARK: - Public Methods
 
   /// Returns the deserialized video history read from the cache directory.
-  static var history: [JSON] {
+  static var history: [Data] {
     if let path = cache?.path, let records = NSArray(contentsOfFile: path) as? [Data] {
-      do {
-        return try records.map { try JSON(data: $0) }
-      } catch {
-        Tracker.track(error)
-        return [JSON]()
-      }
+      return records
     } else {
-      return [JSON]()
+      return []
     }
   }
 
@@ -71,19 +65,17 @@ struct HistoryManager {
       }
       Debug.print(path)
 
-      let json = video.toJSON()
-      var records = history
+      let decoder = JSONDecoder()
+      var records: [Video] = history.flatMap { try? decoder.decode(Video.self, from: $0) }
 
       // Keep the latest video at top.
-      for (index, element) in self.history.enumerated() where element["id"] == json["id"] {
-        records.remove(at: index)
-        break
-      }
-      records.insert(json, at: 0)
+      records = records.filter { $0.id != video.id }
+      records.insert(video, at: 0)
       Debug.print("records.count =", records.count)
 
       do {
-        let data = try records.map { try $0.serialize() } as NSArray
+        let encoder = JSONEncoder()
+        let data = try records.map { try encoder.encode($0) } as NSArray
         data.write(toFile: path, atomically: true)
       } catch {
         Tracker.track(error)

iCookTV/Models/Category.swift

@@ -25,22 +25,13 @@
 //
 
 import Foundation
-import Freddy
 
-struct Category: Codable, JSONDecodable {
+struct Category: Codable {
 
   let id: String
   let name: String
   let coverURLs: [String]
 
-  // MARK: - JSONDecodable
-
-  init(json value: JSON) throws {
-    id = try value.getString(at: "id")
-    name = try value.getString(at: "attributes", "name", or: "")
-    coverURLs = try value.getArray(at: "attributes", "cover-urls").map(String.init)
-  }
-
   // MARK: - Codable
 
   private enum CodingKeys: String, CodingKey {

iCookTV/Models/Video.swift

@@ -25,9 +25,8 @@
 //
 
 import Foundation
-import Freddy
 
-struct Video: Codable, JSONDecodable, JSONEncodable {
+struct Video: Codable {
 
   let id: String
   let title: String
@@ -49,50 +48,6 @@ struct Video: Codable, JSONDecodable, JSONEncodable {
     return (hours > 0 ? "\(hours):" : "") + String(format: "%d:%02d", minutes, seconds)
   }
 
-  // MARK: - JSONDecodable
-
-  init(json value: JSON) throws {
-    let nullable: JSON.SubscriptingOptions = [.NullBecomesNil, .MissingKeyBecomesNil]
-    id = try value.getString(at: "id")
-    title = try value.getString(at: "attributes", "title")
-    subtitle = try value.getString(at: "attributes", "subtitle", alongPath: nullable)
-    description = try value.getString(at: "attributes", "description", alongPath: nullable)
-    length = try value.getInt(at: "attributes", "length", or: 0)
-    youtube = try value.getString(at: "attributes", "embed-url")
-    source = try value.getString(at: "attributes", "video-url", alongPath: nullable)
-    cover = try value.getString(at: "attributes", "cover-url")
-  }
-
-  // MARK: - JSONEncodable
-
-  func toJSON() -> JSON {
-    var attributes: [String: JSON] = [
-      "title": .string(title),
-      "embed-url": .string(youtube),
-      "cover-url": .string(cover),
-      "length": .int(length)
-    ]
-
-    if let source = source {
-      attributes["video-url"] = .string(source)
-    }
-
-    if let subtitle = subtitle {
-      attributes["subtitle"] = .string(subtitle)
-    }
-
-    if let description = description {
-      attributes["description"] = .string(description)
-    }
-
-    let json: [String: JSON] = [
-      "id": .string(id),
-      "attributes": .dictionary(attributes)
-    ]
-
-    return .dictionary(json)
-  }
-
   // MARK: - Codable
 
   private enum CodingKeys: String, CodingKey {

iCookTVTests/VideoSpec.swift

@@ -25,7 +25,6 @@
 //
 
 @testable import iCookTV
-import Freddy
 import Nimble
 import Quick
 
@@ -34,8 +33,6 @@ class VideoSpec: QuickSpec {
   override func spec() {
 
     let data: Data = Resources.testData(named: "Video.json")!
-    let json = try! JSON(data: data as Data)
-
     let decoder = JSONDecoder()
     let video = try! decoder.decode(Video.self, from: data)
 
@@ -52,15 +49,20 @@ class VideoSpec: QuickSpec {
       }
     }
 
-    describe("toJSON()") {
-      let converted = video.toJSON()
-
-      it("should convert Video to JSON") {
-        expect(converted["id"]).to(equal(json["id"]))
+    describe("encoding") {
+      let encoder = JSONEncoder()
+      let data = try! encoder.encode(video)
+      let jsonString = String(data: data, encoding: .utf8)
 
-        for key in ["title", "embed-url", "video-url", "cover-url", "length", "subtitle", "description"] {
-          expect(converted["attributes"]?[key]).to(equal(json["attributes"]?[key]))
-        }
+      it("should encode Video to JSON") {
+        expect(jsonString).to(contain("\"id\":\"42\""))
+        expect(jsonString).to(contain("\"title\":\"Lorem\""))
+        expect(jsonString).to(contain("\"subtitle\":\"ipsum\""))
+        expect(jsonString).to(contain("\"description\":\"dolor sit amet\""))
+        expect(jsonString).to(contain("\"length\":123"))
+        expect(jsonString).to(contain("\"embed-url\":\"https:\\/\\/www.youtube.com\\/watch?v=3345678\""))
+        expect(jsonString).to(contain("\"video-url\":\"https:\\/\\/vide.os\\/source.m3u8\""))
+        expect(jsonString).to(contain("\"cover-url\":\"https:\\/\\/imag.es\\/cover.jpg\""))
       }
     }