Merge pull request sendgrid#23 from PandaBoy00/master

Timeout Parameter

Author: thinkingserious

Diff for: .gitignore

@@ -13,4 +13,4 @@ CSharpHTTPClient/CSharpHTTPClient.userprefs
 CSharpHTTPClient/packages/
 CSharpHTTPClient/CSharpHTTPClient.sln.VisualState.xml
 *.PublicKey
-*.pfx
+*.pfx

Diff for: CHANGELOG.md

@@ -46,3 +46,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.2] - 2016-03-17
 ### Added
 - We are live!
+

Diff for: CSharpHTTPClient/Client.cs

@@ -70,11 +70,14 @@ public class Client : DynamicObject
         public string UrlPath;
         public string MediaType;
         public WebProxy WebProxy;
+        public TimeSpan Timeout;
+
         public enum Methods
         {
             DELETE, GET, PATCH, POST, PUT
         }
 
+        private int TimeoutDefault = 10;
 
         /// <summary>
         ///     REST API client.
@@ -90,15 +93,17 @@ public Client(WebProxy webProxy, string host, Dictionary<string, string> request
             WebProxy = webProxy;
         }
 
+
         /// <summary>
         ///     REST API client.
         /// </summary>
         /// <param name="host">Base url (e.g. https://api.sendgrid.com)</param>
         /// <param name="requestHeaders">A dictionary of request headers</param>
         /// <param name="version">API version, override AddVersion to customize</param>
         /// <param name="urlPath">Path to endpoint (e.g. /path/to/endpoint)</param>
+        /// <param name="timeOut">Set an Timeout parameter for the HTTP Client</param>
         /// <returns>Fluent interface to a REST API</returns>
-        public Client(string host, Dictionary<string,string> requestHeaders = null, string version = null, string urlPath = null)
+        public Client(string host, Dictionary<string,string> requestHeaders = null, string version = null, string urlPath = null, TimeSpan? timeOut = null)
         {
             Host = host;
             if(requestHeaders != null)
@@ -107,6 +112,7 @@ public Client(string host, Dictionary<string,string> requestHeaders = null, stri
             }
             Version = (version != null) ? version : null;
             UrlPath = (urlPath != null) ? urlPath : null;
+            Timeout = (timeOut != null) ? (TimeSpan)timeOut : TimeSpan.FromSeconds(TimeoutDefault);
         }
 
         /// <summary>
@@ -172,11 +178,10 @@ private Client BuildClient(string name = null)
             }
 
             UrlPath = null; // Reset the current object's state before we return a new one
-            return new Client(Host, RequestHeaders, Version, endpoint);
+            return new Client(Host, RequestHeaders, Version, endpoint, Timeout);
 
         }
 
-        /// <summary>
         /// Factory method to return the right HttpClient settings.
         /// </summary>
         /// <returns>Instance of HttpClient</returns>
@@ -198,6 +203,8 @@ private HttpClient BuildHttpClient()
             return _httpClient;
         }
 
+        /// <summary>
+
         /// <summary>
         ///     Add the authorization header, override to customize
         /// </summary>
@@ -300,6 +307,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
         /// <returns>Response object</returns>
         public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMessage request)
         {
+
             HttpResponseMessage response = await client.SendAsync(request).ConfigureAwait(false);
             return new Response(response.StatusCode, response.Content, response.Headers);
         }
@@ -311,16 +319,18 @@ public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMe
         /// <param name="requestBody">JSON formatted string</param>
         /// <param name="queryParams">JSON formatted queary paramaters</param>
         /// <returns>Response object</returns>
-        private async Task<Response> RequestAsync(string method, string requestBody = null, string queryParams = null)
+        private async Task<Response> RequestAsync(string method, String requestBody = null, String queryParams = null)
         {
-            using (var client = BuildHttpClient())
+            using (var client = new HttpClient())
             {
                 try
                 {
                     // Build the URL
                     client.BaseAddress = new Uri(Host);
+                    client.Timeout = Timeout;
                     string endpoint = BuildUrl(queryParams);
 
+
                     // Build the request headers
                     client.DefaultRequestHeaders.Accept.Clear();
                     if(RequestHeaders != null)
@@ -372,4 +382,4 @@ private async Task<Response> RequestAsync(string method, string requestBody = nu
             }
         }
     }
-}
+}

Diff for: LICENSE.txt

@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

Diff for: README.md

@@ -96,3 +96,4 @@ csharp-http-client is maintained and funded by SendGrid, Inc. The names and logo
 
 ![SendGrid Logo]
 (https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)
+