Bring up to date with recent vibe

dub.json

@@ -4,7 +4,7 @@
 	"copyright": "Copyright © 2014, David Monagle",
 	"authors": ["David Monagle"],
 	"dependencies": {
-        "vibe-d": "~>0.7.25",
+        "vibe-d": "~>0.8.0",
         "feature-test-d": "~>1.0.4"
     },
     "configurations": [
@@ -13,5 +13,5 @@
                 "name": "elasticsearch-d"
         }
     ],
-	"license": "MIT",
+	"license": "MIT"
 }

dub.sdl

@@ -0,0 +1,11 @@
+name "elasticsearch-d"
+description "A D Elasticsearch library with an API similar to the official Elasticsearch packages for other languages."
+authors "David Monagle"
+copyright "Copyright © 2014, David Monagle"
+license "MIT"
+dependency "vibe-d" version="~>0.8.5"
+dependency "feature-test-d" version="~>1.0.4"
+dependency "undead" version="~master"
+configuration "elasticsearch-d" {
+	targetType "library"
+}

source/elasticsearch/api/parameters.d

@@ -81,6 +81,7 @@ unittest {
 
 /// Throws an argument exception if the given parameter is not included in `p`
 void enforceParameter(const ref ESParams p, string name) {
+	import std.exception : enforce;
 	enforce(p.hasField(name), new ArgumentException(p, name ~ " parameter is required"));
 }
 
@@ -103,6 +104,7 @@ string esEscape(string value) {
 
 /// Takes an array of strings representing a path and returns a clean path string
 string esPathify(string[] path ...) {
+	import undead.string : squeeze;
 	auto stripped = array(path.map!((p) => p.strip));
 	auto cleanPath = stripped.remove!((p) => !p.length);
 	auto returnString = cleanPath.join("/");

source/elasticsearch/transport/http/vibe.d

@@ -41,15 +41,15 @@ override:
 	Response performTransportRequest(Connection connection, RequestMethod method, string path, ESParams parameters, string requestBody = "") {		
 		Response response;
 		requestHTTP(connection.fullURL(path, parameters),
-			(scope req) {
+			(scope HTTPClientRequest req) {
 				req.method = vibeTransportRequestMethod(method);
 				if (requestBody != "") {
 					req.writeBody(cast(ubyte[])requestBody);
 				}
 				logDebugV("ES Transport Request: %s %s", method, path);
 				if (requestBody.length) logTrace("ES Transport Request Body: \n%s", requestBody);
 			},
-			(scope res) {
+			(scope HTTPClientResponse res) {
 				response.status = res.statusCode;
 				response.headers = res.headers;
 				if (method != RequestMethod.HEAD) {
@@ -59,7 +59,7 @@ override:
 					}
 					else {
 						switch(res.statusCode) {
-							case(HTTPStatus.gatewayTimeout, HTTPStatus.requestTimeout): 
+							case HTTPStatus.gatewayTimeout, HTTPStatus.requestTimeout:
 								throw new HostUnreachableException(connection);
 							default: 
 								auto responseBody = res.bodyReader.readAllUTF8();

source/elasticsearch/transport/transport.d

@@ -27,6 +27,7 @@ struct Host {
 	string password;
 
 	@property string url() {
+		import std.conv : to;
 		auto urlString = protocol ~ "://";
 		if (user.length) urlString ~= user ~ ":" ~ password ~ "@";
 		urlString ~= hostName ~ ":" ~ to!string(port);
@@ -129,6 +130,7 @@ class Transport {
 
 	Response performRequest(RequestMethod method, string path, ESParams parameters = ESParams(), string requestBody = "") {
 		// TODO: Make this more like the official method where it logs failures and automatically reloads connections on failure etc...
+		import std.conv : to;
 		int tries;
 		bool success;