Merge pull request #46 from vapor/path-clarifications

Path clarifications

.gitignore

@@ -1,3 +1,4 @@
+/**/*/*.DS_Store
 # Xcode
 #
 build/

Package.swift

@@ -1,14 +1,15 @@
 import PackageDescription
 
+let alpha = Version(2, 0, 0, prereleaseIdentifiers: ["alpha"])
+
 let package = Package(
     name: "Node",
     targets: [
-        Target(
-            name: "Node"
-        ),
+        Target(name: "Node"),
     ],
     dependencies: [
-      .Package(url: "https://github.com/vapor/path-indexable.git", majorVersion: 1),
-      .Package(url: "https://github.com/vapor/polymorphic.git",  Version(2, 0, 0, prereleaseIdentifiers: ["alpha.1"]))
+        .Package(url: "https://github.com/vapor/path-indexable.git", alpha),
+        .Package(url: "https://github.com/vapor/polymorphic.git", alpha),
+        .Package(url: "https://github.com/vapor/bits.git", majorVersion: 0)
     ]
 )

Sources/Node/Convertible/Bool+Convertible.swift

@@ -5,7 +5,7 @@ extension Bool: NodeConvertible {
 
     public init(node: Node, in context: Context) throws {
         guard let bool = node.bool else {
-            throw NodeError(node: node, expectation: "\(Bool.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(Bool.self)")
         }
         self = bool
     }

Sources/Node/Convertible/Date+Convertible.swift

@@ -76,7 +76,7 @@ extension Date: NodeConvertible {
                 else { fallthrough }
             self = date
         default:
-            throw NodeError(node: node, expectation: "\(Date.self), formatted time string, or timestamp", key: nil)
+            throw NodeError(node: node, expectation: "\(Date.self), formatted time string, or timestamp")
         }
     }
 }

Sources/Node/Convertible/FloatingPoint+Convertible.swift

@@ -22,7 +22,7 @@ extension NodeConvertibleFloatingPointType {
 
     public init(node: Node, in context: Context) throws {
         guard let double = node.double else {
-            throw NodeError(node: node, expectation: "\(Self.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(Self.self)")
         }
         self.init(double)
     }

Sources/Node/Convertible/Integer+Convertible.swift

@@ -12,7 +12,7 @@ extension SignedInteger {
 
     public init(node: Node, in context: Context) throws {
         guard let int = node.int else {
-            throw NodeError(node: node, expectation: "\(Self.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(Self.self)")
         }
 
         self.init(int.toIntMax())

Sources/Node/Convertible/Sequence+Convertible.swift

@@ -89,7 +89,7 @@ extension KeyAccessible where Key == String, Value: NodeInitializable {
     public init(node: NodeRepresentable, in context: Context = EmptyNode) throws {
         let node = try node.makeNode(context: context)
         guard let object = node.nodeObject else {
-            throw NodeError(node: node, expectation: "\([Key: Value].self)", key: nil)
+            throw NodeError(node: node, expectation: "\([Key: Value].self)")
         }
 
         var mapped: [String: Value] = [:]

Sources/Node/Convertible/String+Convertible.swift

@@ -5,7 +5,7 @@ extension String: NodeConvertible {
 
     public init(node: Node, in context: Context) throws {
         guard let string = node.string else {
-            throw NodeError(node: node, expectation: "\(String.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(String.self)")
         }
         self = string
     }

Sources/Node/Convertible/UUID+Convertible.swift

@@ -3,7 +3,7 @@ import Foundation
 extension UUID: NodeConvertible {
     public init(node: Node, in context: Context) throws {
         guard let string = node.string, let uuid = UUID(uuidString: string) else {
-            throw NodeError(node: node, expectation: "\(UUID.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(UUID.self)")
         }
         self = uuid
     }

Sources/Node/Convertible/UnsignedInteger+Convertible.swift

@@ -12,7 +12,7 @@ extension UnsignedInteger {
 
     public init(node: Node, in context: Context) throws {
         guard let int = node.uint else {
-            throw NodeError(node: node, expectation: "\(Self.self)", key: nil)
+            throw NodeError(node: node, expectation: "\(Self.self)")
         }
 
         self.init(int.toUIntMax())

Sources/Node/Core/Node+Polymorphic.swift

@@ -1,3 +1,5 @@
+import Bits
+
 extension Node: Polymorphic {
     public var string: String? {
         switch self {
@@ -9,6 +11,8 @@ extension Node: Polymorphic {
             return string
         case .date(let date):
             return Date.outgoingDateFormatter.string(from: date)
+        case .bytes(let bytes):
+            return bytes.string
         default:
             return nil
         }

Sources/Node/Core/Node.swift

@@ -15,6 +15,12 @@ public enum Node {
     case date(Date)
 }
 
+extension Node {
+    public init() {
+        self.init([:])
+    }
+}
+
 extension Node: CustomStringConvertible {
     public var description: String {
         switch self {