mapObject and mapArray for Argo and Himotoki

Author: orakaro

Example/Argo Sample/Model/RepoRequest.swift

@@ -43,7 +43,8 @@ extension RepoRequest {
     func response(from object: Any, urlResponse: HTTPURLResponse) -> [Repo] {
         guard
             let tree = object as? [String: Any],
-            let repos = decode(tree, rootKey: "items") as [Repo]?
+            let items = tree["items"],
+            let repos = try? Repo.mapArray(items)
         else {
             return []
         }

Example/Himotoki Sample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -59,6 +79,11 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

Example/Himotoki Sample/Model/RepoRequest.swift

@@ -45,7 +45,7 @@ extension RepoRequest {
         guard
             let tree = object as? [String: Any],
             let items = tree["items"],
-            let repos: [Repo] = try? decodeArray(items)
+            let repos = try? Repo.mapArray(items)
         else {
             return []
         }

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -7,3 +7,19 @@
 //
 
 import Foundation
+import Argo
+
+public extension Decodable where Self == Self.DecodedType {
+    public static func mapObject(_ object: Any) throws -> Self {
+        guard let result = Self.decode(JSON(object)).value else {
+            throw MapError.Unmatchable(object)
+        }
+        return result
+    }
+    public static func mapArray(_ object: Any) throws -> [Self] {
+        guard let result = Array<Self>.decode(JSON(object)).value else {
+            throw MapError.Unmatchable(object)
+        }
+        return result
+    }
+}

Sources/Classes/Argo/APIKit+Argo.swift

@@ -0,0 +1,11 @@
+//
+//  Extension.swift
+//  Pods
+//
+//  Created by DTVD on 1/9/17.
+//
+//
+
+enum MapError: Error {
+    case Unmatchable(Any)
+}

Sources/Classes/Core/Extension.swift

@@ -7,3 +7,14 @@
 //
 
 import Foundation
+import Himotoki
+
+public extension Decodable {
+    public static func mapObject(_ object: Any) throws -> Self {
+        return try Self.decodeValue(object)
+    }
+
+    public static func mapArray(_ object: Any) throws -> [Self] {
+        return try [Self].decode(object)
+    }
+}

Sources/Classes/Himotoki/APIKit+Himotoki.swift

@@ -9,10 +9,6 @@
 import Foundation
 import ObjectMapper
 
-enum MapError: Error {
-    case Unmatchable(Any)
-}
-
 public extension Mappable {
 
     public static func mapObject(_ object: Any) throws -> Self {