-Added deserialize test for jagged arrays

-Made deserializer ignore missing members by default

Src/Doc/SerializingJSON.html

@@ -83,7 +83,7 @@
     serialize.</p>
     <h5>MissingMemberHandling</h5>
 <p>Controls how missing members (e.g. JSON contains a property that isn&#39;t a member 
-    on the object) are handled during deserialization. Error or ignore.</p>
+    on the object) are handled during deserialization. Ignore or error.</p>
     <h5>NullValueHandling</h5>
 <p>Controls how null values are handled during serialization and deserialization. 
     Include or ignore.</p>

Src/Newtonsoft.Json.Tests/JsonSerializerTest.cs

@@ -424,7 +424,7 @@ keyword such as type of business.""
       //  ]
       //}
 
-      ProductShort deserializedProductShort = (ProductShort)JsonConvert.DeserializeObject(output, typeof(ProductShort));
+      ProductShort deserializedProductShort = (ProductShort)JsonConvert.DeserializeObject(output, typeof(ProductShort), new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Error });
     }
 
     [Test]
@@ -1030,7 +1030,7 @@ keyword such as type of business.""
     {
       string json = @"{""Missing"":1}";
 
-      JsonConvert.DeserializeObject<DoubleClass>(json);
+      JsonConvert.DeserializeObject<DoubleClass>(json, new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Error });
     }
 
     [Test]
@@ -1081,5 +1081,149 @@ keyword such as type of business.""
 
       JsonConvert.DeserializeObject<RequiredMembersClass>(json);
     }
+
+    [Test]
+    public void SerializeJaggedArray()
+    {
+      JaggedArray aa = new JaggedArray();
+      aa.Before = "Before!";
+      aa.After = "After!";
+      aa.Coordinates = new[] { new[] { 1, 1 }, new[] { 1, 2 }, new[] { 2, 1 }, new[] { 2, 2 } };
+
+      string json = JsonConvert.SerializeObject(aa);
+
+      Assert.AreEqual(@"{""Before"":""Before!"",""Coordinates"":[[1,1],[1,2],[2,1],[2,2]],""After"":""After!""}", json);
+    }
+
+    [Test]
+    public void DeserializeJaggedArray()
+    {
+      string json = @"{""Before"":""Before!"",""Coordinates"":[[1,1],[1,2],[2,1],[2,2]],""After"":""After!""}";
+
+      JaggedArray aa = JsonConvert.DeserializeObject<JaggedArray>(json);
+
+      Assert.AreEqual("Before!", aa.Before);
+      Assert.AreEqual("After!", aa.After);
+      Assert.AreEqual(4, aa.Coordinates.Length);
+      Assert.AreEqual(2, aa.Coordinates[0].Length);
+      Assert.AreEqual(1, aa.Coordinates[0][0]);
+      Assert.AreEqual(2, aa.Coordinates[1][1]);
+
+      string after = JsonConvert.SerializeObject(aa);
+
+      Assert.AreEqual(json, after);
+    }
+
+    public class GoogleMapGeocoderStructure
+    {
+      public string Name;
+      public Status Status;
+      public List<Placemark> Placemark;
+    }
+
+    public class Status
+    {
+      public string Request;
+      public string Code;
+    }
+
+    public class Placemark
+    {
+      public string Address;
+      public AddressDetails AddressDetails;
+      public Point Point;
+    }
+
+    public class AddressDetails
+    {
+      public int Accuracy;
+      public Country Country;
+    }
+
+    public class Country
+    {
+      public string CountryNameCode;
+      public AdministrativeArea AdministrativeArea;
+    }
+
+    public class AdministrativeArea
+    {
+      public string AdministrativeAreaName;
+      public SubAdministrativeArea SubAdministrativeArea;
+    }
+
+    public class SubAdministrativeArea
+    {
+      public string SubAdministrativeAreaName;
+      public Locality Locality;
+    }
+
+    public class Locality
+    {
+      public string LocalityName;
+      public Thoroughfare Thoroughfare;
+      public PostalCode PostalCode;
+    }
+
+    public class Thoroughfare
+    {
+      public string ThoroughfareName;
+    }
+
+    public class PostalCode
+    {
+      public string PostalCodeNumber;
+    }
+
+    public class Point
+    {
+      public List<decimal> Coordinates;
+    }
+
+    [Test]
+    public  void DeserializeGoogleGeoCode()
+    {
+      string json = @"{
+  ""name"": ""1600 Amphitheatre Parkway, Mountain View, CA, USA"",
+  ""Status"": {
+    ""code"": 200,
+    ""request"": ""geocode""
+  },
+  ""Placemark"": [
+    {
+      ""address"": ""1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA"",
+      ""AddressDetails"": {
+        ""Country"": {
+          ""CountryNameCode"": ""US"",
+          ""AdministrativeArea"": {
+            ""AdministrativeAreaName"": ""CA"",
+            ""SubAdministrativeArea"": {
+              ""SubAdministrativeAreaName"": ""Santa Clara"",
+              ""Locality"": {
+                ""LocalityName"": ""Mountain View"",
+                ""Thoroughfare"": {
+                  ""ThoroughfareName"": ""1600 Amphitheatre Pkwy""
+                },
+                ""PostalCode"": {
+                  ""PostalCodeNumber"": ""94043""
+                }
+              }
+            }
+          }
+        },
+        ""Accuracy"": 8
+      },
+      ""Point"": {
+        ""coordinates"": [-122.083739, 37.423021, 0]
+      }
+    }
+  ]
+}";
+
+      //JavaScriptSerializer serializer = new JavaScriptSerializer();
+      //GoogleMapGeocoderStructure jsonGoogleMapGeocoder = serializer.Deserialize<GoogleMapGeocoderStructure>(json);
+
+      GoogleMapGeocoderStructure jsonGoogleMapGeocoder = JsonConvert.DeserializeObject<GoogleMapGeocoderStructure>(json);
+    }
   }
 }

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Compact.csproj

