Added json attributes and refactored in Enum string converter seriali…

…zation.

src/app/SharpRaven/Data/BreadcrumbsLevel.cs

@@ -0,0 +1,10 @@
+namespace SharpRaven.Data
+{
+    /// <summary>
+    /// This defines the level of the event. If not provided it defaults to info which is the middle level. In the order of priority from highest to lowest the levels are critical, error, warning, info and debug. Levels are used in the UI to emphasize and deemphasize the crumb.
+    /// </summary>
+    public enum BreadcrumbsLevel
+    {
+        Critical, Error, Warning, Info, Debug
+    }
+}

src/app/SharpRaven/Data/BreadcrumbsRecord.cs

@@ -1,11 +1,15 @@
 using System;
+using System.Collections.Generic;
+
+using Newtonsoft.Json;
+
+using SharpRaven.Serialization;
 
 namespace SharpRaven.Data {
     /// <summary>
     /// BreadcrumbsRecord trail.
     /// </summary>
     public class BreadcrumbsRecord {
-        private readonly BreadcrumbsType? breadcrumbsType;
         private readonly DateTime timestamp;
 
         public BreadcrumbsRecord() {
@@ -15,18 +19,27 @@ public BreadcrumbsRecord() {
 
 
         public BreadcrumbsRecord(BreadcrumbsType type) {
-            breadcrumbsType = type;
+            Type = type;
         }
 
+        [JsonProperty(PropertyName = "type", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(LowerInvariantConverter))]
+        public BreadcrumbsType? Type { get; }
 
-        public BreadcrumbsType? Type {
-            get { return breadcrumbsType; }
-        }
-
+        [JsonProperty(PropertyName = "category", NullValueHandling = NullValueHandling.Ignore)]
         public string Category { get; set; }
 
-        public DateTime Timestamp { get { return timestamp; } }
+        [JsonProperty(PropertyName = "timestamp", NullValueHandling = NullValueHandling.Ignore)]
+        public DateTime Timestamp => this.timestamp;
 
+        [JsonProperty(PropertyName = "message", NullValueHandling = NullValueHandling.Ignore)]
         public string Message { get; set; }
+
+        [JsonProperty(PropertyName = "data", NullValueHandling = NullValueHandling.Ignore)]
+        public IDictionary<string, string> Data { get; set; }
+
+        [JsonProperty(PropertyName = "level", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(LowerInvariantConverter))]
+        public BreadcrumbsLevel? Level { get; set; }
     }
 }

src/app/SharpRaven/Data/JsonPacket.cs

@@ -228,7 +228,7 @@ private JsonPacket()
         /// Defaults to error.
         /// </summary>
         [JsonProperty(PropertyName = "level", NullValueHandling = NullValueHandling.Ignore, Required = Required.Always)]
-        [JsonConverter(typeof(ErrorLevelConverter))]
+        [JsonConverter(typeof(LowerInvariantConverter))]
         public ErrorLevel Level { get; set; }
 
         /// <summary>

src/app/SharpRaven/Serialization/ErrorLevelConverter.cs → src/app/SharpRaven/Serialization/LowerInvariantConverter.cs

@@ -28,6 +28,8 @@
 
 #endregion
 
+using System;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -36,9 +38,9 @@
 namespace SharpRaven.Serialization
 {
     /// <summary>
-    /// Converts <see cref="ErrorLevel"/> to a <see cref="System.String"/>.
+    /// Converts enum to a <see cref="System.String"/>.ToLowerInvariant.
     /// </summary>
-    public class ErrorLevelConverter : StringEnumConverter
+    public class LowerInvariantConverter : StringEnumConverter
     {
         /// <summary>
         /// Writes the JSON representation of the object.
@@ -48,11 +50,13 @@ public class ErrorLevelConverter : StringEnumConverter
         /// <param name="serializer">The calling serializer.</param>
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            if (!(value is ErrorLevel))
-                base.WriteJson(writer, value, serializer);
+            if (!(value is Enum))
+            {
+                return;
+            }
 
-            var level = value.ToString().ToLowerInvariant();
-            writer.WriteValue(level);
+            var stringEnum = value.ToString().ToLowerInvariant();
+            writer.WriteValue(stringEnum);
         }
     }
 }

src/app/SharpRaven/SharpRaven.csproj

@@ -78,6 +78,7 @@
     <Compile Include="..\..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Data\BreadcrumbsLevel.cs" />
     <Compile Include="Data\BreadcrumbsType.cs" />
     <Compile Include="Data\BreadcrumbsRecord.cs" />
     <Compile Include="Data\ExceptionData.cs" />
@@ -108,7 +109,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RavenClient.Net45.cs" />
     <Compile Include="RavenClient.cs" />
-    <Compile Include="Serialization\ErrorLevelConverter.cs" />
+    <Compile Include="Serialization\LowerInvariantConverter.cs" />
     <Compile Include="Configuration.cs" />
     <Compile Include="Utilities\GzipUtil.cs" />
     <Compile Include="Utilities\PacketBuilder.cs" />

src/tests/SharpRaven.UnitTests/Data/BreadcrumbsRecordTests.cs

@@ -51,6 +51,7 @@ public void Constructor_BreadcrumbsRecord_CategoryDefaultLog()
         public void Constructor_BreadcrumbsRecord_TimestampNow()
         {
             var now = DateTime.UtcNow;
+
             var breadcrumbsRecord = new BreadcrumbsRecord();
 
             Assert.That(breadcrumbsRecord.Timestamp, Is.GreaterThanOrEqualTo(now));
@@ -79,8 +80,7 @@ public void Constructor_BreadcrumbsRecord_TypeNull()
         [TestCase("  foo message   ")]
         public void Should_Retain_Espaces_in_Message(string message)
         {
-            var breadcrumbsRecord = new BreadcrumbsRecord();
-            breadcrumbsRecord.Message = message;
+            var breadcrumbsRecord = new BreadcrumbsRecord { Message = message };
 
             Assert.That(breadcrumbsRecord.Message, Is.EqualTo(message));
         }

src/tests/SharpRaven.UnitTests/Serialization/LowerInvariantConverterTests.cs

@@ -0,0 +1,56 @@
+using Newtonsoft.Json;
+
+using NSubstitute;
+
+using NUnit.Framework;
+
+using SharpRaven.Serialization;
+
+namespace SharpRaven.UnitTests.Serialization {
+    [TestFixture]
+    public class LowerInvariantConverterTests {
+        [TestCase(EnumTestable.One, "one")]
+        [TestCase(EnumTestable.Two, "two")]
+        [TestCase(EnumTestable.ThreE, "three")]
+        public void Should_Convert_Enum_To_Lowercase(EnumTestable enumTestable, string result)
+        {
+            var lowerInvariantConverter = new LowerInvariantConverter();
+
+            var jsonWriter = Substitute.For<JsonWriter>();
+
+            lowerInvariantConverter.WriteJson(jsonWriter, enumTestable, Substitute.For<JsonSerializer>());
+
+            jsonWriter.Received().WriteValue(result);
+        }
+
+        [Test]
+        public void Should_Not_Call_Write_Null_value()
+        {
+            var lowerInvariantConverter = new LowerInvariantConverter();
+
+            var jsonWriter = Substitute.For<JsonWriter>();
+
+            lowerInvariantConverter.WriteJson(jsonWriter, null, Substitute.For<JsonSerializer>());
+
+            jsonWriter.DidNotReceiveWithAnyArgs().WriteValue("");
+        }
+
+        [Test]
+        public void Should_Not_Call_Write_If_Not_Enum_Object()
+        {
+            var lowerInvariantConverter = new LowerInvariantConverter();
+
+            var jsonWriter = Substitute.For<JsonWriter>();
+
+            lowerInvariantConverter.WriteJson(jsonWriter, "any string", Substitute.For<JsonSerializer>());
+
+            jsonWriter.DidNotReceiveWithAnyArgs().WriteValue("");
+        }
+
+
+        public enum EnumTestable
+        {
+            One, Two, ThreE
+        }
+    }
+}

src/tests/SharpRaven.UnitTests/SharpRaven.UnitTests.csproj

@@ -99,6 +99,7 @@
     <Compile Include="RavenClientTests\CaptureMessageTests.cs" />
     <Compile Include="RavenClientTests\CaptureTester.cs" />
     <Compile Include="RavenClientTests\RavenClientTests.cs" />
+    <Compile Include="Serialization\LowerInvariantConverterTests.cs" />
     <Compile Include="Utilities\HttpSimulator.cs" />
     <Compile Include="Utilities\PacketBuilderTests.cs" />
     <Compile Include="Utilities\ReflectionHelper.cs" />