Merge pull request #2 from vapor/beta

beta dependencies

Package.swift

@@ -6,6 +6,6 @@ let package = Package(
     name: "BCrypt",
     dependencies: [
         // Module for generating random bytes and numbers.
-        .Package(url: "https://github.com/vapor/random.git", majorVersion: 0)
+        .Package(url: "https://github.com/vapor/random.git", Version(1,0,0, prereleaseIdentifiers: ["beta"]))
     ]
 )

Tests/BCryptTests/BCryptTests.swift

@@ -2,18 +2,17 @@ import XCTest
 import BCrypt
 
 class BCryptTests: XCTestCase {
-    let tests = [
-        "$2a$04$TI13sbmh3IHnmRepeEFoJOkVZWsn5S1O8QOwm8ZU5gNIpJog9pXZm": "vapor",
-        "$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s.": "",
-        "$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe": "a",
-        "$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i": "abc",
-        "$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC": "abcdefghijklmnopqrstuvwxyz",
-        "$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO": "~!@#$%^&*()      ~!@#$%^&*()PNBFRD"
+    static let allTests = [
+        ("testVersion", testVersion),
+        ("testFail", testFail),
+        ("testSanity", testSanity),
+        ("testInvalidSalt", testInvalidSalt),
+        ("testVerify", testVerify)
     ]
 
     func testVersion() throws {
         let digest = try Hash.make(message: "foo")
-        XCTAssert(digest.string.hasPrefix("$2y$06$"))
+        XCTAssert(digest.makeString().hasPrefix("$2y$06$"))
     }
 
     func testFail() throws {
@@ -32,10 +31,9 @@ class BCryptTests: XCTestCase {
         let parser = try Parser(res)
         let parsedSalt = try parser.parseSalt()
 
-        XCTAssertEqual(secret, parsedSalt.bytes.string)
+        XCTAssertEqual(secret, parsedSalt.bytes.makeString())
     }
 
-
     func testInvalidSalt() throws {
         do {
             _ = try Parser("foo".makeBytes())
@@ -51,12 +49,13 @@ class BCryptTests: XCTestCase {
             XCTAssert(result, "Message '\(message)' did not create \(desired)")
         }
     }
-
-    static var allTests = [
-        ("testVersion", testVersion),
-        ("testFail", testFail),
-        ("testSanity", testSanity),
-        ("testInvalidSalt", testInvalidSalt),
-        ("testVerify", testVerify)
-    ]
 }
+
+let tests = [
+    "$2a$04$TI13sbmh3IHnmRepeEFoJOkVZWsn5S1O8QOwm8ZU5gNIpJog9pXZm": "vapor",
+    "$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s.": "",
+    "$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe": "a",
+    "$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i": "abc",
+    "$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC": "abcdefghijklmnopqrstuvwxyz",
+    "$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO": "~!@#$%^&*()      ~!@#$%^&*()PNBFRD"
+]