@@ -78,6 +78,7 @@
     <Compile Include="TestObjects\GetOnlyPropertyClass.cs" />
     <Compile Include="TestObjects\IncompatibleJsonAttributeClass.cs" />
     <Compile Include="TestObjects\Invoice.cs" />
+    <Compile Include="TestObjects\JaggedArray.cs" />
     <Compile Include="TestObjects\JsonIgnoreAttributeTestClass.cs" />
     <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\MethodExecutorObject.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj

@@ -83,6 +83,7 @@
     <Compile Include="TestObjects\GetOnlyPropertyClass.cs" />
     <Compile Include="TestObjects\IncompatibleJsonAttributeClass.cs" />
     <Compile Include="TestObjects\Invoice.cs" />
+    <Compile Include="TestObjects\JaggedArray.cs" />
     <Compile Include="TestObjects\JsonIgnoreAttributeTestClass.cs" />
     <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\MethodExecutorObject.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj

@@ -100,6 +100,7 @@
     <Compile Include="TestObjects\JsonIgnoreAttributeTestClass.cs" />
     <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\MethodExecutorObject.cs" />
+    <Compile Include="TestObjects\JaggedArray.cs" />
     <Compile Include="TestObjects\MyClass.cs" />
     <Compile Include="TestObjects\Name.cs" />
     <Compile Include="TestObjects\PersonRaw.cs" />

Src/Newtonsoft.Json.Tests/TestObjects/JaggedArray.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Newtonsoft.Json.Tests.TestObjects
+{
+  public class JaggedArray
+  {
+    public string Before { get; set; }
+    public int[][] Coordinates { get; set; }
+    public string After { get; set; }
+  }
+}

Src/Newtonsoft.Json/JsonConvert.cs

@@ -529,7 +529,7 @@ namespace Newtonsoft.Json
     /// <returns>The deserialized object from the Json string.</returns>
     public static T DeserializeObject<T>(string value)
     {
-      return DeserializeObject<T>(value, null);
+      return DeserializeObject<T>(value, (JsonSerializerSettings)null);
     }
 
     /// <summary>
@@ -560,6 +560,21 @@ namespace Newtonsoft.Json
       return (T)DeserializeObject(value, typeof(T), converters);
     }
 
+    /// <summary>
+    /// Deserializes the JSON string to the specified type.
+    /// </summary>
+    /// <typeparam name="T">The type of the object to deserialize.</typeparam>
+    /// <param name="value">The object to deserialize.</param>
+    /// <param name="settings">
+    /// The <see cref="JsonSerializerSettings"/> used to deserialize the object.
+    /// If this is null, default serialization settings will be is used.
+    /// </param>
+    /// <returns>The deserialized object from the JSON string.</returns>
+    public static T DeserializeObject<T>(string value, JsonSerializerSettings settings)
+    {
+      return (T)DeserializeObject(value, typeof(T), settings);
+    }
+
     /// <summary>
     /// Deserializes the JSON string to the specified type.
     /// </summary>

Src/Newtonsoft.Json/JsonSerializer.cs

@@ -77,7 +77,7 @@ namespace Newtonsoft.Json
       get { return _missingMemberHandling; }
       set
       {
-        if (value < MissingMemberHandling.Error || value > MissingMemberHandling.Ignore)
+        if (value < MissingMemberHandling.Ignore || value > MissingMemberHandling.Error)
           throw new ArgumentOutOfRangeException("value");
 
         _missingMemberHandling = value;

Src/Newtonsoft.Json/JsonSerializerSettings.cs

@@ -12,7 +12,7 @@ namespace Newtonsoft.Json
   public class JsonSerializerSettings
   {
     internal const ReferenceLoopHandling DefaultReferenceLoopHandling = ReferenceLoopHandling.Error;
-    internal const MissingMemberHandling DefaultMissingMemberHandling = MissingMemberHandling.Error;
+    internal const MissingMemberHandling DefaultMissingMemberHandling = MissingMemberHandling.Ignore;
     internal const NullValueHandling DefaultNullValueHandling = NullValueHandling.Include;
     internal const DefaultValueHandling DefaultDefaultValueHandling = DefaultValueHandling.Include;
     internal const ObjectCreationHandling DefaultObjectCreationHandling = ObjectCreationHandling.Auto;

Src/Newtonsoft.Json/MissingMemberHandling.cs

@@ -34,13 +34,13 @@ namespace Newtonsoft.Json
   /// </summary>
   public enum MissingMemberHandling
   {
-    /// <summary>
-    /// Throw a <see cref="JsonSerializationException"/> when a missing member is encountered during deserialization.
-    /// </summary>
-    Error = 0,
     /// <summary>
     /// Ignore a missing member and do not attempt to deserialize it.
     /// </summary>
-    Ignore = 1
+    Ignore = 0,
+    /// <summary>
+    /// Throw a <see cref="JsonSerializationException"/> when a missing member is encountered during deserialization.
+    /// </summary>
+    Error = 1
   }
 }