ServiceStack · mythz · Mar 11, 2012 · Mar 11, 2012 · Mar 11, 2012 · Mar 11, 2012
diff --git a/NuGet/lib/sl4/ServiceStack.Text.dll b/NuGet/lib/sl4/ServiceStack.Text.dll
diff --git a/NuGet/lib/sl4/ServiceStack.Text.xml b/NuGet/lib/sl4/ServiceStack.Text.xml
diff --git a/NuGet/lib/sl5/ServiceStack.Text.dll b/NuGet/lib/sl5/ServiceStack.Text.dll
diff --git a/NuGet/lib/sl5/ServiceStack.Text.xml b/NuGet/lib/sl5/ServiceStack.Text.xml
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -64,6 +64,15 @@ public static DateTime ParseDateTime(string dateTimeStr)
 			return DateTime.ParseExact(dateTimeStr, XsdDateTimeFormat, null);
 		}
 
+		public static DateTimeOffset ParseDateTimeOffset(string dateTimeOffsetStr)
+		{
+			// assume utc when no offset specified
+			if (dateTimeOffsetStr.LastIndexOfAny(TimeZoneChars) < 10 && !dateTimeOffsetStr.EndsWith("Z"))
+				dateTimeOffsetStr += "Z";
+
+			return DateTimeOffset.Parse(dateTimeOffsetStr);
+		}
+
 		public static string ToXsdDateTimeString(DateTime dateTime)
 		{
 			return XmlConvert.ToString(dateTime.ToStableUniversalTime(), XmlDateTimeSerializationMode.Utc);
@@ -138,7 +147,7 @@ public static string ToWcfJsonDate(DateTime dateTime)
 		{
 			if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
 			{
-				return EscapedWcfJsonPrefix + dateTime.ToString("o", CultureInfo.InvariantCulture) + EscapedWcfJsonSuffix;
+			    return dateTime.ToString("o", CultureInfo.InvariantCulture);
 			}
 
 			var timestamp = dateTime.ToUnixTimeMs();
@@ -148,5 +157,20 @@ public static string ToWcfJsonDate(DateTime dateTime)
 
 			return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;
 		}
+
+		public static string ToWcfJsonDateTimeOffset(DateTimeOffset dateTimeOffset)
+		{
+			if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
+			{
+				return dateTimeOffset.ToString("o", CultureInfo.InvariantCulture);
+			}
+
+			var timestamp = dateTimeOffset.DateTime.ToUnixTimeMs();
+			var offset = dateTimeOffset.Offset == TimeSpan.Zero
+				? string.Empty
+				: dateTimeOffset.Offset.ToTimeOffsetString();
+
+			return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;
+		}
 	}
 }
diff --git a/src/ServiceStack.Text/Common/DeserializeBuiltin.cs b/src/ServiceStack.Text/Common/DeserializeBuiltin.cs
@@ -54,6 +54,8 @@ private static ParseStringDelegate GetParseFn()
 				return value => new Guid(value);
 			if (typeof(T) == typeof(DateTime) || typeof(T) == typeof(DateTime?))
 				return value => DateTimeSerializer.ParseShortestXsdDateTime(value);
+			if (typeof(T) == typeof(DateTimeOffset) || typeof(T) == typeof(DateTimeOffset?))
+				return value => DateTimeSerializer.ParseDateTimeOffset(value);
 			if (typeof(T) == typeof(TimeSpan))
 				return value => TimeSpan.Parse(value);
 #if !MONOTOUCH && !SILVERLIGHT && !XBOX

diff --git a/src/ServiceStack.Text/Common/ITypeSerializer.cs b/src/ServiceStack.Text/Common/ITypeSerializer.cs
@@ -21,6 +21,8 @@ internal interface ITypeSerializer
 		void WriteString(TextWriter writer, string value);
 		void WriteDateTime(TextWriter writer, object oDateTime);
 		void WriteNullableDateTime(TextWriter writer, object dateTime);
