Last change for http support, adding a simple reader for query strings and/or

url-encoded form data to support restful apis.  Also exposed the mime to reader
and mime to writer via dictionaries in the MessageFormatOptions structure.

3 files changed, 124 insertions, 0 deletions

diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
index 549fe88c..e640462c 100644
--- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
+++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
@@ -92,6 +92,7 @@
     </Compile>

     <Compile Include="Compatibility\TextCompatibilityTests.cs" />

     <Compile Include="Compatibility\XmlCompatibilityTests.cs" />

+    <Compile Include="TestReaderForUrlEncoded.cs" />

     <Compile Include="CSharpOptionsTest.cs" />

     <Compile Include="DescriptorsTest.cs" />

     <Compile Include="Descriptors\MessageDescriptorTest.cs" />

diff --git a/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs
index 6f4b7e0f..0ed8d381 100644
--- a/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs
+++ b/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs
@@ -221,5 +221,44 @@ namespace Google.ProtocolBuffers
 

             Assert.AreEqual("<root>\r\n    <text>a</text>\r\n    <number>1</number>\r\n</root>", Encoding.UTF8.GetString(ms.ToArray()));

         }

+

+        [Test]

+        public void TestReadCustomMimeTypes()

+        {

+            var options = new MessageFormatOptions();

+            //Remove existing mime-type mappings

+            options.MimeInputTypes.Clear();

+            //Add our own

+            options.MimeInputTypes.Add("-custom-XML-mime-type-", XmlFormatReader.CreateInstance);

+            Assert.AreEqual(1, options.MimeInputTypes.Count);

+

+            Stream xmlStream = new MemoryStream(Encoding.ASCII.GetBytes(

+                TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build().ToXml()

+                                                    ));

+

+            TestXmlMessage msg = new TestXmlMessage.Builder().MergeFrom(

+                options, "-custom-XML-mime-type-", xmlStream)

+                .Build();

+            Assert.AreEqual("a", msg.Text);

+            Assert.AreEqual(1, msg.Number);

+        }

+

+        [Test]

+        public void TestWriteToCustomType()

+        {

+            var options = new MessageFormatOptions();

+            //Remove existing mime-type mappings

+            options.MimeOutputTypes.Clear();

+            //Add our own

+            options.MimeOutputTypes.Add("-custom-XML-mime-type-", XmlFormatWriter.CreateInstance);

+            

+            Assert.AreEqual(1, options.MimeOutputTypes.Count);

+

+            MemoryStream ms = new MemoryStream();

+            TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()

+                .WriteTo(options, "-custom-XML-mime-type-", ms);

+

+            Assert.AreEqual("<root><text>a</text><number>1</number></root>", Encoding.UTF8.GetString(ms.ToArray()));

+        }

     }

 }
\ No newline at end of file
diff --git a/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs b/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs
new file mode 100644
index 00000000..7861e986
--- /dev/null
+++ b/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs
@@ -0,0 +1,84 @@
+using System;

+using System.IO;

+using System.Text;

+using NUnit.Framework;

+using Google.ProtocolBuffers.TestProtos;

+using Google.ProtocolBuffers.Serialization.Http;

+

+namespace Google.ProtocolBuffers

+{

+    [TestFixture]

+    public class TestReaderForUrlEncoded

+    {

+        [Test]

+        public void Example_FromQueryString()

+        {

+            Uri sampleUri = new Uri("http://sample.com/Path/File.ext?text=two+three%20four&valid=true&numbers=1&numbers=2", UriKind.Absolute);

+

+            ICodedInputStream input = FormUrlEncodedReader.CreateInstance(sampleUri.Query);

+

+            TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

+            builder.MergeFrom(input);

+            

+            TestXmlMessage message = builder.Build();

+            Assert.AreEqual(true, message.Valid);

+            Assert.AreEqual("two three four", message.Text);

+            Assert.AreEqual(2, message.NumbersCount);

+            Assert.AreEqual(1, message.NumbersList[0]);

+            Assert.AreEqual(2, message.NumbersList[1]);

+        }

+

+        [Test]

+        public void Example_FromFormData()

+        {

+            Stream rawPost = new MemoryStream(Encoding.UTF8.GetBytes("text=two+three%20four&valid=true&numbers=1&numbers=2"), false);

+

+            ICodedInputStream input = FormUrlEncodedReader.CreateInstance(rawPost);

+

+            TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

+            builder.MergeFrom(input);

+

+            TestXmlMessage message = builder.Build();

+            Assert.AreEqual(true, message.Valid);

+            Assert.AreEqual("two three four", message.Text);

+            Assert.AreEqual(2, message.NumbersCount);

+            Assert.AreEqual(1, message.NumbersList[0]);

+            Assert.AreEqual(2, message.NumbersList[1]);

+        }

+

+        [Test]

+        public void TestEmptyValues()

+        {

+            ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text=&numbers=1");

+            TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

+            builder.MergeFrom(input);

+

+            Assert.IsTrue(builder.Valid);

+            Assert.IsTrue(builder.HasText);

+            Assert.AreEqual("", builder.Text);

+            Assert.AreEqual(1, builder.NumbersCount);

+            Assert.AreEqual(1, builder.NumbersList[0]);

+        }

+

+        [Test]

+        public void TestNoValue()

+        {

+            ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text&numbers=1");

+            TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

+            builder.MergeFrom(input);

+

+            Assert.IsTrue(builder.Valid);

+            Assert.IsTrue(builder.HasText);

+            Assert.AreEqual("", builder.Text);

+            Assert.AreEqual(1, builder.NumbersCount);

+            Assert.AreEqual(1, builder.NumbersList[0]);

+        }

+

+        [Test, ExpectedException(typeof(NotSupportedException))]

+        public void FormUrlEncodedReaderDoesNotSupportChildren()

+        {

+            ICodedInputStream input = FormUrlEncodedReader.CreateInstance("child=uh0");

+            TestXmlMessage.CreateBuilder().MergeFrom(input);

+        }

+    }

+}