Make JS<T>-specific options nullable and preferred

Author: mythz

src/ServiceStack.Text/Common/WriteType.cs

@@ -31,11 +31,12 @@ internal static class WriteType<T, TSerializer>
 
         private static bool IsIncluded
         {
-            get { return (JsConfig.IncludeTypeInfo || JsConfig<T>.IncludeTypeInfo); }
+            get { return (JsConfig<T>.IncludeTypeInfo.GetValueOrDefault(JsConfig.IncludeTypeInfo)); }
         }
+
         private static bool IsExcluded
         {
-            get { return (JsConfig.ExcludeTypeInfo || JsConfig<T>.ExcludeTypeInfo); }
+            get { return (JsConfig<T>.ExcludeTypeInfo.GetValueOrDefault(JsConfig.ExcludeTypeInfo)); }
         }
 
         static WriteType()
@@ -236,9 +237,9 @@ internal string PropertyName
             {
                 get
                 {
-                    return (JsConfig<T>.EmitCamelCaseNames || JsConfig.EmitCamelCaseNames)
+                    return (JsConfig<T>.EmitCamelCaseNames.GetValueOrDefault(JsConfig.EmitCamelCaseNames))
                         ? propertyNameCLSFriendly
-                        : (JsConfig<T>.EmitLowercaseUnderscoreNames || JsConfig.EmitLowercaseUnderscoreNames)
+                        : (JsConfig<T>.EmitLowercaseUnderscoreNames.GetValueOrDefault(JsConfig.EmitLowercaseUnderscoreNames))
                             ? propertyNameLowercaseUnderscore
                             : propertyName;
                 }
@@ -308,9 +309,9 @@ public static void WriteAbstractProperties(TextWriter writer, object value)
             }
 
             var writeFn = Serializer.GetWriteFn(valueType);
-            if (!JsConfig<T>.ExcludeTypeInfo) JsState.IsWritingDynamic = true;
+            if (!JsConfig<T>.ExcludeTypeInfo.GetValueOrDefault()) JsState.IsWritingDynamic = true;
             writeFn(writer, value);
-            if (!JsConfig<T>.ExcludeTypeInfo) JsState.IsWritingDynamic = false;
+            if (!JsConfig<T>.ExcludeTypeInfo.GetValueOrDefault()) JsState.IsWritingDynamic = false;
         }
 
         public static void WriteProperties(TextWriter writer, object value)

src/ServiceStack.Text/JsConfig.cs

@@ -632,22 +632,22 @@ public class JsConfig<T>
         /// <summary>
         /// Always emit type info for this type.  Takes precedence over ExcludeTypeInfo
         /// </summary>
-        public static bool IncludeTypeInfo = false;
+        public static bool? IncludeTypeInfo = null;
 
         /// <summary>
         /// Never emit type info for this type
         /// </summary>
-        public static bool ExcludeTypeInfo = false;
+        public static bool? ExcludeTypeInfo = null;
 
         /// <summary>
         /// <see langword="true"/> if the <see cref="ITypeSerializer"/> is configured
         /// to take advantage of <see cref="CLSCompliantAttribute"/> specification,
         /// to support user-friendly serialized formats, ie emitting camelCasing for JSON
         /// and parsing member names and enum values in a case-insensitive manner.
         /// </summary>
-        public static bool EmitCamelCaseNames = false;
+        public static bool? EmitCamelCaseNames = null;
 
-        public static bool EmitLowercaseUnderscoreNames = false;
+        public static bool? EmitLowercaseUnderscoreNames = null;
 
         /// <summary>
         /// Define custom serialization fn for BCL Structs

tests/ServiceStack.Text.Tests/JsConfigTests.cs

@@ -0,0 +1,47 @@
+using NUnit.Framework;
+
+namespace ServiceStack.Text.Tests
+{
+    [TestFixture]
+    public class JsConfigTests
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            JsConfig.EmitLowercaseUnderscoreNames = true;
+            JsConfig<Bar>.EmitLowercaseUnderscoreNames = false;
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            JsConfig.Reset();
+        }
+
+        [Test]
+        public void Does_use_specific_configuration()
+        {
+            Assert.That(new Foo { FooBar = "value" }.ToJson(), Is.EqualTo("{\"foo_bar\":\"value\"}"));
+            Assert.That(new Bar { FooBar = "value" }.ToJson(), Is.EqualTo("{\"FooBar\":\"value\"}"));
+        }
+
+        [Test]
+        public void Can_override_default_configuration()
+        {
+            using (JsConfig.With(emitLowercaseUnderscoreNames: false))
+            {
+                Assert.That(new Foo { FooBar = "value" }.ToJson(), Is.EqualTo("{\"FooBar\":\"value\"}"));
+            }
+        }
+    }
+
+    public class Foo
+    {
+        public string FooBar { get; set; }
+    }
+
+    public class Bar
+    {
+        public string FooBar { get; set; }
+    }
+}

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -194,6 +194,7 @@
     <Compile Include="EnumTests.cs" />
     <Compile Include="ExpandoTests.cs" />
     <Compile Include="HttpUtilsMockTests.cs" />
+    <Compile Include="JsConfigTests.cs" />
     <Compile Include="JsonTests\BasicPropertiesTests.cs" />
     <Compile Include="JsonObjectTests.cs" />
     <Compile Include="JsonTests\AnonymousDeserializationTests.cs" />