+		void WriteDateTimeOffset(TextWriter writer, object oDateTimeOffset);
+		void WriteNullableDateTimeOffset(TextWriter writer, object dateTimeOffset);
 		void WriteGuid(TextWriter writer, object oValue);
 		void WriteNullableGuid(TextWriter writer, object oValue);
 		void WriteBytes(TextWriter writer, object oByteValue);

diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -165,6 +165,12 @@ public WriteObjectDelegate GetValueTypeToStringMethod(Type type)
             if (type == typeof(DateTime?))
                 return Serializer.WriteNullableDateTime;
 
+			if (type == typeof(DateTimeOffset))
+				return Serializer.WriteDateTimeOffset;
+
+			if (type == typeof(DateTimeOffset?))
+				return Serializer.WriteNullableDateTimeOffset;
+
             if (type == typeof(Guid))
                 return Serializer.WriteGuid;
 

diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -113,6 +113,19 @@ public void WriteNullableDateTime(TextWriter writer, object dateTime)
 				WriteDateTime(writer, dateTime);
 		}
 
+		public void WriteDateTimeOffset(TextWriter writer, object oDateTimeOffset)
+		{
+			WriteRawString(writer, DateTimeSerializer.ToWcfJsonDateTimeOffset((DateTimeOffset)oDateTimeOffset));
+		}
+
+		public void WriteNullableDateTimeOffset(TextWriter writer, object dateTimeOffset)
+		{
+			if (dateTimeOffset == null)
+				writer.Write(JsonUtils.Null);
+			else
+				WriteDateTimeOffset(writer, dateTimeOffset);
+		}
+
 		public void WriteGuid(TextWriter writer, object oValue)
 		{
 			WriteRawString(writer, ((Guid)oValue).ToString("N"));

diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -86,6 +86,17 @@ public void WriteNullableDateTime(TextWriter writer, object dateTime)
 			writer.Write(DateTimeSerializer.ToShortestXsdDateTimeString((DateTime)dateTime));
 		}
 
+		public void WriteDateTimeOffset(TextWriter writer, object oDateTimeOffset)
+		{
+			writer.Write(((DateTimeOffset) oDateTimeOffset).ToString("o"));
+		}
+
+		public void WriteNullableDateTimeOffset(TextWriter writer, object dateTimeOffset)
+		{
+			if (dateTimeOffset == null) return;
+			this.WriteDateTimeOffset(writer, dateTimeOffset);
+		}
+
 		public void WriteGuid(TextWriter writer, object oValue)
 		{
 			writer.Write(((Guid)oValue).ToString("N"));

diff --git a/tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs
@@ -191,7 +191,7 @@ public void Can_serialize_json_date_iso8601_utc()
 			var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Utc);
 			var ssJson = JsonSerializer.SerializeToString(dateTime);
 
-			Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000Z)\/"""));
+			Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000Z"""));
 			JsConfig.Reset();
 		}
 
@@ -206,7 +206,7 @@ public void Can_serialize_json_date_iso8601_local()
 			var offsetSpan = TimeZoneInfo.Local.GetUtcOffset(dateTime);
 			var offset = offsetSpan.ToTimeOffsetString(true);
 
-			Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000" + offset + @")\/"""));
+			Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000" + offset + @""""));
 			JsConfig.Reset();
 		}
 
@@ -218,7 +218,7 @@ public void Can_serialize_json_date_iso8601_unspecified()
 			var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Unspecified);
 			var ssJson = JsonSerializer.SerializeToString(dateTime);
 
-			Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000)\/"""));
+			Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000"""));
 			JsConfig.Reset();
 		}
 
@@ -227,7 +227,7 @@ public void Can_deserialize_json_date_iso8601_withZOffset_asUtc()
 		{
 			JsConfig.DateHandler = JsonDateHandler.ISO8601;
 
-			const string json = @"""\/Date(1994-11-24T12:34:56Z)\/""";
+			const string json = @"""1994-11-24T12:34:56Z""";
 			var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
 
 			var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Utc);
