Merge branch 'feature/CustomObjectSerialization' into develop

basho · Feb 25, 2012 · c6d55b4 · c6d55b4
2 parents c2d524a + 64b546c
commit c6d55b4
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 2 deletions.
diff --git a/CorrugatedIron.Tests/CorrugatedIron.Tests.csproj b/CorrugatedIron.Tests/CorrugatedIron.Tests.csproj
@@ -36,6 +36,7 @@
     <AssemblyOriginatorKeyFile>..\Metadata\CorrugatedIron.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

diff --git a/CorrugatedIron.Tests/Json/RiakObjectConversionTests.cs b/CorrugatedIron.Tests/Json/RiakObjectConversionTests.cs
@@ -22,6 +22,7 @@
 using CorrugatedIron.Tests.Extensions;
 using CorrugatedIron.Util;
 using NUnit.Framework;
+using Newtonsoft.Json;
 
 namespace CorrugatedIron.Tests.Json.RiakObjectConversionTests
 {
@@ -70,8 +71,7 @@ public void NonJsonObjectsCantBeDeserialisedFromJson()
         }
 
         [Test]
-        [Ignore("Only run this if you're interested in some perf stats for Json conversio" +
-            "n")]
+        [Ignore("Only run this if you're interested in some perf stats for Json conversion")]
         public void JsonConversionTimerTest()
         {
             var testPerson = new Person
@@ -116,5 +116,41 @@ public void JsonConversionTimerTest()
             Console.WriteLine("De" +
                 "serialisation took a total of {0} - {1} per iteration", sw.Elapsed, new TimeSpan(sw.ElapsedTicks / iterations));
         }
+
+        [Test]
+        public void CustomSerializerWillSerializeJson()
+        {
+            var testPerson = new Person
+            {
+                DateOfBirth = new DateTime(1978, 12, 5, 0, 0, 0, DateTimeKind.Utc),
+                Email = "oj@buffered.io",
+                Name = new Name
+                {
+                    FirstName = "OJ",
+                    Surname = "Reeves"
+                },
+                PhoneNumbers = new List<PhoneNumber>
+                {
+                    new PhoneNumber
+                    {
+                        Number = "12345678",
+                        NumberType = PhoneNumberType.Home
+                    }
+                }
+            };
+
+            var sots = new SerializeObjectToString<Person>(JsonConvert.SerializeObject);
+
+            var obj = new RiakObject("bucket", "key");
+            obj.SetObject(testPerson, RiakConstants.ContentTypes.ApplicationJson, sots);
+            obj.Value.ShouldNotBeNull();
+            obj.ContentType.ShouldEqual(RiakConstants.ContentTypes.ApplicationJson);
+
+            var json = obj.Value.FromRiakString();
+            json.ShouldEqual("{\"Name\":{\"FirstName\":\"OJ\",\"Surname\":\"Reeves\"},\"PhoneNumbers\":[{\"Number\":\"12345678\",\"NumberType\":1}],\"DateOfBirth\":\"\\/Date(281664000000)\\/\",\"Email\":\"oj@buffered.io\"}");
+
+            var deserialisedPerson = obj.GetObject<Person>();
+            deserialisedPerson.ShouldEqual(testPerson);
+        }
     }
 }
diff --git a/CorrugatedIron/Models/RiakObject.cs b/CorrugatedIron/Models/RiakObject.cs
@@ -27,6 +27,12 @@
 
 namespace CorrugatedIron.Models
 {
+    public delegate string SerializeObjectToString<in T>(T theObject);
+
+    public delegate byte[] SerializeObjectToByteArray<in T>(T theObject);
+
+    public delegate T DeserializeObject<out T>(byte[] theObject, string contentType);
+
     public class RiakObject
     {
         private List<string> _vtags;
@@ -348,6 +354,41 @@ private int CalculateHashCode()
             }
         }
 
+        public void SetObject<T>(T value, string contentType, SerializeObjectToString<T> serializeObject)
+            where T : class 
+        {
+            if (string.IsNullOrEmpty(contentType))
+            {
+                throw new ArgumentException("contentType must be a valid MIME type");
+            }
+
+            if (serializeObject == null)
+            {
+                throw new ArgumentException("serializeObject cannot be null");
+            }
+
+            ContentType = contentType;
+
+            Value = serializeObject(value).ToRiakString();
+        }
+
+        public void SetObject<T>(T value, string contentType, SerializeObjectToByteArray<T> serializeObject)
+        {
+            if (string.IsNullOrEmpty(contentType))
+            {
+                throw new ArgumentException("contentType must be a valid MIME type");
+            }
+
+            if (serializeObject == null)
+            {
+                throw new ArgumentException("serializeObject cannot be null");
+            }
+
+            ContentType = contentType;
+
+            Value = serializeObject(value);
+        }
+
         // setting content type of SetObject changes content type
         public void SetObject<T>(T value, string contentType = null)
             where T : class
@@ -393,6 +434,16 @@ public void SetObject<T>(T value, string contentType = null)
             throw new NotSupportedException(string.Format("Your current ContentType ({0}), is not supported.", ContentType));
         }
 
+        public T GetObject<T>(DeserializeObject<T> deserializeObject)
+        {
+            if (deserializeObject == null)
+            {
+                throw new ArgumentException("deserializeObject must not be null");
+            }
+
+            return deserializeObject(Value, ContentType);
+        }
+
         public T GetObject<T>()
         {
             if(ContentType == RiakConstants.ContentTypes.ApplicationJson)