Set version to 6.2.3-beta

CHANGELOG.md

@@ -1,6 +1,22 @@
 ArduinoJson: change log
 =======================
 
+v6.2.3-beta
+-----------
+
+* Fixed exception when using Flash strings as object keys (issue #784)
+
+v6.2.2-beta
+-----------
+
+* Fixed `invalid application of 'sizeof' to incomplete type '__FlashStringHelper'` (issue #783)
+* Fixed `char[]` not duplicated when passed to `JsonVariant::operator[]`
+
+v6.2.1-beta
+-----------
+
+* Fixed `JsonObject` not inserting keys of type `String` (issue #782)
+
 v6.2.0-beta
 -----------
 

README.md

@@ -2,7 +2,7 @@
 
 ---
 
-[![Build status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/master?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/master) [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=master)](https://travis-ci.org/bblanchon/ArduinoJson) [![Coverage Status](https://img.shields.io/coveralls/bblanchon/ArduinoJson.svg)](https://coveralls.io/r/bblanchon/ArduinoJson?branch=master) [![Star this project](http://githubbadges.com/star.svg?user=bblanchon&repo=ArduinoJson&style=flat&color=fff&background=007ec6)](https://github.com/bblanchon/ArduinoJson)
+[![Build status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=6.x)](https://travis-ci.org/bblanchon/ArduinoJson) [![Coverage Status](https://img.shields.io/coveralls/bblanchon/ArduinoJson.svg)](https://coveralls.io/r/bblanchon/ArduinoJson?branch=6.x) [![Star this project](http://githubbadges.com/star.svg?user=bblanchon&repo=ArduinoJson&style=flat&color=fff&background=007ec6)](https://github.com/bblanchon/ArduinoJson)
 
 ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 

library.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "6.2.0-beta",
+  "version": "6.2.3-beta",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoJson
-version=6.2.0-beta
+version=6.2.3-beta
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.

scripts/set-version.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -eux
+
+cd "$(dirname $0)/.."
+
+VERSION="$1"
+IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
+TAG="v$VERSION"
+UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))
+
+sed -i~ -bE "4s/HEAD/$TAG/; 5s/-+/$UNDERLINE/" CHANGELOG.md
+rm CHANGELOG.md*~
+sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
+rm library.json*~
+
+sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
+rm library.properties*~
+
+sed -i~ -bE \
+	-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
+	-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
+	-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
+	-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
+	src/ArduinoJson/version.hpp
+rm src/ArduinoJson/version.hpp*~

src/ArduinoJson/JsonObjectSubscript.hpp

@@ -111,17 +111,17 @@ inline typename enable_if<IsString<TString>::value,
 
 template <typename TImpl>
 template <typename TString>
-inline typename enable_if<IsString<const TString *>::value,
-                          JsonObjectSubscript<const TString *> >::type
-    JsonVariantSubscripts<TImpl>::operator[](const TString *key) {
+inline typename enable_if<IsString<TString *>::value,
+                          JsonObjectSubscript<TString *> >::type
+    JsonVariantSubscripts<TImpl>::operator[](TString *key) {
   return impl()->template as<JsonObject>()[key];
 }
 
 template <typename TImpl>
 template <typename TString>
 inline typename enable_if<IsString<TString *>::value,
-                          const JsonObjectSubscript<const TString *> >::type
-    JsonVariantSubscripts<TImpl>::operator[](const TString *key) const {
+                          const JsonObjectSubscript<TString *> >::type
+    JsonVariantSubscripts<TImpl>::operator[](TString *key) const {
   return impl()->template as<JsonObject>()[key];
 }
 

src/ArduinoJson/JsonVariantSubscripts.hpp

@@ -57,17 +57,16 @@ class JsonVariantSubscripts {
   // JsonObjectSubscript operator[](TKey);
   // TKey = const char*, const char[N], const FlashStringHelper*
   template <typename TString>
-  FORCE_INLINE typename enable_if<IsString<const TString *>::value,
-                                  JsonObjectSubscript<const TString *> >::type
-  operator[](const TString *key);
+  FORCE_INLINE typename enable_if<IsString<TString *>::value,
+                                  JsonObjectSubscript<TString *> >::type
+  operator[](TString *key);
   //
   // JsonObjectSubscript operator[](TKey);
   // TKey = const char*, const char[N], const FlashStringHelper*
   template <typename TString>
-  FORCE_INLINE
-      typename enable_if<IsString<TString *>::value,
-                         const JsonObjectSubscript<const TString *> >::type
-      operator[](const TString *key) const;
+  FORCE_INLINE typename enable_if<IsString<TString *>::value,
+                                  const JsonObjectSubscript<TString *> >::type
+  operator[](TString *key) const;
 
  private:
   const TImpl *impl() const {

src/ArduinoJson/Strings/ArduinoString.hpp

@@ -15,7 +15,7 @@ class ArduinoString {
 
   template <typename Buffer>
   const char* save(Buffer* buffer) const {
-    if (!_str->c_str()) return NULL;  // <- Arduino string can return NULL
+    if (is_null()) return NULL;
     size_t n = _str->length() + 1;
     void* dup = buffer->alloc(n);
     if (dup != NULL) memcpy(dup, _str->c_str(), n);
@@ -24,7 +24,7 @@ class ArduinoString {
 
   bool is_null() const {
     // Arduino's String::c_str() can return NULL
-    return _str->c_str();
+    return !_str->c_str();
   }
 
   bool equals(const char* expected) const {

src/ArduinoJson/Strings/FixedSizeFlashString.hpp

@@ -15,7 +15,7 @@ class FixedSizeFlashString {
   bool equals(const char* expected) const {
     const char* actual = reinterpret_cast<const char*>(_str);
     if (!actual || !expected) return actual == expected;
-    return strcmp_P(actual, expected) == 0;
+    return strncmp_P(expected, actual, _size) == 0;
   }
 
   bool is_null() const {

src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp

@@ -14,7 +14,7 @@ class ZeroTerminatedFlashString {
   bool equals(const char* expected) const {
     const char* actual = reinterpret_cast<const char*>(_str);
     if (!actual || !expected) return actual == expected;
-    return strcmp_P(actual, expected) == 0;
+    return strcmp_P(expected, actual) == 0;
   }
 
   bool is_null() const {

src/ArduinoJson/version.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "6.2.0-beta"
+#define ARDUINOJSON_VERSION "6.2.3-beta"
 #define ARDUINOJSON_VERSION_MAJOR 6
 #define ARDUINOJSON_VERSION_MINOR 2
-#define ARDUINOJSON_VERSION_REVISION 0
+#define ARDUINOJSON_VERSION_REVISION 3

test/JsonDeserializer/deserializeJsonValue.cpp

@@ -87,6 +87,40 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
     REQUIRE(doc.as<bool>() == false);
   }
 
+  SECTION("NaN") {
+    DeserializationError err = deserializeJson(doc, "NaN");
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<float>() == true);
+    REQUIRE(Internals::isnan(doc.as<float>()));
+  }
+
+  SECTION("Infinity") {
+    DeserializationError err = deserializeJson(doc, "Infinity");
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<float>() == true);
+    REQUIRE(Internals::isinf(doc.as<float>()));
+  }
+
+  SECTION("+Infinity") {
+    DeserializationError err = deserializeJson(doc, "+Infinity");
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<float>() == true);
+    REQUIRE(Internals::isinf(doc.as<float>()));
+  }
+
+  SECTION("-Infinity") {
+    DeserializationError err = deserializeJson(doc, "-Infinity");
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<float>() == true);
+    REQUIRE(Internals::isinf(doc.as<float>()));
+  }
+
+  SECTION("issue #628") {
+    DeserializationError err = deserializeJson(doc, "null");
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<float>() == false);
+  }
+
   SECTION("Should clear the JsonVariant") {
     deserializeJson(doc, "[1,2,3]");
     deserializeJson(doc, "{}");

test/JsonVariant/subscript.cpp

@@ -6,79 +6,89 @@
 #include <catch.hpp>
 
 TEST_CASE("JsonVariant::operator[]") {
-  SECTION("Array") {
-    DynamicJsonDocument doc;
-    JsonArray array = doc.to<JsonArray>();
-    array.add("element at index 0");
-    array.add("element at index 1");
-
-    JsonVariant var = array;
-
-    REQUIRE(2 == var.size());
-    REQUIRE(std::string("element at index 0") == var[0]);
-    REQUIRE(std::string("element at index 1") == var[1]);
-    REQUIRE(std::string("element at index 0") ==
-            var[static_cast<unsigned char>(0)]);  // issue #381
-    REQUIRE(var[666].isNull());
-    REQUIRE(var[3].isNull());
-    REQUIRE(var["0"].isNull());
-  }
-
-  SECTION("Object") {
-    DynamicJsonDocument doc;
-    JsonObject object = doc.to<JsonObject>();
-    object["a"] = "element at key \"a\"";
-    object["b"] = "element at key \"b\"";
-
-    JsonVariant var = object;
-
-    REQUIRE(2 == var.size());
-    REQUIRE(std::string("element at key \"a\"") == var["a"]);
-    REQUIRE(std::string("element at key \"b\"") == var["b"]);
-    REQUIRE(var["c"].isNull());
-    REQUIRE(var[0].isNull());
-  }
-
-  SECTION("Undefined") {
+  SECTION("The JsonVariant is undefined") {
     JsonVariant var = JsonVariant();
     REQUIRE(0 == var.size());
     REQUIRE(var["0"].isNull());
     REQUIRE(var[0].isNull());
   }
 
-  SECTION("String") {
+  SECTION("The JsonVariant is a string") {
     JsonVariant var = "hello world";
     REQUIRE(0 == var.size());
     REQUIRE(var["0"].isNull());
     REQUIRE(var[0].isNull());
   }
 
-  SECTION("ObjectSetValue") {
+  SECTION("The JsonVariant is a JsonArray") {
     DynamicJsonDocument doc;
-    JsonObject obj = doc.to<JsonObject>();
-    JsonVariant var = obj;
-    var["hello"] = "world";
-    REQUIRE(1 == var.size());
-    REQUIRE(std::string("world") == var["hello"]);
+    JsonArray array = doc.to<JsonArray>();
+    JsonVariant var = array;
+
+    SECTION("get value") {
+      array.add("element at index 0");
+      array.add("element at index 1");
+
+      REQUIRE(2 == var.size());
+      REQUIRE(std::string("element at index 0") == var[0]);
+      REQUIRE(std::string("element at index 1") == var[1]);
+      REQUIRE(std::string("element at index 0") ==
+              var[static_cast<unsigned char>(0)]);  // issue #381
+      REQUIRE(var[666].isNull());
+      REQUIRE(var[3].isNull());
+      REQUIRE(var["0"].isNull());
+    }
+
+    SECTION("set value") {
+      array.add("hello");
+
+      var[0] = "world";
+
+      REQUIRE(1 == var.size());
+      REQUIRE(std::string("world") == var[0]);
+    }
+
+    SECTION("set value in a nested object") {
+      array.createNestedObject();
+
+      var[0]["hello"] = "world";
+
+      REQUIRE(1 == var.size());
+      REQUIRE(1 == var[0].size());
+      REQUIRE(std::string("world") == var[0]["hello"]);
+    }
   }
 
-  SECTION("ArraySetValue") {
+  SECTION("The JsonVariant is a JsonObject") {
     DynamicJsonDocument doc;
-    JsonArray arr = doc.to<JsonArray>();
-    arr.add("hello");
-    JsonVariant var = arr;
-    var[0] = "world";
-    REQUIRE(1 == var.size());
-    REQUIRE(std::string("world") == var[0]);
-  }
+    JsonObject object = doc.to<JsonObject>();
+    JsonVariant var = object;
 
-  SECTION("NestedObjectSetValue") {
-    DynamicJsonDocument doc;
-    deserializeJson(doc, "[{}]");
-    JsonVariant var = doc.as<JsonVariant>();
-    var[0]["hello"] = "world";
-    REQUIRE(1 == var.size());
-    REQUIRE(1 == var[0].size());
-    REQUIRE(std::string("world") == var[0]["hello"]);
+    SECTION("get value") {
+      object["a"] = "element at key \"a\"";
+      object["b"] = "element at key \"b\"";
+
+      REQUIRE(2 == var.size());
+      REQUIRE(std::string("element at key \"a\"") == var["a"]);
+      REQUIRE(std::string("element at key \"b\"") == var["b"]);
+      REQUIRE(var["c"].isNull());
+      REQUIRE(var[0].isNull());
+    }
+
+    SECTION("set value, key is a const char*") {
+      var["hello"] = "world";
+
+      REQUIRE(1 == var.size());
+      REQUIRE(std::string("world") == var["hello"]);
+    }
+
+    SECTION("set value, key is a char[]") {
+      char key[] = "hello";
+      var[key] = "world";
+      key[0] = '!';  // make sure the key is duplicated
+
+      REQUIRE(1 == var.size());
+      REQUIRE(std::string("world") == var["hello"]);
+    }
   }
 }