Merge pull request #8 from andrewslavin/Log-objects-with-whitespace-prop-names-as-DictionaryValue

Log objects with whitespace prop names as dictionary value

Author: nblumhardt

src/Destructurama.JsonNet/JsonNet/JsonNetDestructuringPolicy.cs

@@ -41,22 +41,22 @@ public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyV
             return false;
         }
 
-        LogEventPropertyValue Destructure(JValue jv, ILogEventPropertyValueFactory propertyValueFactory)
+        private static LogEventPropertyValue Destructure(JValue jv, ILogEventPropertyValueFactory propertyValueFactory)
         {
             return propertyValueFactory.CreatePropertyValue(jv.Value, true);
         }
 
-        // ReSharper disable once ParameterTypeCanBeEnumerable.Local
-        LogEventPropertyValue Destructure(JArray ja, ILogEventPropertyValueFactory propertyValueFactory)
+        private static LogEventPropertyValue Destructure(JArray ja, ILogEventPropertyValueFactory propertyValueFactory)
         {
             var elems = ja.Select(t => propertyValueFactory.CreatePropertyValue(t, true));
             return new SequenceValue(elems);
         }
 
-        LogEventPropertyValue Destructure(JObject jo, ILogEventPropertyValueFactory propertyValueFactory)
+        private static LogEventPropertyValue Destructure(JObject jo, ILogEventPropertyValueFactory propertyValueFactory)
         {
             string typeTag = null;
             var props = new List<LogEventProperty>(jo.Count);
+
             foreach (var prop in jo.Properties())
             {
                 if (prop.Name == "$type")
@@ -67,11 +67,27 @@ LogEventPropertyValue Destructure(JObject jo, ILogEventPropertyValueFactory prop
                         continue;
                     }
                 }
+                else if (!LogEventProperty.IsValidName(prop.Name))
+                {
+                    return DestructureToDictionaryValue(jo, propertyValueFactory);
+                }
 
                 props.Add(new LogEventProperty(prop.Name, propertyValueFactory.CreatePropertyValue(prop.Value, true)));
             }
 
             return new StructureValue(props, typeTag);
         }
+
+        private static LogEventPropertyValue DestructureToDictionaryValue(JObject jo, ILogEventPropertyValueFactory propertyValueFactory)
+        {
+            var elements = jo.Properties().Select(
+                prop =>
+                    new KeyValuePair<ScalarValue, LogEventPropertyValue>(
+                        new ScalarValue(prop.Name),
+                        propertyValueFactory.CreatePropertyValue(prop.Value, true)
+                    )
+            );
+            return new DictionaryValue(elements);
+        }
     }
 }

test/Destructurama.JsonNet.Tests/JsonNetTypesDestructuringTests.cs

@@ -31,7 +31,9 @@ public void AttributesAreConsultedWhenDestructuring()
                 Arr = new[] { 1, 2, 3 },
                 S = "Some string",
                 D = new Dictionary<int, string> { { 1, "One" }, { 2, "Two" } },
-                E = (object)null
+                E = (object)null,
+                ESPN = JsonConvert.DeserializeObject("{\"\":\"Empty string property name\"}"),
+                WSPN = JsonConvert.DeserializeObject("{\"\r\n\":\"Whitespace property name\"}")
             };
 
             var ser = JsonConvert.SerializeObject(test, new JsonSerializerSettings
@@ -48,10 +50,10 @@ public void AttributesAreConsultedWhenDestructuring()
             Assert.IsType<StructureValue>(props["HN"]);
             Assert.IsType<SequenceValue>(props["Arr"]);
             Assert.IsType<string>(props["S"].LiteralValue());
+            Assert.IsType<StructureValue>(props["D"]);
             Assert.Null(props["E"].LiteralValue());
-
-            // Not currently handled correctly - will serialize as a structure
-            // Assert.IsInstanceOf<DictionaryValue>(props["D"]);
+            Assert.IsType<DictionaryValue>(props["ESPN"]);
+            Assert.IsType<DictionaryValue>(props["WSPN"]);
         }
     }
 }