Merge branch 'release/0.14.0'

* release/0.14.0:
  Fix package license warning
  Fix DateTimeOffset support.
  Added the ability to remove elements from JsonData objects as well as JsonData arrays.
  Fixed csproj casing

build.cake

@@ -18,6 +18,8 @@ string version = null,
  semVersion = null,
  milestone = null;
 
+FilePath litjsonProjectPath = "./src/LitJson/LitJSON.csproj";
+
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////
@@ -129,17 +131,17 @@ Task("Test-SourceLink")
  .IsDependentOn("Build")
  .WithCriteria(IsRunningOnWindows())
  .Does(() => {
- foreach(var asssembly in GetFiles("./src/LitJSON/bin/" + configuration + "/**/*.dll"))
+ foreach(var asssembly in GetFiles("./src/LitJson/bin/" + configuration + "/**/*.dll"))
  {
- DotNetCoreTool("./src/LitJSON/LitJSON.csproj", "sourcelink", $"test {asssembly}");
+ DotNetCoreTool(litjsonProjectPath.FullPath, "sourcelink", $"test {asssembly}");
  }
 });
 
 Task("Package")
  .IsDependentOn("Test")
  .IsDependentOn("Test-SourceLink")
  .Does(() => {
- DotNetCorePack("./src/LitJSON/LitJSON.csproj",
+ DotNetCorePack(litjsonProjectPath.FullPath,
  new DotNetCorePackSettings {
  Configuration = configuration,
  NoBuild = true,

src/LitJson/JsonData.cs

@@ -819,6 +819,25 @@ public int Add (object value)
  return EnsureList ().Add (data);
  }
 
+ public bool Remove(object obj)
+ {
+ json = null;
+ if(IsObject)
+ {
+ JsonData value = null;
+ if (inst_object.TryGetValue((string)obj, out value))
+ return inst_object.Remove((string)obj) && object_list.Remove(new KeyValuePair<string, JsonData>((string)obj, value));
+ else
+ throw new KeyNotFoundException("The specified key was not found in the JsonData object.");
+ }
+ if(IsArray)
+ {
+ return inst_array.Remove(ToJsonData(obj));
+ }
+ throw new InvalidOperationException (
+ "Instance of JsonData is not an object or a list.");
+ }
+
  public void Clear ()
  {
  if (IsObject) {

src/LitJson/JsonMapper.cs

@@ -603,6 +603,11 @@ private static void RegisterBaseExporters ()
  delegate (object obj, JsonWriter writer) {
  writer.Write ((ulong) obj);
  };
+
+ base_exporters_table[typeof(DateTimeOffset)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write(((DateTimeOffset)obj).ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz", datetime_format));
+ };
  }
 
  private static void RegisterBaseImporters ()

src/LitJson/LitJSON.csproj

@@ -23,7 +23,7 @@ It's quick and lean, without external dependencies.</Description>
  <Copyright>The authors disclaim copyright to this source code.</Copyright>
  <Authors>Leonardo Boshell, Mattias Karlsson and contributors</Authors>
  <Company>Leonardo Boshell, Mattias Karlsson and contributors</Company>
- <PackageLicenseUrl>https://github.com/LitJSON/litjson/blob/develop/COPYING</PackageLicenseUrl>
+ <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
  <PackageIconUrl>https://litjson.net/assets/img/logo.png</PackageIconUrl>
  <RepositoryUrl>https://github.com/LitJSON/litjson</RepositoryUrl>
  <RepositoryType>git</RepositoryType>

test/JsonDataTest.cs

@@ -231,6 +231,49 @@ public void NullValue ()
  Assert.AreEqual (json, data.ToJson ());
  }
 
+ [Test]
+ public void RemoveValueFromObject()
+ {
+ string json = "{\"test1\":1}";
+
+ JsonData data = new JsonData();
+ data["test1"] = 1;
+ data["test2"] = 2;
+ data.Remove("test2");
+
+ Assert.AreEqual(json, data.ToJson());
+ }
+
+ [Test]
+ public void RemoveValueFromNestedObject()
+ {
+ string json = "{\"test1\":{\"test3\":3}}";
+
+ JsonData data = new JsonData();
+ data["test1"] = new JsonData();
+ data["test1"]["test2"] = 2;
+ data["test1"]["test3"] = 3;
+ data["test1"].Remove("test2");
+
+ Assert.AreEqual(json, data.ToJson());
+ }
+
+ [Test]
+ public void RemoveValueFromArray()
+ {
+ string json = "[\"test1\",2.0]";
+
+ JsonData data = new JsonData();
+ data.Add("test1");
+ data.Add("test2");
+ data.Remove("test2");
+ data.Add(1);
+ data.Add(2.0);
+ data.Remove(1);
+
+ Assert.AreEqual(json, data.ToJson());
+ }
+
  [Test]
  public void PropertiesOrderTest ()
  {

test/JsonMapperTest.cs

@@ -162,15 +162,16 @@ public class UiWindow
 
  public class ValueTypesTest
  {
- public byte TestByte;
- public char TestChar;
- public DateTime TestDateTime;
- public decimal TestDecimal;
- public sbyte TestSByte;
- public short TestShort;
- public ushort TestUShort;
- public uint TestUInt;
- public ulong TestULong;
+ public byte TestByte;
+ public char TestChar;
+ public DateTime TestDateTime;
+ public decimal TestDecimal;
+ public sbyte TestSByte;
+ public short TestShort;
+ public ushort TestUShort;
+ public uint TestUInt;
+ public ulong TestULong;
+ public DateTimeOffset TestDateTimeOffset;
  }
 
  public class NullableTypesTest
@@ -399,13 +400,17 @@ public void ExportValueTypesTest ()
  test.TestUShort = 30000;
  test.TestUInt = 90000000;
  test.TestULong = 0xFFFFFFFFFFFFFFFF; // = =18446744073709551615
+ test.TestDateTimeOffset =
+ new DateTimeOffset(2019, 9, 18, 16, 47, 
+ 50, 123, TimeSpan.FromHours(8)).AddTicks(4567);
 
  string json = JsonMapper.ToJson (test);
  string expected =
  "{\"TestByte\":200,\"TestChar\":\"P\",\"TestDateTime\":" +
  "\"12/22/2012 00:00:00\",\"TestDecimal\":10.333," +
  "\"TestSByte\":-5,\"TestShort\":1024,\"TestUShort\":30000" +
- ",\"TestUInt\":90000000,\"TestULong\":18446744073709551615}";
+ ",\"TestUInt\":90000000,\"TestULong\":18446744073709551615" +
+ ",\"TestDateTimeOffset\":\"2019-09-18T16:47:50.1234567+08:00\"}";
 
  Assert.AreEqual (expected, json);
  }
@@ -825,15 +830,16 @@ public void ImportValueTypesTest ()
  {
  string json = @"
 {
- ""TestByte"": 200,
- ""TestChar"": 'P',
- ""TestDateTime"": ""12/22/2012 00:00:00"",
- ""TestDecimal"": 10.333,
- ""TestSByte"": -5,
- ""TestShort"": 1024,
- ""TestUShort"": 30000,
- ""TestUInt"": 90000000,
- ""TestULong"": 18446744073709551615
+ ""TestByte"": 200,
+ ""TestChar"": 'P',
+ ""TestDateTime"": ""12/22/2012 00:00:00"",
+ ""TestDecimal"": 10.333,
+ ""TestSByte"": -5,
+ ""TestShort"": 1024,
+ ""TestUShort"": 30000,
+ ""TestUInt"": 90000000,
+ ""TestULong"": 18446744073709551615,
+ ""TestDateTimeOffset"": ""2019-09-18T16:47:50.1234567+08:00""
 }";
 
  ValueTypesTest test = JsonMapper.ToObject<ValueTypesTest> (json);
@@ -848,6 +854,10 @@ public void ImportValueTypesTest ()
  Assert.AreEqual (30000, test.TestUShort, "A7");
  Assert.AreEqual (90000000, test.TestUInt, "A8");
  Assert.AreEqual (18446744073709551615L, test.TestULong, "A9");
+ Assert.AreEqual(
+ new DateTimeOffset(2019, 9, 18, 16, 47, 
+ 50, 123, TimeSpan.FromHours(8)).AddTicks(4567),
+ test.TestDateTimeOffset, "A10");
  }
 
  [Test]