From ea3c83f83d9bde9fdb562994d6aab858d8fabb34 Mon Sep 17 00:00:00 2001
From: CJ Buchmann <cj.buchmann@sendgrid.com>
Date: Fri, 6 Jan 2012 16:12:26 -0800
Subject: [PATCH 1/2] initial unit tests for header

---
 SendGrid/SendGrid/Header.cs   |  56 +++++++
 SendGrid/SendGrid/SendGrid.cs | 301 ++++++++++++++++++++++++++++++++++
 SendGrid/Tests/TestHeader.cs  |  25 +++
 3 files changed, 382 insertions(+)
 create mode 100755 SendGrid/SendGrid/Header.cs
 create mode 100755 SendGrid/SendGrid/SendGrid.cs
 create mode 100755 SendGrid/Tests/TestHeader.cs

diff --git a/SendGrid/SendGrid/Header.cs b/SendGrid/SendGrid/Header.cs
new file mode 100755
index 000000000..42a538f19
--- /dev/null
+++ b/SendGrid/SendGrid/Header.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+
+namespace SendGrid
+{
+    public class Header : IHeader
+    {
+        public void AddTo(IEnumerable<string> recipients)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddSubVal(string tag, IEnumerable<string> substitutions)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddUniqueIdentifier(IDictionary<string, string> identifiers)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SetCategory(string category)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Enable(string filter)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Disable(string filter)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddFilterSetting(string filter, IEnumerable<string> settings, string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddHeader(MailMessage mime)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AsJson()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/SendGrid/SendGrid/SendGrid.cs b/SendGrid/SendGrid/SendGrid.cs
new file mode 100755
index 000000000..966dc6df7
--- /dev/null
+++ b/SendGrid/SendGrid/SendGrid.cs
@@ -0,0 +1,301 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+
+namespace SendGrid
+{
+    public class SendGrid : ISendGrid
+    {
+        public SendGrid(IHeader header)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string From
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string To
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Cc
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Bcc
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Subject
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public IHeader Header
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Html
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Text
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Transport
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public string Date
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public MailMessage CreateMimeMessage()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddTo(string address)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddTo(IEnumerable<string> addresses)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddTo(IDictionary<string, string> addresssInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddTo(IEnumerable<IDictionary<string, string>> addressesInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddCc(string address)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddCc(IEnumerable<string> addresses)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddCc(IDictionary<string, string> addresssInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddCc(IEnumerable<IDictionary<string, string>> addressesInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddBcc(string address)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddBcc(IEnumerable<string> addresses)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddBcc(IDictionary<string, string> addresssInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddBcc(IEnumerable<IDictionary<string, string>> addressesInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddRcpts(string address)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddRcpts(IEnumerable<string> addresses)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddRcpts(IDictionary<string, string> addresssInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddRcpts(IEnumerable<IDictionary<string, string>> addressesInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddSubVal(string tag, string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddAttachment(string filePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddAttachment(Attachment attachment)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string GetMailFrom()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetRecipients()
+        {
+            throw new NotImplementedException();
+        }
+
+        public string Get(string field)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Set(string field, string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableGravatar()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableOpenTracking()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableClickTracking()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableSpamCheck()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableUnsubscribe()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableFooter()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableGoogleAnalytics()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableTemplate()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableBcc()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DisableBipassListManaement()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableGravatar()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableOpenTracking()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableClickTracking(string text = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableSpamCheck(int score = 5, string url = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableUnsubscribe(string text, string html, string replace, string url, string landing)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableFooter(string text = null, string html = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableGoogleAnalytics(string source, string medium, string term, string content = null, string campaign = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableTemplate(string html = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableBcc(string email = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void EnableBipassListManaement()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Mail()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/SendGrid/Tests/TestHeader.cs b/SendGrid/Tests/TestHeader.cs
new file mode 100755
index 000000000..323e394a4
--- /dev/null
+++ b/SendGrid/Tests/TestHeader.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Moq;
+using NUnit.Framework;
+using SendGrid;
+
+namespace Tests
+{
+    [TestFixture]
+    public class TestHeader
+    {
+        [Test]
+        public void TestAddTo()
+        {
+            var foo = new Mock<IHeader>();
+            foo.Setup(m => m.Enable("foo"));
+
+            var bar = new SendGrid.SendGrid(foo.Object);
+            Assert.AreEqual(1, 2, "I suck");
+
+        }
+    }
+}

From 86fbabd1c005bd72bc587887116a4391329d0e5b Mon Sep 17 00:00:00 2001
From: CJ Buchmann <cj.buchmann@sendgrid.com>
Date: Fri, 6 Jan 2012 16:17:57 -0800
Subject: [PATCH 2/2] Modified Isendgrid to add new header object, and removed
 erroneous dependencies from files

---
 SendGrid/SendGrid.suo                     | Bin 34816 -> 39936 bytes
 SendGrid/SendGrid/ISendGrid.cs            |   4 +---
 SendGrid/SendGrid/Mail.csproj             |   2 ++
 SendGrid/SendGrid/Transport/ITransport.cs |   7 +------
 SendGrid/Tests/Tests.csproj               |   7 +++++++
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/SendGrid/SendGrid.suo b/SendGrid/SendGrid.suo
index 9a82799e9d48c8fd3a0e0e38ab9d0b30b43a9a4c..1b103bc2e47696c218e5e834b59c8c94f61552a3 100755
GIT binary patch
literal 39936
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
F@c)8qIW+(P

delta 2103
zcmc&#?N3uz7{BM<+ZUjNTFQ%n$h(!<deK_ZAz*tE*g6Wzl;NFHpdwnJl<NdUsI?(R
z-NO283nqSX`oT{Qy-ViU2XMN@WyX-bm@HYA?H^e9&?Sy6u;-MPv5_qDX}5WL&iOsB
z=bYzxPT)Qpm|&-#vk6rU!z?Z>E!kn8=iz&86=B|+JeS+;{QSui!XYnE48wdqJk*te
z!1M5&cWN^c&O?IHizb*&<Y7?d)Mg;S$H9OeB~=x=WCW;jN>HuNGj5Cl*{d0{T1pr~
zz=m`VepEa7sC=Hrsv1E^hBq}wNDtiAq&oe$9zdc3XK;KQ=`7M<3>%J(lz$%Qqex>&
z0VGG)cU8B3TXbE>4&IRuu>v${1*Ka1h~-cln#|i_s;CYQ7TXCA4-%`wx`zowjd}%0
zbgL>IPD1d9?ltWOoM~b(Nr5vjjj8pxY+zwJ=>XhLsZ=VH=Lkr}HVEjAt0)uZ67kIR
zcI|1@=b32|ZnY_a4GxmP<f8?8VAL1Mg5M2eBnQr<E~z&m*sp<M<JaKWT&Bor6Fhf`
z>42v8O+<zpMK#doHo#z3CU<!aI@e}MVi<xJF!m@n1FEwHdQ%L9vP~do7ZHu}Ae+Sq
z3K3)}10zriIQfJq3pt~NT!o=r7oQtrK_oZC&T}xlxn4!6X_&jbO^IxFu{1uA3qowA
z2nz+vStA!V^K=K)s1hl}V|kQV5iY^QO+yrei*g`R;z}TixXOyl%3F9sv@m3PRYg=3
zL@y9AxuUr!Z*As_;*ycAPdM}I?ryK8W5DO{J2ld=SLzt*I@{eVo$TxJNb-=^<Cpv%
zU*ABt+~@E141l{eHEb~^Ef^W5)_%y*h~{Yq%m-WHmL**!S!Ty?Dl?WXgdBph{<MT<
zW{B}J9>xz#+uz}&RpJek7EP_)S$}*LW-Ke`npV~lH0Gs8Wn3#*uQG1^DkbSD))MvK
z5MxXgHA6+M7Je4>s*6ATGLZ{2mKnHL)Bc}fP_3V8E8t!0Gx$?Zgch@j=5qM(3D7m_
zmCjw4S*~-%LmlM3(Fmtr(R04PvGCz)cv@Gk<TOqb?(}Nh3CXSkWpwZN|F&`JpS~v7
zsu{q0q;#zpOu7~;EH>U(gp+j~n2(C=mskh({1>^lLikv!f=^q;7nFW{ZAaH<MBFRj
z@7#f%d-jWtn%!pGPWvviRj`TXJ@%S%v%@Ov-m^on+wA2B&X3d#x_f+Hj}#l%lT=wL
zo|rP`VVB?C1N~QCP9aRROfX%U?rK`{FS^xzN3ANJ5$~@<<?*$;4BEBgp8+T7Na8yE
z!u2cZF!_NliIyJy#P#0MvH`u98W8{AE7(tWLUfSNXTl}7QE5J|Ch#p^qUphsmhgpH
zZlb1*z4*HLm_EkO$k9#5|KiQ|*Zj1bvu+aZG%mkUnVr>ln{N}CZ5QDE4lf9KI?$ac
zB_GD#lM|r7q$b!~e5nxZ8ila+3vh-_N~yy@K<?2emEzsd25>M|a`WRYVCc<JJqvvU
zca)vIHwbB8(}3QBiu_!7)W0p-RF18v9)m^S4ldqH=EuFte7`;!=0|PNaJod1Ca~J3
z!XH7yF16weXOVkBk>!hVkI~jDhn8DwBy<&8iba?R3i#yf?u`csTn`pOTe0*PQ%$^=

diff --git a/SendGrid/SendGrid/ISendGrid.cs b/SendGrid/SendGrid/ISendGrid.cs
index e5d32266f..20e7114cf 100755
--- a/SendGrid/SendGrid/ISendGrid.cs
+++ b/SendGrid/SendGrid/ISendGrid.cs
@@ -14,7 +14,7 @@ public interface ISendGrid
         String Cc { get; set; }
         String Bcc { get; set; }
         String Subject { get; set; }
-        String Headers { get; set; }
+        IHeader Header { get; set; }
         String Html { get; set; }
         String Text { get; set; }
         String Transport { get; set; }
@@ -59,8 +59,6 @@ public interface ISendGrid
         #endregion
 
         #region SMTP API Functions
-        IHeader Header();
-
         void DisableGravatar();
         void DisableOpenTracking();
         void DisableClickTracking();
diff --git a/SendGrid/SendGrid/Mail.csproj b/SendGrid/SendGrid/Mail.csproj
index 141d23258..d6b0d5523 100755
--- a/SendGrid/SendGrid/Mail.csproj
+++ b/SendGrid/SendGrid/Mail.csproj
@@ -41,9 +41,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Header.cs" />
     <Compile Include="IHeader.cs" />
     <Compile Include="ISendGrid.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SendGrid.cs" />
     <Compile Include="Transport\ITransport.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/SendGrid/SendGrid/Transport/ITransport.cs b/SendGrid/SendGrid/Transport/ITransport.cs
index 97ebdb6b7..92557b1e9 100755
--- a/SendGrid/SendGrid/Transport/ITransport.cs
+++ b/SendGrid/SendGrid/Transport/ITransport.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace SendGrid.Transport
+namespace SendGrid.Transport
 {
     public interface ITransport
     {
diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
index 5f8d4025d..0fcdc8622 100755
--- a/SendGrid/Tests/Tests.csproj
+++ b/SendGrid/Tests/Tests.csproj
@@ -52,11 +52,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestHeader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SendGrid\Mail.csproj">
+      <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>
+      <Name>Mail</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.