Merge pull request #40 from ranrav/master

Fix bug in JSON parsing when string value is a date

cs/src/json/expressions/json/SimpleJsonParser.cs

@@ -121,10 +121,11 @@ namespace Bond.Expressions.Json
                 convertedValue = Reader.Value;
             }
             
-            var errorMessage = string.Format(
-                CultureInfo.InvariantCulture,
-                "Invalid input, expected JSON token of type {0}",
-                scalarTokenType);
+            var errorMessage = 
+                StringExpression.Format(
+                    "Invalid input, expected JSON token of type {0}, encountered {1}",
+                    Expression.Constant(scalarTokenType, typeof(object)),
+                    Expression.Convert(Reader.TokenType, typeof(object)));
 
             return
                 Expression.Block(
@@ -197,16 +198,21 @@ namespace Bond.Expressions.Json
                     Expression.Convert(Reader.LinePosition, typeof(object))));
         }
 
-        Expression ThrowUnexpectedInput(string errorMessage)
+        Expression ThrowUnexpectedInput(Expression errorMessage)
         {
             return ThrowExpression.InvalidDataException(
                 StringExpression.Format(
                     "{0} (line {1} position {2})",
-                    Expression.Constant(errorMessage),
+                    errorMessage,
                     Expression.Convert(Reader.LineNumber, typeof(object)),
                     Expression.Convert(Reader.LinePosition, typeof(object))));
         }
 
+        Expression ThrowUnexpectedInput(string errorMessage)
+        {
+            return ThrowUnexpectedInput(Expression.Constant(errorMessage));
+        }
+
         Expression ProcessField(ParameterExpression requiredFields, IEnumerable<TransformSchemaPair> transforms)
         {
             // unknown fields are skipped (read past the unknown PropertyName then skip the value)

cs/src/json/protocols/SimpleJsonReader.cs

@@ -20,6 +20,9 @@ namespace Bond.Protocols
         public SimpleJsonReader(TextReader reader)
         {
             this.reader = new JsonTextReader(reader);
+            this.reader.DateParseHandling = DateParseHandling.None;
+            this.reader.FloatParseHandling = FloatParseHandling.Double;
+
             eof = false;
         }
 

cs/test/core/JsonParsingTests.cs

@@ -2,13 +2,10 @@
 {
     using System;
     using System.IO;
-
     using Bond;
     using Bond.Protocols;
-
-    using NUnit.Framework;
-
     using Newtonsoft.Json;
+    using NUnit.Framework;
 
     [TestFixture]
     public class JsonParsingTests
@@ -681,6 +678,16 @@ World", target._str);
             Assert.AreEqual(11, target.nb.Array[target.nb.Offset + 1]);
             
         }
+        
+        [Test]
+        public void JsonParsing_DateAsString()
+        {
+            const string json = @"{""value"":""2015-02-26T13:18:13.1521765-08:00""}";
+
+            var target = ParseJson<Box<string>>(json);
+
+            Assert.AreEqual("2015-02-26T13:18:13.1521765-08:00", target.value);
+        }
 
         private static T ParseJson<T>(string json) where T : new()
         {

cs/test/core/UnitTest.bond

@@ -652,6 +652,7 @@ struct IdAttribute
 {
     0: TypeAttribute field = DefaultAttribute;
 }
+
 struct classT {}
 struct structT {}
 struct GenericConflict<structT : value>