add patch and delete rest methods

Author: eresid

README.md

@@ -12,12 +12,13 @@ Simple REST client on D language
 * ~~GET request~~
 
 [0.2]
-* ~~add builder for HTTP Client~~
+* ~~Add builder for HTTP Client~~
 * ~~Content Type~~
 * ~~User Agent~~
+* ~~DELETE request~~
+* ~~PATCH request~~
+* Set args and data in builder
 * PUT request
-* PATCH request
-* DELETE request
 
 [0.3]
 * VK sample
@@ -28,6 +29,7 @@ Simple REST client on D language
 * Multipart/form-data
 * flatbuffers support
 * Timeout
+* Optional logs (terminal or file)
 
 ## Backlog
 * Async requests

source/app.d

@@ -9,7 +9,7 @@ import mars.Request;
 import mars.RequestParams;
 import mars.ServerException;
 
-string BASE_URL = "http://httpbin.org/";
+string BASE_URL = "https://httpbin.org/";
 
 void main()
 {
@@ -20,21 +20,43 @@ void main()
 	HttpClientOptions options = new HttpClientOptions;
 	options.baseUrl(BASE_URL);
 	options.headers = ["DefaultHeader" : "header value", "User-Agent" : "Custom User Agent", "Accept" : "Custom Accept"];
-	HttpClient client = new AsyncHttpClient(options);
+	HttpClient client = AsyncHttpClient.init(options);
 
 	Request postRequest = new Request.Builder()
 					.url("post?name=Eugene")
 					.params(params)
-					.headers(["CustomHeader1" : "value1", "CustomHeader2" : "value2"])
+					.headers(["Custom-Header1" : "value1", "Custom-Header2" : "value2"])
 					.build();
 	client.post(postRequest, new CredentialsHttpResponseHandler);
 
 	Request getRequest = new Request.Builder()
 					.url("get?name=Eugene&key1=value1&key2=value2")
 					.params(params)
-					.headers(["CustomHeader3" : "value3", "CustomHeader4" : "value4", "Content-Type" : "Custon Content Type"])
+					.headers(["Custom-Header3" : "value3", "Custom-Header4" : "value4", "Content-Type" : "Custon Content Type"])
 					.build();
 	client.get(getRequest, new CredentialsHttpResponseHandler);
+	
+	Request delRequest = new Request.Builder()
+					.url("delete?name=Eugene&key1=value1&key2=value2")
+					.params(params)
+					.headers(["Custom-Header5" : "value5"])
+					.build();
+	client.del(delRequest, new CredentialsHttpResponseHandler);
+	
+	Request patchRequest = new Request.Builder()
+					.url("patch?name=Eugene&key1=value1&key2=value2")
+					.params(params)
+					.headers(["Custom-Header5" : "value5"])
+					.build();
+	client.patch(patchRequest, new CredentialsHttpResponseHandler);
+	
+	Request putRequest = new Request.Builder()
+					.url("put")
+					.params(params)
+					.headers(["Custom-Header6" : "value6"])
+					.build();
+	//client.put(putRequest, new CredentialsHttpResponseHandler);
+	//writeln(put("https://httpbin.org/put", "Hi!"));
 }
 
 private class CredentialsHttpResponseHandler : HttpResponseHandler {

source/mars/AsyncHttpClient.d

@@ -15,13 +15,17 @@ class AsyncHttpClient : HttpClient {
 	private HttpClientOptions mOptions;
 	private HTTP mHttp;
 
-	this(HttpClientOptions options) {
+	private this(HttpClientOptions options) {
 		mOptions = options;
 		mHttp = HTTP();
 
 		loadDefaultHeaders();
 	}
 
+	static HttpClient init(HttpClientOptions options) {
+		return new this(options);
+	}
+	
 	void post(Request request, HttpResponseHandler responseHandler) {
 		doRequest(HTTP.Method.post, request, responseHandler);
 	}
@@ -46,20 +50,22 @@ class AsyncHttpClient : HttpClient {
 		import std.stdio;
 		import std.conv;
 
+		string url = getCorrectUrl(request.getUrl);
+		writeln("url: ", url);
+		
 		int statusCode = StatusCode.BAD_REQUEST;
 		string[string] responseHeaders;
 		ubyte[] responseBody;
 
 		mHttp.method = httpMethod;
-		if (httpMethod == HTTP.Method.post) {
-			mHttp.url = getCorrectUrl(request.getUrl);
+		if (httpMethod == HTTP.Method.post || httpMethod == HTTP.Method.del || httpMethod == HTTP.Method.patch || httpMethod == HTTP.Method.put) {
+			mHttp.url = url;
 			string contentType = "Content-Type" in mOptions.headers ? mOptions.headers["Content-Type"] : null;
 			if (contentType is null) {
 				contentType = "Content-Type" in request.getHeaders ? request.getHeaders["Content-Type"] : "application/json";
 			}
 			mHttp.setPostData(request.getParams.toJson, contentType);
 		} else if (httpMethod == HTTP.Method.get) {
-			string getUrl = getCorrectUrl(request.getUrl);
 			string[string] paramsToSend = request.getParams.getParams;
 
 			if (paramsToSend !is null && paramsToSend.length > 0) {
@@ -68,14 +74,13 @@ class AsyncHttpClient : HttpClient {
 				import std.algorithm.iteration;
 
 				string urlParams = paramsToSend.keys.map!(k => k ~ "=" ~ paramsToSend[k]).join("&");
-				if (canFind(getUrl, "?")) {
-					mHttp.url = getUrl ~ "&" ~ urlParams;
+				if (canFind(url, "?")) {
+					mHttp.url = url ~ "&" ~ urlParams;
 				} else {
-					string finalUrl = getUrl ~ "?" ~ urlParams;
-					mHttp.url = finalUrl;
+					mHttp.url = url ~ "?" ~ urlParams;
 				}
 			} else {
-				mHttp.url = getCorrectUrl(request.getUrl);
+				mHttp.url = url;
 			}
 		}
 		if (request.getHeaders != null && request.getHeaders.length > 0) {

source/mars/HttpClient.d

@@ -1,9 +1,13 @@
 module mars.HttpClient;
 
+import mars.HttpClientOptions;
 import mars.HttpResponseHandler;
 import mars.Request;
 
 interface HttpClient {
+	
+	static HttpClient init(HttpClientOptions options);
+	
 	void post(Request request, HttpResponseHandler responseHandler);
 
 	void get(Request request, HttpResponseHandler responseHandler);