Factory removed from Web

Public constructor created (IoC friendly)

4 files changed, 18 insertions, 29 deletions

diff --git a/SendGrid/Example/Program.cs b/SendGrid/Example/Program.cs
index 2b99395..275f6b9 100644
--- a/SendGrid/Example/Program.cs
+++ b/SendGrid/Example/Program.cs
@@ -21,7 +21,7 @@ namespace Example
 			var credentials = new NetworkCredential("username", "password");

 

 			// Create a Web transport for sending email.

-			var transportWeb = Web.GetInstance(credentials);

+			var transportWeb = new Web(credentials);

 

 			// Send the email.

 			if (transportWeb != null)

diff --git a/SendGrid/Example/WEBAPI.cs b/SendGrid/Example/WEBAPI.cs
index 11847a9..862a96a 100644
--- a/SendGrid/Example/WEBAPI.cs
+++ b/SendGrid/Example/WEBAPI.cs
@@ -45,7 +45,7 @@ namespace Example
 			message.Subject = "Hello World HTML Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//send the mail

 			transportInstance.Deliver(message);

@@ -75,7 +75,7 @@ namespace Example
 			message.Subject = "Hello World Plain Text Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//send the mail

 			transportInstance.Deliver(message);

@@ -107,7 +107,7 @@ namespace Example
 			message.Subject = "Hello World Gravatar Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable gravatar

 			message.EnableGravatar();

@@ -141,7 +141,7 @@ namespace Example
 			message.Subject = "Hello World Open Tracking Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable gravatar

 			message.EnableOpenTracking();

@@ -180,7 +180,7 @@ namespace Example
 			message.Subject = "Hello World Click Tracking Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable clicktracking

 			message.EnableClickTracking();

@@ -217,7 +217,7 @@ namespace Example
 			message.Subject = "WIN A MILLION DOLLARS TODAY! WORK FROM HOME! A NIGERIAN PRINCE WANTS YOU!";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable spamcheck

 			message.EnableSpamCheck();

@@ -253,7 +253,7 @@ namespace Example
 			message.Subject = "Hello World Unsubscribe Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable spamcheck

 			//or optionally, you can specify 'replace' instead of the text and html in order to 

@@ -294,7 +294,7 @@ namespace Example
 			message.Subject = "Hello World Footer Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//Enable Footer

 			message.EnableFooter("PLAIN TEXT FOOTER", "<p color='blue'>HTML FOOTER TEXT</p>");

@@ -333,7 +333,7 @@ namespace Example
 			message.Subject = "Hello World Footer Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable Google Analytics

 			message.EnableGoogleAnalytics("SendGridTest", "EMAIL", "Sendgrid", "ad-one", "My SG Campaign");

@@ -372,7 +372,7 @@ namespace Example
 			message.Subject = "Hello World Template Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable template

 			message.EnableTemplate("<p>My Email Template <% body %> is awesome!</p>");

@@ -411,7 +411,7 @@ namespace Example
 			message.Subject = "Hello World Bypass List Management Test";

 

 			//create an instance of the Web transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable bypass list management

 			message.EnableBypassListManagement();

@@ -454,7 +454,7 @@ namespace Example
 			message.AddSubstitution(replacementKey, substitutionValues);

 

 			//create an instance of the SMTP transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable bypass list management

 			message.EnableBypassListManagement();

@@ -494,7 +494,7 @@ namespace Example
 			message.AddUniqueArgs(identifiers);

 

 			//create an instance of the SMTP transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable bypass list management

 			message.EnableBypassListManagement();

@@ -532,7 +532,7 @@ namespace Example
 			message.SetCategory(category);

 

 			//create an instance of the SMTP transport mechanism

-			var transportInstance = Web.GetInstance(new NetworkCredential(_username, _password));

+			var transportInstance = new Web(new NetworkCredential(_username, _password));

 

 			//enable bypass list management

 			message.EnableBypassListManagement();

diff --git a/SendGrid/SendGridMail/Transport/Web.cs b/SendGrid/SendGridMail/Transport/Web.cs
index f053575..3aaa62f 100644
--- a/SendGrid/SendGridMail/Transport/Web.cs
+++ b/SendGrid/SendGridMail/Transport/Web.cs
@@ -29,7 +29,7 @@ namespace SendGridMail
 		/// </summary>

 		/// <param name="credentials">SendGrid user parameters</param>

 		/// <param name="https">Use https?</param>

-		internal Web(NetworkCredential credentials)

+		public Web(NetworkCredential credentials)

 		{

 			_credentials = credentials;

 		}

@@ -53,17 +53,6 @@ namespace SendGridMail
 		}

 

 		/// <summary>

-		///     Factory method for Web transport of sendgrid messages

-		/// </summary>

-		/// <param name="credentials">SendGrid credentials for sending mail messages</param>

-		/// <param name="https">Use https?</param>

-		/// <returns>New instance of the transport mechanism</returns>

-		public static Web GetInstance(NetworkCredential credentials)

-		{

-			return new Web(credentials);

-		}

-

-		/// <summary>

 		///     Asynchronously delivers a message over SendGrid's Web interface

 		/// </summary>

 		/// <param name="message"></param>

diff --git a/SendGrid/Tests/Transport/TestWebApi.cs b/SendGrid/Tests/Transport/TestWebApi.cs
index 37c2e6f..71df619 100644
--- a/SendGrid/Tests/Transport/TestWebApi.cs
+++ b/SendGrid/Tests/Transport/TestWebApi.cs
@@ -18,7 +18,7 @@ namespace Tests.Transport
 		[Test]
 		public void TestFetchFileBodies()
 		{
-			var webApi = Web.GetInstance(new NetworkCredential(TestUsername, TestPassword));
+			var webApi = new Web(new NetworkCredential(TestUsername, TestPassword));
 			var message = new Mock<ISendGrid>();
 			var attachments = new[] {"foo", "bar", "foobar"};
 			message.SetupProperty(foo => foo.Attachments, null);
@@ -58,7 +58,7 @@ namespace Tests.Transport
 			message.AddHeaders(testHeader);
 			message.Header.SetCategory(categoryName);
 
-			var webApi = Web.GetInstance(new NetworkCredential(TestUsername, TestPassword));
+			var webApi = new Web(new NetworkCredential(TestUsername, TestPassword));
 			var result = webApi.FetchFormParams(message);
 			Assert.True(result.Any(r => r.Key == "api_user" && r.Value == TestUsername));
 			Assert.True(result.Any(r => r.Key == "api_key" && r.Value == TestPassword));