Merge pull request #202 from qutheory/hd/04-25-updated

More Swift 04-25 updates
vapor · May 2, 2016 · fc98068 · fc98068
2 parents 87dbc75 + 6531465
commit fc98068
Show file tree

Hide file tree

Showing 6 changed files with 760 additions and 434 deletions.
diff --git a/Package.swift b/Package.swift
@@ -4,16 +4,16 @@ let package = Package(
     name: "Vapor",
     dependencies: [
         //Standards package. Contains protocols for cross-project compatability.
-        .Package(url: "https://github.com/open-swift/S4.git", majorVersion: 0, minor: 4),
+        .Package(url: "https://github.com/open-swift/S4.git", majorVersion: 0, minor: 5),
 
         //Provides critical String functions Foundation is missing on Linux
         .Package(url: "https://github.com/Zewo/String.git", majorVersion: 0, minor: 5),
 
         //Parses and serializes JSON
-        .Package(url: "https://github.com/Zewo/JSON.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/Zewo/JSON.git", majorVersion: 0, minor: 6),
 
         //Swift wrapper around Sockets, used for built-in HTTP server
-        .Package(url: "https://github.com/ketzusaka/Hummingbird.git", majorVersion: 1, minor: 4),
+        .Package(url: "https://github.com/ketzusaka/Hummingbird.git", majorVersion: 1, minor: 5),
 
         //SHA2 + HMAC hashing. Used by the core to create session identifiers.
         .Package(url: "https://github.com/CryptoKitten/HMAC.git", majorVersion: 0, minor: 5),

diff --git a/Sources/Development/main.swift b/Sources/Development/main.swift
@@ -40,7 +40,7 @@ app.get("json") { request in
         "number": 123,
         "text": "unicorns",
         "bool": false,
-        "nested": ["one", 2, false]
+        "nested": Json(["one", 2, false])
     ])
 }
 

diff --git a/Sources/Vapor/JSON/JSON.swift b/Sources/Vapor/JSON/JSON.swift
@@ -195,6 +195,12 @@ extension Bool: JsonRepresentable {
     }
 }
 
+extension Json: JsonRepresentable {
+    public func makeJson() -> Json {
+        return self
+    }
+}
+
 extension Json: CustomStringConvertible {
     public var description: String {
         return makeZewoJson().description

diff --git a/Tests/Vapor/ConfigTests.swift b/Tests/Vapor/ConfigTests.swift
@@ -12,13 +12,11 @@ class ConfigTests: XCTestCase {
         ]
     }
 
-    #if Xcode
-    //Xcode doesn't allow a working directory to be set, so this needs to be
-    //hardcoded unfortunately.
-    let workDir = "/Users/tanner/Developer/vapor/vapor/Sources/Development/"
-    #else
-    let workDir = "Sources/Development/"
-    #endif
+    var workDir: String {
+        let parent = #file.characters.split(separator: "/").map(String.init).dropLast().joined(separator: "/")
+        let path = "/\(parent)/../../Sources/Development/"
+        return path
+    }
 
 	func testSimple() {
 		let config = makeConfig(.Development, workDir: workDir)