looking at doing a simple deserialization if RFC1123 datetime

Dom · Dom · commit 027469500056 · 2013-11-12T15:12:52.000Z
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -63,6 +63,11 @@ private static DateTime Prepare(this DateTime dateTime, bool parsedAsUtc=false)
             return ParseShortestXsdDateTime(dateTimeStr);
         }
 
+        public static DateTime ParseRFC1123DateTime(string dateTimeStr)
+        {
+            return DateTime.ParseExact(dateTimeStr, "r", CultureInfo.InvariantCulture);
+        }
+
         public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
         {
             if (string.IsNullOrEmpty(dateTimeStr))
diff --git a/src/ServiceStack.Text/Common/DeserializeType.cs b/src/ServiceStack.Text/Common/DeserializeType.cs
@@ -147,6 +147,16 @@ public static object ParseQuotedPrimitive(string value)
                 }
             }
 
+            if (JsConfig.DateHandler == JsonDateHandler.RFC1123)
+            {
+                // check that we have RFC1123 date:
+                // ddd, dd MMM yyyy HH:mm:ss GMT
+                if (value.Length == 29 && (value.EndsWithInvariant("GMT")))
+                {
+                    return DateTimeSerializer.ParseRFC1123DateTime(value);
+                }
+            }
+
             return Serializer.UnescapeString(value);
         }
 
diff --git a/tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs
@@ -524,6 +524,35 @@ public void Can_serialize_json_date_rfc1123_unspecified()
             JsConfig.Reset();
         }
 
+        [Test]
+        public void Can_deserialize_json_date_rfc1123_local()
+        {
+            JsConfig.DateHandler = JsonDateHandler.RFC1123;
+
+            const string json = @"""Tue, 12 Nov 2013 14:32:07 GMT""";
+            var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
+
+            var dateTime = new DateTime(2013, 11, 12, 14, 32, 07, DateTimeKind.Local);
+            Assert.That(fromJson, Is.EqualTo(dateTime));
+            Assert.That(fromJson.Kind, Is.EqualTo(dateTime.Kind));
+            JsConfig.Reset();
+        }
+
+        [Test]
+        public void Can_deserialize_json_date_rfc1123_always_utc()
+        {
+            JsConfig.AlwaysUseUtc = true;
+            JsConfig.DateHandler = JsonDateHandler.RFC1123;
+
+            const string json = @"""Tue, 12 Nov 2013 14:32:07 GMT""";
+            var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
+
+            var dateTime = new DateTime(2013, 11, 12, 14, 32, 07, DateTimeKind.Utc);
+            Assert.That(fromJson, Is.EqualTo(dateTime));
+            Assert.That(fromJson.Kind, Is.EqualTo(dateTime.Kind));
+            JsConfig.Reset();
+        }
+
         #endregion
 
         #region InteropTests
diff --git a/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs b/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs
@@ -105,6 +105,13 @@ public void ParseShortestXsdDateTime_works()
 			Assert.That (shortDate, Is.EqualTo(new DateTime (2011, 9, 4)), "Day without leading 0");
 		}
 
+        [Test]
+        public void ParseRFC1123DateTime_works()
+        {
+            DateTime rfc1123Date = DateTimeSerializer.ParseRFC1123DateTime("Tue, 12 Nov 2013 14:32:07 GMT");
+            Assert.That(rfc1123Date, Is.EqualTo(new DateTime(2013, 11, 12, 14,32,07)));
+        }
+
 		[Test]
 		public void TestSqlServerDateTime()
 		{

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ private static DateTime Prepare(this DateTime dateTime, bool parsedAsUtc=false)`
`63`	`63`	`return ParseShortestXsdDateTime(dateTimeStr);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public static DateTime ParseRFC1123DateTime(string dateTimeStr)`
	`67`	`+ {`
	`68`	`+ return DateTime.ParseExact(dateTimeStr, "r", CultureInfo.InvariantCulture);`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`public static DateTime ParseShortestXsdDateTime(string dateTimeStr)`
`67`	`72`	`{`
`68`	`73`	`if (string.IsNullOrEmpty(dateTimeStr))`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,16 @@ public static object ParseQuotedPrimitive(string value)`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
	`150`	`+ if (JsConfig.DateHandler == JsonDateHandler.RFC1123)`
	`151`	`+ {`
	`152`	`+ // check that we have RFC1123 date:`
	`153`	`+ // ddd, dd MMM yyyy HH:mm:ss GMT`
	`154`	`+ if (value.Length == 29 && (value.EndsWithInvariant("GMT")))`
	`155`	`+ {`
	`156`	`+ return DateTimeSerializer.ParseRFC1123DateTime(value);`
	`157`	`+ }`
	`158`	`+ }`
	`159`	`+`
`150`	`160`	`return Serializer.UnescapeString(value);`
`151`	`161`	`}`
`152`	`162`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,13 @@ public void ParseShortestXsdDateTime_works()`
`105`	`105`	`Assert.That (shortDate, Is.EqualTo(new DateTime (2011, 9, 4)), "Day without leading 0");`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ [Test]`
	`109`	`+ public void ParseRFC1123DateTime_works()`
	`110`	`+ {`
	`111`	`+ DateTime rfc1123Date = DateTimeSerializer.ParseRFC1123DateTime("Tue, 12 Nov 2013 14:32:07 GMT");`
	`112`	`+ Assert.That(rfc1123Date, Is.EqualTo(new DateTime(2013, 11, 12, 14,32,07)));`
	`113`	`+ }`
	`114`	`+`
`108`	`115`	`[Test]`
`109`	`116`	`public void TestSqlServerDateTime()`
`110`	`117`	`{`