Merged current master

Author: aKzenT

.gitignore

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

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.0] - 2017-04-11
+### Added
+- #23: Timeout Parameter
+- Big thanks to [PandaBoy00](https://github.com/PandaBoy00) for the pull request!
+
+## [3.1.0] - 2017-03-01
+### Added
+- [PR #18](https://github.com/sendgrid/csharp-http-client/pull/18): Cache default httpclient
+- Big thanks to [Niels Timmermans](https://github.com/nillis) for the pull request!
+
 ## [3.0.0] - 2016-07-22
 ### BREAKING CHANGE
 - While your code may continue to work as before, the async behavior has changed, as we don't block on .Result anymore 
@@ -41,3 +51,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.2] - 2016-03-17
 ### Added
 - We are live!
+

CONTRIBUTING.md

@@ -16,13 +16,13 @@ We use [Milestones](https://github.com/sendgrid/csharp-http-client/milestones) t
 <a name="cla"></a>
 ## CLAs and CCLAs
 
-Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) or a SendGrid Company Contributor Licensing Agreement (CCLA) be filled out by every contributor to a SendGrid open source project.
+Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) be filled out by every contributor to a SendGrid open source project.
 
-Our goal with the CLA and CCLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions.  The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution.  In this way the CLA and CCLA encourage broad participation by our open source community and help us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
+Our goal with the CLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions.  The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution.  In this way the CLA encourages broad participation by our open source community and helps us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
 
-SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA (or CCLA). Copies of the CLA and CCLA are available [here](https://drive.google.com/a/sendgrid.com/file/d/0B0PlcM9qA91LN2VEUTJWU2RIVXc/view).
+SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA. Copies of the CLA are available [here](https://gist.github.com/SendGridDX/98b42c0a5d500058357b80278fde3be8#file-sendgrid_cla).
 
-You may submit your completed [CLA or CCLA](https://drive.google.com/a/sendgrid.com/file/d/0B0PlcM9qA91LN2VEUTJWU2RIVXc/view) to SendGrid at [dx@sendgrid.com](mailto:dx@sendgrid.com).  SendGrid will then confirm you are ready to begin making contributions.
+When you create a Pull Request, after a few seconds, a comment will appear with a link to the CLA. Click the link and fill out the brief form and then click the "I agree" button and you are all set. You will not be asked to re-sign the CLA unless we make a change.
 
 There are a few ways to contribute, which we'll enumerate below:
 
@@ -163,4 +163,4 @@ Generally, we follow the style guidelines as suggested by the official language.
 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
     with a clear title and description against the `master` branch. All tests must be passing before we will review the PR.
 
-If you have any additional questions, please feel free to [email](mailto:dx@sendgrid.com) us or create an issue in this repo.
+If you have any additional questions, please feel free to [email](mailto:dx@sendgrid.com) us or create an issue in this repo.

CSharpHTTPClient/Client.cs

@@ -14,7 +14,7 @@
 namespace SendGrid.CSharp.HTTP.Client
 {
     public class Response
-    {
+    {      
         public HttpStatusCode StatusCode;
         public HttpContent Body;
         public HttpResponseHeaders Headers;
@@ -64,17 +64,21 @@ public virtual Dictionary<string, string> DeserializeResponseHeaders(HttpRespons
 
     public class Client : DynamicObject
     {
+        private static HttpClient _httpClient = new HttpClient();
         public string Host;
         public Dictionary <string,string> RequestHeaders;
         public string Version;
         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 +94,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 +113,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 +179,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>
@@ -195,9 +201,11 @@ private HttpClient BuildHttpClient()
                 return new HttpClient(httpClientHandler);
             }
 
-            return new HttpClient();
+            return _httpClient;
         }
 
+        /// <summary>
+
         /// <summary>
         ///     Add the authorization header, override to customize
         /// </summary>
@@ -306,7 +314,8 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
         /// <returns>Response object</returns>
         public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            HttpResponseMessage response = await client.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+            HttpResponseMessage response = await client.SendAsync(request).ConfigureAwait(false);
             return new Response(response.StatusCode, response.Content, response.Headers);
         }
 
@@ -318,16 +327,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, CancellationToken cancellationToken, string requestBody = null, string queryParams = null)
+        private async Task<Response> RequestAsync(string method, String requestBody = null, String queryParams = null, CancellationToken cancellationToken = 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)
@@ -383,4 +394,4 @@ private async Task<Response> RequestAsync(string method, CancellationToken cance
             }
         }
     }
-}
+}

CSharpHTTPClient/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SendGrid")]
 [assembly: AssemblyProduct("SendGrid.CSharp.HTTP.Client")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("SendGrid")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0")]
-[assembly: AssemblyFileVersion("3.0.0")]
+[assembly: AssemblyVersion("3.2.0")]
+[assembly: AssemblyFileVersion("3.2.0")]

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.
+

README.md

@@ -94,5 +94,5 @@ csharp-http-client is guided and supported by the SendGrid [Developer Experience
 
 csharp-http-client is maintained and funded by SendGrid, Inc. The names and logos for csharp-http-client are trademarks of SendGrid, Inc.
 
-![SendGrid Logo]
-(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)
+![SendGrid Logo](https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)
+

nuspec/SendGrid.CSharp.HTTP.Client.3.2.0.nuspec

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>SendGrid.CSharp.HTTP.Client</id>
+        <version>3.2.0</version>
+        <title>Fluent REST API Client</title>
+        <authors>Elmer Thomas,SendGrid DX Team</authors>
+        <licenseUrl>https://github.com/sendgrid/csharp-http-client/blob/master/LICENSE</licenseUrl>
+        <projectUrl>https://github.com/sendgrid/csharp-http-client</projectUrl>
+        <iconUrl>https://sendgrid.com/wp-content/themes/sgdotcom/pages/brand/2016/SendGrid-Logomark.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Quickly and easily access any REST or REST-like API using a fluent interface via method chaining and reflection.</description>
+        <summary>Quickly and easily access any REST or REST-like API.</summary>
+        <releaseNotes>### Added
+- #23: Timeout Parameter
+- Big thanks to [PandaBoy00](https://github.com/PandaBoy00) for the pull request!</releaseNotes>
+        <copyright>Copyright 2017</copyright>
+        <language>en-US</language>
+        <tags>SendGrid Email API REST Fluent</tags>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System.Web.Extensions" targetFramework="" />
+        </frameworkAssemblies>
+    </metadata>
+    <files>
+        <file src="..\CSharpHTTPClient\bin\Release\SendGrid.CSharp.HTTP.Client.dll" target="lib\SendGrid.CSharp.HTTP.Client.dll" />
+        <file src="..\CSharpHTTPClient\bin\Release\SendGrid.CSharp.HTTP.Client.dll.config" target="lib\SendGrid.CSharp.HTTP.Client.dll.config" />
+        <file src="..\CSharpHTTPClient\bin\Release\SendGrid.CSharp.HTTP.Client.pdb" target="lib\SendGrid.CSharp.HTTP.Client.pdb" />
+    </files>
+</package>