@@ -241,7 +241,7 @@ public void Can_deserialize_json_date_iso8601_withoutOffset_asUnspecified()
 		{
 			JsConfig.DateHandler = JsonDateHandler.ISO8601;
 
-			const string json = @"""\/Date(1994-11-24T12:34:56)\/""";
+			const string json = @"""1994-11-24T12:34:56""";
 			var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
 
 			var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Unspecified);
@@ -258,7 +258,7 @@ public void Can_deserialize_json_date_iso8601_withOffset_asLocal()
 			var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Local);
 			var offset = TimeZoneInfo.Local.GetUtcOffset(dateTime).ToTimeOffsetString(true);
 
-			var json = @"""\/Date(1994-11-24T12:34:56" + offset + @")\/""";
+			var json = @"""1994-11-24T12:34:56" + offset + @"""";
 			var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
 
 
@@ -267,6 +267,72 @@ public void Can_deserialize_json_date_iso8601_withOffset_asLocal()
 			JsConfig.Reset();
 		}
 
+		#endregion
+
+		#region ISO-8601 TimeStampOffset Tests
+		[Test]
+		public void Can_serialize_json_datetimeoffset_iso8601_utc()
+		{
+			JsConfig.DateHandler = JsonDateHandler.ISO8601;
+
+			var dateTimeOffset = new DateTimeOffset(1994, 11, 24, 12, 34, 56, TimeSpan.Zero);
+			var ssJson = JsonSerializer.SerializeToString(dateTimeOffset);
+
+			Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000+00:00"""));
+			JsConfig.Reset();
+		}
+
+		[Test]
+		public void Can_serialize_json_datetimeoffset_iso8601_specified()
+		{
+			JsConfig.DateHandler = JsonDateHandler.ISO8601;
+
+			var dateTimeOffset = new DateTimeOffset(1994, 11, 24, 12, 34, 56, TimeSpan.FromHours(-7));
+			var ssJson = JsonSerializer.SerializeToString(dateTimeOffset);
+
+			Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000-07:00"""));
+			JsConfig.Reset();
+		}
+
+		[Test]
+		public void Can_deserialize_json_datetimeoffset_iso8601_withZOffset_asUtc()
+		{
+			JsConfig.DateHandler = JsonDateHandler.ISO8601;
+
+			const string json = @"""1994-11-24T12:34:56Z""";
+			var fromJson = JsonSerializer.DeserializeFromString<DateTimeOffset>(json);
+
+			var dateTimeOffset = new DateTimeOffset(1994, 11, 24, 12, 34, 56, TimeSpan.Zero);
+			Assert.That(fromJson, Is.EqualTo(dateTimeOffset));
+			JsConfig.Reset();
+		}
+
+		[Test]
+		public void Can_deserialize_json_datetimeoffset_iso8601_withoutOffset_asUtc()
+		{
+			JsConfig.DateHandler = JsonDateHandler.ISO8601;
+
+			const string json = @"""1994-11-24T12:34:56""";
+			var fromJson = JsonSerializer.DeserializeFromString<DateTimeOffset>(json);
+
+			var dateTimeOffset = new DateTimeOffset(1994, 11, 24, 12, 34, 56, TimeSpan.Zero);
+			Assert.That(fromJson, Is.EqualTo(dateTimeOffset));
+			JsConfig.Reset();
+		}
+
+		[Test]
+		public void Can_deserialize_json_datetimeoffset_iso8601_withOffset_asSpecified()
+		{
+			JsConfig.DateHandler = JsonDateHandler.ISO8601;
+
+			var dateTimeOffset = new DateTimeOffset(1994, 11, 24, 12, 34, 56, TimeSpan.FromHours(-7));
+
+			const string json = @"""1994-11-24T12:34:56-07:00""";
+			var fromJson = JsonSerializer.DeserializeFromString<DateTimeOffset>(json);
+
+			Assert.That(fromJson, Is.EqualTo(dateTimeOffset));
+			JsConfig.Reset();
+		}
 		#endregion
 	}
 }