Merge pull request #343 from niltz/master

Add a JsConfig.AssumeUtc

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -402,6 +402,11 @@ public static DateTime ParseWcfJsonDate(string wcfJsonDate)
         private static TimeZoneInfo LocalTimeZone = TimeZoneInfo.Local;
         public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
         {
+            if (JsConfig.AssumeUtc && dateTime.Kind == DateTimeKind.Unspecified)
+            {
+                dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
+            }
+
             if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
             {
                 writer.Write(dateTime.ToString("o", CultureInfo.InvariantCulture));

src/ServiceStack.Text/JsConfig.cs

@@ -45,6 +45,7 @@ public static JsConfigScope With(
             Func<string, Type> typeFinder = null,
 			bool? treatEnumAsInteger = null,
             bool? alwaysUseUtc = null,
+            bool? assumeUtc = null,
             bool? escapeUnicode = null,
             bool? includePublicFields = null,
             int? maxDepth = null,
@@ -67,6 +68,7 @@ public static JsConfigScope With(
                 TypeFinder = typeFinder ?? sTypeFinder,
                 TreatEnumAsInteger = treatEnumAsInteger ?? sTreatEnumAsInteger,
                 AlwaysUseUtc = alwaysUseUtc ?? sAlwaysUseUtc,
+                AssumeUtc = assumeUtc ?? sAssumeUtc,
                 EscapeUnicode = escapeUnicode ?? sEscapeUnicode,
                 IncludePublicFields = includePublicFields ?? sIncludePublicFields,
                 MaxDepth = maxDepth ?? sMaxDepth,
@@ -382,6 +384,25 @@ public static bool AlwaysUseUtc
             }
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating if the framework should always assume <see cref="DateTime"/> is in UTC format if Kind is Unspecified. 
+        /// </summary>
+        private static bool? sAssumeUtc;
+        public static bool AssumeUtc
+        {
+            // obeying the use of ThreadStatic, but allowing for setting JsConfig once as is the normal case
+            get
+            {
+                return (JsConfigScope.Current != null ? JsConfigScope.Current.AssumeUtc : null)
+                    ?? sAssumeUtc
+                    ?? false;
+            }
+            set
+            {
+                if (!sAssumeUtc.HasValue) sAssumeUtc = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating if unicode symbols should be serialized as "\uXXXX".
         /// </summary>
@@ -510,6 +531,7 @@ public static void Reset()
             sTypeFinder = null;
 			sTreatEnumAsInteger = null;
             sAlwaysUseUtc = null;
+            sAssumeUtc = null;
             sEscapeUnicode = null;
             sIncludePublicFields = null;
             HasSerializeFn = new HashSet<Type>();

src/ServiceStack.Text/JsConfigScope.cs

@@ -72,6 +72,7 @@ public void Dispose()
         public bool? EmitLowercaseUnderscoreNames { get; set; }
         public bool? ThrowOnDeserializationError { get; set; }
         public bool? AlwaysUseUtc { get; set; }
+        public bool? AssumeUtc { get; set; }
         public bool? EscapeUnicode { get; set; }
         public bool? PreferInterfaces { get; set; }
         public bool? IncludePublicFields { get; set; }

tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs

@@ -104,19 +104,32 @@ public void Can_deserialize_json_date_timestampOffset_withOffset_asUnspecified()
 			JsConfig.Reset();
 		}
 
-		[Test]
-		public void Can_deserialize_json_date_timestampOffset_withZeroOffset_asUnspecified()
-		{
-			JsConfig.DateHandler = JsonDateHandler.TimestampOffset;
+        [Test]
+        public void Can_deserialize_json_date_timestampOffset_withZeroOffset_asUnspecified()
+        {
+            JsConfig.DateHandler = JsonDateHandler.TimestampOffset;
 
-			const string json = @"""\/Date(785635200000+0000)\/""";
-			var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
+            const string json = @"""\/Date(785635200000+0000)\/""";
+            var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
 
-			var dateTime = new DateTime(1994, 11, 24, 0, 0, 0, DateTimeKind.Unspecified);
-			Assert.That(fromJson, Is.EqualTo(dateTime));
-			Assert.That(fromJson.Kind, Is.EqualTo(dateTime.Kind));
-			JsConfig.Reset();
-		}
+            var dateTime = new DateTime(1994, 11, 24, 0, 0, 0, DateTimeKind.Unspecified);
+            Assert.That(fromJson, Is.EqualTo(dateTime));
+            Assert.That(fromJson.Kind, Is.EqualTo(dateTime.Kind));
+            JsConfig.Reset();
+        }
+
+        [Test]
+        public void Can_serialize_json_date_timestampOffset_unspecified_assume_utc()
+        {
+            JsConfig.DateHandler = JsonDateHandler.TimestampOffset;
+            JsConfig.AssumeUtc = true;
+
+            var dateTime = DateTime.Parse("2013-06-14 19:43:37.663");
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+
+            Assert.That(ssJson, Is.EqualTo(@"""\/Date(1371239017663)\/"""));
+            JsConfig.Reset();
+        }
 
 		#endregion
 
@@ -223,6 +236,19 @@ public void Can_deserialize_json_date_dcjsCompatible_unspecified()
             Assert.That(fromJson.Kind, Is.EqualTo(DateTimeKind.Local)); // fromBclJson.Kind
 			JsConfig.Reset();
 		}
+
+        [Test]
+        public void Can_serialize_json_date_dcjsCompatible_unspecified_assume_utc()
+        {
+            JsConfig.DateHandler = JsonDateHandler.DCJSCompatible;
+            JsConfig.AssumeUtc = true;
+
+            var dateTime = DateTime.Parse("2013-06-14 19:43:37.663");
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+
+            Assert.That(ssJson, Is.EqualTo(@"""\/Date(1371239017663)\/"""));
+            JsConfig.Reset();
+        }
 #endif
 		#endregion
 
@@ -325,6 +351,19 @@ public void Can_deserialize_json_date_iso8601_withOffset_asLocal()
 			JsConfig.Reset();
 		}
 
+        [Test]
+        public void Can_serialize_json_date_iso8601_unspecified_assume_utc()
+        {
+            JsConfig.DateHandler = JsonDateHandler.ISO8601;
+            JsConfig.AssumeUtc = true;
+
+            var dateTime = DateTime.Parse("2013-06-14 19:43:37.663");
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+
+            Assert.That(ssJson, Is.EqualTo(@"""2013-06-14T19:43:37.6630000Z"""));
+            JsConfig.Reset();
+        }
+
 		#endregion
 
 		#region ISO-8601 TimeStampOffset Tests