Merge pull request #116 from feinoujc/custom-content-serializer

use converter for merge var content; includes nulls by default

src/Mandrill.net/Mandrill.net.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="logo.png" Pack="true" PackagePath=""/>
+    <None Include="logo.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
 

src/Mandrill.net/MandrillApi.cs

@@ -2,6 +2,8 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Mandrill.Model;
+using Mandrill.Serialization;
+using Newtonsoft.Json;
 
 namespace Mandrill
 {

src/Mandrill.net/MandrillRequest.cs

@@ -12,14 +12,18 @@ namespace Mandrill
 {
     internal class MandrillRequest
     {
-        public HttpClient HttpClient { get; }
         public string ApiKey { get; }
+        public HttpClient HttpClient { get; }
+        public JsonSerializer JsonSerializer { get; }
+
         public MandrillRequest(string apiKey, HttpClient httpClient)
         {
             if (apiKey == null) throw new ArgumentNullException(nameof(apiKey));
+            if (httpClient == null) throw new ArgumentNullException(nameof(httpClient));
 
             ApiKey = apiKey;
-            this.HttpClient = httpClient;
+            HttpClient = httpClient;
+            JsonSerializer = MandrillSerializer.Instance;
         }
 
         public async Task<TResponse> PostAsync<TRequest, TResponse>(string requestUri, TRequest value) where TRequest : MandrillRequestBase
@@ -67,12 +71,12 @@ private async Task<T> ReadAsJsonAsync<T>(HttpContent content)
             using (var reader = new StreamReader(stream))
             using (var jsonReader = new JsonTextReader(reader))
             {
-                return MandrillSerializer<T>.Deserialize(jsonReader);
+                return JsonSerializer.Deserialize<T>(jsonReader);
             }
         }
 
         private async Task<HttpResponseMessage> PostAsJsonAsync<T>(string requestUri, T value,
-            CancellationToken c = default(CancellationToken))
+            CancellationToken c = default)
         {
             using (var stream = new MemoryStream())
             using (var writer = new StreamWriter(stream))
@@ -86,7 +90,7 @@ private StreamContent GetStreamContent<T>(T value, StreamWriter writer)
         {
             using (var jsonWriter = new JsonTextWriter(writer) { CloseOutput = false })
             {
-                MandrillSerializer<T>.Serialize(jsonWriter, value);
+                JsonSerializer.Serialize(jsonWriter, value);
                 jsonWriter.Flush();
             }
             writer.BaseStream.Seek(0, SeekOrigin.Begin);

src/Mandrill.net/Serialization/MandrillMergeVarConverter.cs

@@ -0,0 +1,42 @@
+using System;
+using Mandrill.Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Mandrill.Serialization
+{
+    internal class MandrillMergeVarConverter : JsonConverter
+    {
+        private readonly JsonSerializer _contentSerializer;
+
+        public MandrillMergeVarConverter(JsonSerializerSettings contentSettings)
+        {
+            _contentSerializer = JsonSerializer.Create(contentSettings);
+        }
+
+        public override bool CanConvert(Type objectType) => objectType == typeof(MandrillMergeVar);
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override bool CanRead
+        {
+            get { return false; }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var mergeVar = (MandrillMergeVar)value;
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name");
+            writer.WriteValue(mergeVar.Name);
+            var content = JToken.FromObject((object)mergeVar.Content, _contentSerializer);
+            writer.WritePropertyName("content");
+            content.WriteTo(writer);
+            writer.WriteEndObject();
+        }
+    }
+}

src/Mandrill.net/Serialization/MandrillSerializer.cs

@@ -7,19 +7,23 @@ namespace Mandrill.Serialization
 {
     public static class MandrillSerializer
     {
-        private static readonly Lazy<JsonSerializer> LazyJsonSerializer = new Lazy<JsonSerializer>(CreateSerializer);
+        public static JsonSerializer Instance { get; } = Create();
 
-        public static JsonSerializer Instance => LazyJsonSerializer.Value;
+        private static JsonSerializer Create()
+        {
+            var settings = CreateSerializerSettings(NullValueHandling.Ignore);
+            settings.Converters.Add(new MandrillMergeVarConverter(CreateSerializerSettings(NullValueHandling.Include)));
+            return JsonSerializer.Create(settings);
+        }
 
-        private static JsonSerializer CreateSerializer()
+        private static JsonSerializerSettings CreateSerializerSettings(NullValueHandling nullValueHandling)
         {
             var settings = new JsonSerializerSettings { ContractResolver = new MandrillJsonContractResolver() };
-
             settings.Converters.Add(new UnixDateTimeConverter());
             settings.Converters.Add(new StringEnumConverter { NamingStrategy = new SnakeCaseNamingStrategy(), AllowIntegerValues = false });
-            settings.NullValueHandling = NullValueHandling.Ignore;
+            settings.NullValueHandling = nullValueHandling;
             settings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
-            return JsonSerializer.Create(settings);
+            return settings;
         }
     }
 

tests/MandrillApiTest.cs

@@ -6,6 +6,7 @@
 using FluentAssertions;
 using Mandrill;
 using Mandrill.Model;
+using Newtonsoft.Json;
 using Xunit;
 
 namespace Tests

tests/SerializationTests.cs

@@ -87,6 +87,53 @@ public void Can_serialize_content_as_complex_associative_array()
             result[1]["unit_price"].Should().Be(0.40);
         }
 
+        [Fact]
+        public void Can_serialize_content_including_nulls_by_default()
+        {
+            var message = new MandrillMessage();
+
+            var data = new { FirstName = "test", LastName = (string)null, Items = new string[0] };
+
+            message.GlobalMergeVars.Add(new MandrillMergeVar()
+            {
+                Name = "test",
+                Content = data
+            });
+
+            var json = JObject.FromObject(message, MandrillSerializer.Instance);
+
+            json["global_merge_vars"].Should().NotBeEmpty();
+            var result = json["global_merge_vars"].First["content"];
+
+            result.Value<string>("first_name").Should().Be("test");
+            result["last_name"].Should().NotBeNull();
+            result["last_name"].Value<string>().Should().BeNull();
+            result["items"].Should().NotBeNull();
+            result["items"].ToArray().Should().BeEmpty();
+        }
+
+        [Fact]
+        public void Can_serialize_merge_var_content_using_custom_settings()
+        {
+            var message = new MandrillMessage();
+            var data = new ContentModel { FirstName = "test", LastName = null };
+
+            message.GlobalMergeVars.Add(new MandrillMergeVar()
+            {
+                Name = "test",
+                Content = data
+            });
+
+            var json = JObject.FromObject(message, MandrillSerializer.Instance);
+
+            json["global_merge_vars"].Should().NotBeEmpty();
+            var result = json["global_merge_vars"].First["content"];
+
+            result.Value<string>("FirstName").Should().Be("test");
+            result["LastName"].Should().NotBeNull();
+            result["LastName"].Value<string>().Should().BeNull();
+        }
+
         [Fact]
         public void Can_set_property_name_by_convention()
         {
@@ -497,5 +544,13 @@ static Int64 ToUnixTime(DateTime self)
             var delta = self - epoc;
             return (long)delta.TotalSeconds;
         }
+
+        private class ContentModel
+        {
+            [JsonProperty("FirstName")]
+            public string FirstName { get; set; }
+            [JsonProperty("LastName")]
+            public string LastName { get; set; }
+        }
     }
 }