Allow includeDefaultEnums to control whether to emit default values

Author: mythz

src/ServiceStack.Text/Common/WriteType.cs

@@ -309,12 +309,11 @@ public TypePropertyWriter(Type propertyType, string propertyName, string propert
 
             public bool ShouldWriteProperty(object propertyValue)
             {
-                if (!isEnum && (propertySuppressDefaultAttribute || JsConfig.ExcludeDefaultValues) && Equals(DefaultValue, propertyValue))
+                if ((!isEnum || !JsConfig.IncludeDefaultEnums) && (propertySuppressDefaultAttribute || JsConfig.ExcludeDefaultValues) && Equals(DefaultValue, propertyValue))
                     return false;
 
                 if (!Serializer.IncludeNullValues
-                    && (propertyValue == null
-                        || (propertySuppressDefaultConfig && Equals(DefaultValue, propertyValue))))
+                    && (propertyValue == null || (propertySuppressDefaultConfig && Equals(DefaultValue, propertyValue))))
                 {
                     return false;
                 }

tests/ServiceStack.Text.Tests/EnumTests.cs

@@ -180,7 +180,7 @@ public void Can_deserialize_null_Nullable_Enum()
         [Test]
         public void Does_write_EnumValues_when_ExcludeDefaultValues()
         {
-            using (JsConfig.With(excludeDefaultValues: true))
+            using (JsConfig.With(excludeDefaultValues:true))
             {
                 Assert.That(new ClassWithEnums
                 {
@@ -192,6 +192,19 @@ public void Does_write_EnumValues_when_ExcludeDefaultValues()
                     NoFlagsEnum = EnumWithoutFlags.Zero
                 }.ToJson(), Is.EqualTo("{\"FlagsEnum\":0,\"NoFlagsEnum\":\"Zero\"}"));
             }
+
+            using (JsConfig.With(excludeDefaultValues:true, includeDefaultEnums:false))
+            {
+                Assert.That(new ClassWithEnums
+                {
+                    NoFlagsEnum = EnumWithoutFlags.One
+                }.ToJson(), Is.EqualTo("{\"NoFlagsEnum\":\"One\"}"));
+
+                Assert.That(new ClassWithEnums
+                {
+                    NoFlagsEnum = EnumWithoutFlags.Zero
+                }.ToJson(), Is.EqualTo("{}"));
+            }
         }
 
     }