Json.NET 2.0 Beta

New feature - LINQ to JSON!
New feature - Ability to specify how JsonSerializer handles null values when serializing/deserializing.
New feature - Ability to specify how JsonSerializer handles missing values when deserializing.
Change - Improved support for reading and writing JavaScript constructors.
Change - A new JsonWriter can now write additional tokens without erroring.
Bug fix - JsonSerializer handles deserializing dictionaries where the key isn't a string.
Bug fix - JsonReader now correctly parses hex character codes.
This commit is contained in:
JamesNK
2008-02-10 10:56:19 +00:00
parent 487dc81251
commit c1ce4c366f
30 changed files with 2626 additions and 152 deletions
+133
View File
@@ -0,0 +1,133 @@
#region License
// Copyright (c) 2007 James Newton-King
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Linq
{
public class JObject : JContainer
{
public JObject()
{
}
public JObject(params object[] content) : this((object)content)
{
}
public JObject(object content)
{
Add(content);
}
public override JsonTokenType Type
{
get { return JsonTokenType.Object; }
}
public IEnumerable<JProperty> Properties()
{
return Children().Cast<JProperty>();
}
public JProperty Property(string name)
{
return Properties()
.Where(p => string.Compare(p.Name, name, StringComparison.Ordinal) == 0)
.SingleOrDefault();
}
public IEnumerable<JToken> PropertyValues()
{
return Properties().Select(p => p.Value);
}
public T PropertyValue<T>(string name)
{
JProperty property = Property(name);
if (property == null)
throw new Exception(string.Format("Property '{0}' does not exist in JSON object.", name));
// HACK
return Extensions.Convert<JToken, T>(property.Value);
}
public static JObject Load(JsonReader reader)
{
if (reader.TokenType == JsonToken.None)
{
if (!reader.Read())
throw new Exception("Error reading JObject from JsonReader.");
}
if (reader.TokenType != JsonToken.StartObject)
{
throw new Exception("Current JsonReader item is not an object.");
}
else
{
if (!reader.Read())
throw new Exception("Error reading JObject from JsonReader.");
}
JObject o = new JObject();
o.ReadContentFrom(reader);
return o;
}
public static JObject Parse(string json)
{
JsonReader jsonReader = new JsonReader(new StringReader(json));
return Load(jsonReader);
}
internal override void ValidateObject(JToken o, JToken previous)
{
ValidationUtils.ArgumentNotNull(o, "o");
if (o.Type != JsonTokenType.Property)
throw new ArgumentException(string.Format("An item of type {0} cannot be added to content.", o.Type));
}
public override void WriteTo(JsonWriter writer)
{
writer.WriteStartObject();
foreach (JProperty property in Properties())
{
property.WriteTo(writer);
}
writer.WriteEndObject();
}
}
}