[jayrock] push by azizatif - Modify DateTimeImporter to accept the 'Z'ulu (UTC) character in the ti... on 2013-10-30 17:17 GMT

[jay...@googlecode.com]

Revision: 533260cc34c2
Branch: default
Author: Pavlos Touboulidis <p...@pav.gr>
Date: Fri Oct 25 11:15:28 2013 UTC
Log: Modify DateTimeImporter to accept the 'Z'ulu (UTC) character in
the timezone specifier (fixes issue #54)
http://code.google.com/p/jayrock/source/detail?r=533260cc34c2

Modified:
/src/Jayrock.Json/AssemblyInfo.cs
/src/Jayrock.Json/Json/Conversion/Converters/DateTimeImporter.cs
/tests/Jayrock/Json/Conversion/Converters/TestDateTimeImporter.cs

=======================================
--- /src/Jayrock.Json/AssemblyInfo.cs Fri Apr 15 23:09:54 2011 UTC
+++ /src/Jayrock.Json/AssemblyInfo.cs Fri Oct 25 11:15:28 2013 UTC
@@ -34,4 +34,4 @@
// Version information
//

-[assembly: AssemblyFileVersion("0.9.13422.2206")]
+[assembly: AssemblyFileVersion("0.9.16530.1709")]
=======================================
--- /src/Jayrock.Json/Json/Conversion/Converters/DateTimeImporter.cs Wed
Apr 20 01:03:10 2011 UTC
+++ /src/Jayrock.Json/Json/Conversion/Converters/DateTimeImporter.cs Fri
Oct 25 11:15:28 2013 UTC
@@ -35,17 +35,17 @@
{
private static readonly string[] _formats = new string[]
{
- "yyyy-MM-dd'T'HH:mm:ss.fffffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.ffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.fffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.ffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.fzzz",
- "yyyy-MM-dd'T'HH:mm:sszzz",
- "yyyy-MM-dd'T'HH:mm:ss.fffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.ffffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.ffffffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.fffffffffzzz",
- "yyyy-MM-dd'T'HH:mm:ss.ffffffffffzzz",
+ "yyyy-MM-dd'T'HH:mm:ss.fffffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.ffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.fffK",
+ "yyyy-MM-dd'T'HH:mm:ss.ffK",
+ "yyyy-MM-dd'T'HH:mm:ss.fK",
+ "yyyy-MM-dd'T'HH:mm:ssK",
+ "yyyy-MM-dd'T'HH:mm:ss.fffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.ffffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.ffffffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.fffffffffK",
+ "yyyy-MM-dd'T'HH:mm:ss.ffffffffffK",
"yyyy-MM-dd",
};

=======================================
--- /tests/Jayrock/Json/Conversion/Converters/TestDateTimeImporter.cs Mon
Apr 18 22:42:09 2011 UTC
+++ /tests/Jayrock/Json/Conversion/Converters/TestDateTimeImporter.cs Fri
Oct 25 11:15:28 2013 UTC
@@ -131,6 +131,13 @@
{
Import(@"'\/Date(9999999999999999999)\/'");
}
+
+ [Test(Description =
@"http://code.google.com/p/jayrock/issues/detail?id=54")]
+ public void ImportZulu()
+ {
+ var time =
JsonConvert.Import<DateTime>("'2013-10-29T11:04:09.144Z'").ToUniversalTime();
+ Assert.AreEqual(new DateTime(2013, 10, 29, 11, 04, 09, 144),
time);
+ }

private static void AssertImport(DateTime expected, string input)
{