Adopt Mapper for Map (#208)

* Adopt Mapper for Map * Fixed inner dependencies
Zewo · Nov 11, 2016 · 534a6e1 · 534a6e1
1 parent 85166f8
commit 534a6e1
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 43 deletions.
diff --git a/Modules/Axis/Sources/Axis/Core.swift b/Modules/Axis/Sources/Axis/Core.swift
@@ -1,2 +1,3 @@
 @_exported import Reflection
 @_exported import POSIX
+@_exported import Mapper
diff --git a/Modules/Axis/Sources/Axis/Map/Map+Mapper.swift b/Modules/Axis/Sources/Axis/Map/Map+Mapper.swift
@@ -0,0 +1,57 @@
+extension Map : InMap {
+
+    public func get(at indexPath: IndexPathValue) -> Map? {
+        return try? self.get([indexPath])
+    }
+
+    public func asArray() -> [Map]? {
+        if case .array(let array) = self {
+            return array
+        }
+        return nil
+    }
+
+    public func get<T>() -> T? {
+        return self.get()
+    }
+
+}
+
+extension Map : OutMap {
+
+    public static var blank: Map {
+        return .dictionary([:])
+    }
+
+    public mutating func set(_ map: Map, at indexPath: IndexPathValue) throws {
+        try self.set(map, for: indexPath)
+    }
+
+    public static func fromArray(_ array: [Map]) -> Map? {
+        return .array(array)
+    }
+
+    public static func from<T>(_ value: T) -> Map? {
+        if let representable = value as? MapRepresentable {
+            return representable.map
+        }
+        return nil
+    }
+
+    public static func from(_ int: Int) -> Map? {
+        return .int(int)
+    }
+
+    public static func from(_ double: Double) -> Map? {
+        return .double(double)
+    }
+
+    public static func from(_ string: String) -> Map? {
+        return .string(string)
+    }
+
+    public static func from(_ bool: Bool) -> Map? {
+        return .bool(bool)
+    }
+
+}
diff --git a/Modules/Axis/Sources/Axis/Map/Map.swift b/Modules/Axis/Sources/Axis/Map/Map.swift
@@ -491,28 +491,17 @@ extension Map {
 
 // MARK: IndexPath
 
-public typealias IndexPath = [IndexPathElement]
-
 extension String {
-    public func indexPath() -> IndexPath {
+    public func indexPath() -> [IndexPathValue] {
         return self.split(separator: ".").map {
             if let index = Int($0) {
-                return index as IndexPathElement
+                return .index(index)
             }
-            return $0 as IndexPathElement
+            return .key($0)
         }
     }
 }
 
-public enum IndexPathValue {
-    case index(Int)
-    case key(String)
-}
-
-public protocol IndexPathElement {
-    var indexPathValue: IndexPathValue { get }
-}
-
 extension IndexPathElement {
     var constructEmptyContainer: Map {
         switch indexPathValue {
@@ -522,18 +511,6 @@ extension IndexPathElement {
     }
 }
 
-extension Int : IndexPathElement {
-    public var indexPathValue: IndexPathValue {
-        return .index(self)
-    }
-}
-
-extension String : IndexPathElement {
-    public var indexPathValue: IndexPathValue {
-        return .key(self)
-    }
-}
-
 // MARK: Get
 
 extension Map {
@@ -562,13 +539,13 @@ extension Map {
         return try get(indexPath)
     }
 
-    public func get(_ indexPath: IndexPath) throws -> Map {
+    public func get(_ indexPath: [IndexPathElement]) throws -> Map {
         var value: Map = self
 
         for element in indexPath {
             switch element.indexPathValue {
             case .index(let index):
-                let array = try value.asArray()
+                let array: [Map] = try value.asArray()
                 if array.indices.contains(index) {
                     value = array[index]
                 } else {

diff --git a/Modules/Axis/Tests/AxisTests/Map/MapTests.swift b/Modules/Axis/Tests/AxisTests/Map/MapTests.swift
@@ -27,7 +27,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try null.asInt())
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let nullArrayValue: [Bool]? = nil
@@ -54,7 +54,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try null.asInt())
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let nullArrayOfNullValue: [Bool?]? = nil
@@ -81,7 +81,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try null.asInt())
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let nullDictionaryValue: [String: Bool]? = nil
@@ -108,7 +108,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try null.asInt())
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let nullDictionaryOfNullValue: [String: Bool?]? = nil
@@ -135,7 +135,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try null.asInt())
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let boolValue = true
@@ -162,7 +162,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try bool.asInt())
         XCTAssertThrowsError(try bool.asString())
         XCTAssertThrowsError(try bool.asBuffer())
-        XCTAssertThrowsError(try bool.asArray())
+        XCTAssertThrowsError(try bool.asArray(converting: false))
         XCTAssertThrowsError(try bool.asDictionary())
 
         let doubleValue = 4.20
@@ -189,7 +189,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try double.asInt())
         XCTAssertThrowsError(try double.asString())
         XCTAssertThrowsError(try double.asBuffer())
-        XCTAssertThrowsError(try double.asArray())
+        XCTAssertThrowsError(try double.asArray(converting: false))
         XCTAssertThrowsError(try double.asDictionary())
 
         let intValue = 1969
@@ -216,7 +216,7 @@ public class MapTests : XCTestCase {
         XCTAssertEqual(try int.asInt(), intValue)
         XCTAssertThrowsError(try null.asString())
         XCTAssertThrowsError(try null.asBuffer())
-        XCTAssertThrowsError(try null.asArray())
+        XCTAssertThrowsError(try null.asArray(converting: false))
         XCTAssertThrowsError(try null.asDictionary())
 
         let stringValue = "foo"
@@ -243,7 +243,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try string.asInt())
         XCTAssertEqual(try string.asString(), stringValue)
         XCTAssertThrowsError(try string.asBuffer())
-        XCTAssertThrowsError(try string.asArray())
+        XCTAssertThrowsError(try string.asArray(converting: false))
         XCTAssertThrowsError(try string.asDictionary())
 
         let bufferValue = Buffer("foo")
@@ -269,7 +269,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try buffer.asInt())
         XCTAssertThrowsError(try buffer.asString())
         XCTAssertEqual(try buffer.asBuffer(), bufferValue)
-        XCTAssertThrowsError(try buffer.asArray())
+        XCTAssertThrowsError(try buffer.asArray(converting: false))
         XCTAssertThrowsError(try buffer.asDictionary())
 
         let arrayValue = 1969
@@ -393,7 +393,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try dictionary.asInt())
         XCTAssertThrowsError(try dictionary.asString())
         XCTAssertThrowsError(try dictionary.asBuffer())
-        XCTAssertThrowsError(try dictionary.asArray())
+        XCTAssertThrowsError(try dictionary.asArray(converting: false))
         XCTAssertEqual(try dictionary.asDictionary(), ["foo": .int(dictionaryValue)])
 
         let dictionaryOfOptionalValue: Int? = dictionaryValue
@@ -424,7 +424,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try dictionaryOfOptional.asInt())
         XCTAssertThrowsError(try dictionaryOfOptional.asString())
         XCTAssertThrowsError(try dictionaryOfOptional.asBuffer())
-        XCTAssertThrowsError(try dictionaryOfOptional.asArray())
+        XCTAssertThrowsError(try dictionaryOfOptional.asArray(converting: false))
         XCTAssertEqual(try dictionaryOfOptional.asDictionary(), ["foo": .int(dictionaryValue)])
 
         let dictionaryOfNullValue: Int? = nil
@@ -455,7 +455,7 @@ public class MapTests : XCTestCase {
         XCTAssertThrowsError(try dictionaryOfNull.asInt())
         XCTAssertThrowsError(try dictionaryOfNull.asString())
         XCTAssertThrowsError(try dictionaryOfNull.asBuffer())
-        XCTAssertThrowsError(try dictionaryOfNull.asArray())
+        XCTAssertThrowsError(try dictionaryOfNull.asArray(converting: false))
         XCTAssertEqual(try dictionaryOfNull.asDictionary(), ["foo": .null])
     }
 
@@ -800,6 +800,7 @@ public class MapTests : XCTestCase {
         let fuuDictionaryB: [String: Baz] = [:]
         XCTAssertEqual(try fuuDictionaryB.asMap(), [:])
     }
+
 }
 
 extension MapTests {

diff --git a/Package.swift b/Package.swift
@@ -5,10 +5,10 @@ let package = Package(
     targets: [
         Target(name: "POSIX"),
         Target(name: "Reflection"),
-        Target(name: "Axis", dependencies: ["Reflection", "POSIX"]),
+        Target(name: "Axis", dependencies: ["Reflection", "POSIX", "Mapper"]),
         Target(name: "OpenSSL", dependencies: ["Axis"]),
         Target(name: "HTTP", dependencies: ["Axis"]),
-
+        Target(name: "Mapper"),
         Target(name: "Venice", dependencies: ["Axis"]),
         Target(name: "IP", dependencies: ["Axis"]),
         Target(name: "TCP", dependencies: ["IP", "OpenSSL"]),