Merge pull request #367 from niltz/master

append the "+0000" offset to utc dates if specified

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -35,6 +35,7 @@ public static class DateTimeSerializer
         public const string WcfJsonPrefix = "/Date(";
         public const char WcfJsonSuffix = ')';
         public const string UnspecifiedOffset = "-0000";
+        public const string UtcOffset = "+0000";
 
         /// <summary>
         /// If AlwaysUseUtc is set to true then convert all DateTime to UTC.
@@ -423,6 +424,13 @@ public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
                 else
                     offset = LocalTimeZone.GetUtcOffset(dateTime).ToTimeOffsetString();
             }
+            else
+            {
+                // Normally the JsonDateHandler.TimestampOffset doesn't append an offset for Utc dates, but if
+                // the JsConfig.AppendUtcOffset is set then we will
+                if (JsConfig.DateHandler == JsonDateHandler.TimestampOffset && JsConfig.AppendUtcOffset.HasValue && JsConfig.AppendUtcOffset.Value)
+                    offset = UtcOffset;
+            }
 
             writer.Write(EscapedWcfJsonPrefix);
             writer.Write(timestamp);

src/ServiceStack.Text/JsConfig.cs

@@ -47,6 +47,7 @@ public static JsConfigScope With(
 			bool? treatEnumAsInteger = null,
             bool? alwaysUseUtc = null,
             bool? assumeUtc = null,
+            bool? appendUtcOffset = null,
             bool? escapeUnicode = null,
             bool? includePublicFields = null,
             int? maxDepth = null,
@@ -72,6 +73,7 @@ public static JsConfigScope With(
                 TreatEnumAsInteger = treatEnumAsInteger ?? sTreatEnumAsInteger,
                 AlwaysUseUtc = alwaysUseUtc ?? sAlwaysUseUtc,
                 AssumeUtc = assumeUtc ?? sAssumeUtc,
+                AppendUtcOffset = appendUtcOffset ?? sAppendUtcOffset,
                 EscapeUnicode = escapeUnicode ?? sEscapeUnicode,
                 IncludePublicFields = includePublicFields ?? sIncludePublicFields,
                 MaxDepth = maxDepth ?? sMaxDepth,
@@ -422,6 +424,26 @@ public static bool AssumeUtc
             }
         }
 
+        /// <summary>
+        /// Gets or sets whether we should append the Utc offset when we serialize Utc dates. Defaults to no.
+        /// Only supported for when the JsConfig.DateHandler == JsonDateHandler.TimestampOffset
+        /// </summary>
+        private static bool? sAppendUtcOffset;
+        public static bool? AppendUtcOffset
+        {
+            // obeying the use of ThreadStatic, but allowing for setting JsConfig once as is the normal case
+            get
+            {
+                return (JsConfigScope.Current != null ? JsConfigScope.Current.AppendUtcOffset : null)
+                    ?? sAppendUtcOffset
+                    ?? null;
+            }
+            set
+            {
+                if (sAppendUtcOffset == null) sAppendUtcOffset = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating if unicode symbols should be serialized as "\uXXXX".
         /// </summary>
@@ -563,6 +585,7 @@ public static void Reset()
 			sTreatEnumAsInteger = null;
             sAlwaysUseUtc = null;
             sAssumeUtc = null;
+            sAppendUtcOffset = null;
             sEscapeUnicode = null;
             sIncludePublicFields = null;
             HasSerializeFn = new HashSet<Type>();

src/ServiceStack.Text/JsConfigScope.cs

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

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

@@ -134,6 +134,19 @@ public void Can_serialize_json_date_timestampOffset_unspecified_assume_utc()
             JsConfig.Reset();
         }
 
+        [Test]
+        public void Can_serialize_json_date_timestampOffset_unspecified_appendUtcOffset()
+        {
+            JsConfig.DateHandler = JsonDateHandler.TimestampOffset;
+            JsConfig.AppendUtcOffset = true;
+
+            var dateTime = DateTime.SpecifyKind(DateTime.Parse("2013-06-14 19:43:37.663"), DateTimeKind.Utc);
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+            Assert.That(ssJson, Is.EqualTo(@"""\/Date(1371239017663+0000)\/"""));
+            
+            JsConfig.Reset();
+        }
+
 		#endregion
 
         #region TimeSpan Tests
@@ -252,6 +265,19 @@ public void Can_serialize_json_date_dcjsCompatible_unspecified_assume_utc()
             Assert.That(ssJson, Is.EqualTo(@"""\/Date(1371239017663)\/"""));
             JsConfig.Reset();
         }
+
+        [Test]
+        public void Can_serialize_json_date_dcjsCompatible_unspecified_appendUtcOffset()
+        {
+            JsConfig.DateHandler = JsonDateHandler.DCJSCompatible;
+            JsConfig.AppendUtcOffset = true;
+
+            var dateTime = DateTime.SpecifyKind(DateTime.Parse("2013-06-14 19:43:37.663"), DateTimeKind.Utc);
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+            Assert.That(ssJson, Is.EqualTo(@"""\/Date(1371239017663)\/"""));
+
+            JsConfig.Reset();
+        }
 #endif
 		#endregion
 
@@ -368,6 +394,19 @@ public void Can_serialize_json_date_iso8601_unspecified_assume_utc()
             JsConfig.Reset();
         }
 
+        [Test]
+        public void Can_serialize_json_date_iso8601_unspecified_appendUtcOffset()
+        {
+            JsConfig.DateHandler = JsonDateHandler.ISO8601;
+            JsConfig.AppendUtcOffset = true;
+
+            var dateTime = DateTime.SpecifyKind(DateTime.Parse("2013-06-14 19:43:37.663"), DateTimeKind.Utc);
+            var ssJson = JsonSerializer.SerializeToString(dateTime);
+            Assert.That(ssJson, Is.EqualTo(@"""2013-06-14T19:43:37.6630000Z"""));
+
+            JsConfig.Reset();
+        }
+
 		#endregion
 
 		#region ISO-8601 TimeStampOffset Tests