Set version to 6.13.0

https://github.com/msgpack/website/blob/master/README.md#how-to-list-up-your-project-on-msgpackorg

.gitignore

@@ -6,7 +6,7 @@
 /sftp-config.json
 .tags
 .tags_sorted_by_file
-/fuzzing/*_fuzzer
-/fuzzing/*_fuzzer.options
-/fuzzing/*_fuzzer_seed_corpus.zip
+/extras/fuzzing/*_fuzzer
+/extras/fuzzing/*_fuzzer.options
+/extras/fuzzing/*_fuzzer_seed_corpus.zip
 .vs/

.travis.yml

@@ -84,12 +84,12 @@ matrix:
       env: SCRIPT=test _CC=clang-4.0 _CXX=clang++-4.0
     - addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-5.0']
+          sources: ['ubuntu-toolchain-r-test']
           packages: ['clang-5.0']
       env: SCRIPT=test _CC=clang-5.0 _CXX=clang++-5.0
     - addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
+          sources: ['ubuntu-toolchain-r-test']
           packages: ['clang-6.0']
       env: SCRIPT=test _CC=clang-6.0 _CXX=clang++-6.0
     - addons:
@@ -121,12 +121,12 @@ matrix:
     - env: SCRIPT=platformio BOARD=esp01
     - addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
+          sources: ['ubuntu-toolchain-r-test']
           packages: ['clang-6.0','llvm-6.0']
       env: SCRIPT=fuzz CLANG=6.0
 cache:
   directories:
     - "~/.platformio"
-    - "fuzzing/json_corpus"
-    - "fuzzing/msgpack_corpus"
-script: scripts/travis/$SCRIPT.sh
+    - "extras/fuzzing/json_corpus"
+    - "extras/fuzzing/msgpack_corpus"
+script: extras/ci/$SCRIPT.sh

CHANGELOG.md

@@ -1,6 +1,49 @@
 ArduinoJson: change log
 =======================
 
+v6.13.0 (2019-11-01)
+-------
+
+* Added support for custom writer/reader classes (issue #1088)
+* Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant`
+* Fixed `deserializeJson()` when input contains duplicate keys (issue #1095)
+* Improved `deserializeMsgPack()` speed by reading several bytes at once
+* Added detection of Atmel AVR8/GNU C Compiler (issue #1112)
+* Fixed deserializer that stopped reading at the first `0xFF` (PR #1118 by @mikee47)
+* Fixed dangling reference in copies of `MemberProxy` and `ElementProxy` (issue #1120)
+
+v6.12.0 (2019-09-05)
+-------
+
+* Use absolute instead of relative includes (issue #1072)
+* Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
+* Moved ancillary files to `extras/` (issue #1011)
+
+v6.11.5 (2019-08-23)
+-------
+
+* Added fallback implementations of `strlen_P()`, `strncmp_P()`, `strcmp_P()`, and `memcpy_P()` (issue #1073)
+
+v6.11.4 (2019-08-12)
+-------
+
+* Added `measureJson()` to the `ArduinoJson` namespace (PR #1069 by @nomis)
+* Added support for `basic_string<char, traits, allocator>` (issue #1045)
+* Fixed example `JsonConfigFile.ino` for ESP8266
+* Include `Arduino.h` if `ARDUINO` is defined (PR #1071 by @nomis)
+
+v6.11.3 (2019-07-22)
+-------
+
+* Added operators `==` and `!=` for `JsonDocument`, `ElementProxy`, and `MemberProxy`
+* Fixed comparison of `JsonVariant` when one contains a linked string and the other contains an owned string (issue #1051)
+
+v6.11.2 (2019-07-08)
+-------
+
+* Fixed assignment of `JsonDocument` to `JsonVariant` (issue #1023)
+* Fix invalid conversion error on Particle Argon (issue #1035)
+
 v6.11.1 (2019-06-21)
 -------
 

CMakeLists.txt

@@ -17,6 +17,5 @@ if(${COVERAGE})
 endif()
 
 include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
-add_subdirectory(third-party/catch)
-add_subdirectory(test)
-add_subdirectory(fuzzing)
+add_subdirectory(extras/tests)
+add_subdirectory(extras/fuzzing)

README.md

@@ -2,11 +2,12 @@
 
 ---
 
-[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.11.1)](https://www.ardu-badge.com/ArduinoJson/6.11.1)
+[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.13.0)](https://www.ardu-badge.com/ArduinoJson/6.13.0)
 [![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)
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
 [![Coverage Status](https://coveralls.io/repos/github/bblanchon/ArduinoJson/badge.svg?branch=6.x)](https://coveralls.io/github/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)
+[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat)](https://github.com/bblanchon/ArduinoJson/stargazers)
 
 ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 6.11.1.{build}
+version: 6.13.0.{build}
 environment:
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

component.mk

@@ -0,0 +1 @@
+COMPONENT_ADD_INCLUDEDIRS := src

examples/JsonConfigFile/JsonConfigFile.ino

@@ -11,6 +11,12 @@
 //   "port": 2731
 // }
 //
+// To run this program, you need an SD card connected to the SPI bus as follows:
+// * MOSI <-> pin 11
+// * MISO <-> pin 12
+// * CLK  <-> pin 13
+// * CS   <-> pin 4
+//
 // https://arduinojson.org/v6/example/config/
 
 #include <ArduinoJson.h>
@@ -111,7 +117,8 @@ void setup() {
   while (!Serial) continue;
 
   // Initialize SD library
-  while (!SD.begin()) {
+  const int chipSelect = 4;
+  while (!SD.begin(chipSelect)) {
     Serial.println(F("Failed to initialize SD library"));
     delay(1000);
   }

extras/ci/coverage.sh

@@ -5,4 +5,5 @@ make
 make test
 
 pip install --user cpp-coveralls 'requests[security]'
-coveralls --exclude third-party --gcov-options '\-lp'; fi
+pwd
+coveralls --include 'src' --gcov-options '\-lp'

extras/ci/fuzz.sh

@@ -2,7 +2,7 @@
 
 ROOT_DIR=$(dirname $0)/../../
 INCLUDE_DIR=${ROOT_DIR}/src/
-FUZZING_DIR=${ROOT_DIR}/fuzzing/
+FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/
 CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
 
 fuzz() {

extras/ci/platformio.sh

@@ -2,8 +2,6 @@
 
 pip install --user platformio
 
-rm -r test
-
 case $BOARD in
 uno)
   platformio lib install 868 # SD library

extras/fuzzing/Makefile

@@ -1,6 +1,6 @@
 # CAUTION: this file is invoked by https://github.com/google/oss-fuzz
 
-CXXFLAGS += -I../src -DARDUINOJSON_DEBUG
+CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG
 
 all: \
 	$(OUT)/json_fuzzer \
@@ -10,7 +10,7 @@ all: \
 	$(OUT)/msgpack_fuzzer_seed_corpus.zip \
 	$(OUT)/msgpack_fuzzer.options
 
-$(OUT)/%_fuzzer: %_fuzzer.cpp $(shell find ../src -type f)
+$(OUT)/%_fuzzer: %_fuzzer.cpp $(shell find ../../src -type f)
 	$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
 
 $(OUT)/%_fuzzer_seed_corpus.zip: %_seed_corpus/*

extras/scripts/build-arduino-package.sh

@@ -3,7 +3,7 @@
 TAG=$(git describe)
 OUTPUT="ArduinoJson-$TAG.zip"
 
-cd $(dirname $0)/../..
+cd $(dirname $0)/../../..
 
 # remove existing file
 rm -f $OUTPUT

extras/scripts/build-single-header.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -e
+
+TAG=$(git describe)
+RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
+RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
+RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
+RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
+SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
+
+
+declare -A INCLUDED
+
+process()
+{
+	local PARENT=$1
+	local FOLDER=$(dirname $1)
+	local SHOW_COMMENT=$2
+	while IFS= read -r LINE; do
+		if [[ $LINE =~ $RE_ABSOLUTE_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			local CHILD_PATH
+			CHILD_PATH=$(realpath "$SRC_DIRECTORY/$CHILD")
+			echo "$PARENT -> $CHILD" >&2
+			if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
+				INCLUDED[$CHILD_PATH]=true
+				process "$CHILD" false
+			fi
+		elif [[ $LINE =~ $RE_RELATIVE_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			pushd "$FOLDER" > /dev/null
+			local CHILD_PATH
+			CHILD_PATH=$(realpath "$CHILD")
+			echo "$PARENT -> $CHILD" >&2
+			if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
+				INCLUDED[$CHILD_PATH]=true
+				process "$CHILD" false
+			fi
+			popd > /dev/null
+		elif [[ $LINE =~ $RE_SYSTEM_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			echo "$PARENT -> <$CHILD>" >&2
+			if [[ ! ${INCLUDED[$CHILD]} ]]; then
+				echo "#include <$CHILD>"
+				INCLUDED[$CHILD]=true
+			fi
+		elif [[ "${SHOW_COMMENT}" = "true" ]] ; then
+			echo "$LINE"
+		elif [[ ! $LINE =~ $RE_EMPTY ]]; then
+			echo "$LINE"
+		fi
+	done < $PARENT
+}
+
+simplify_namespaces() {
+	perl -p0i -e 's|\}  // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
+}
+
+cd $(dirname $0)/../..
+INCLUDED=()
+process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
+simplify_namespaces ../ArduinoJson-$TAG.h
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.h"
+int main() {
+	StaticJsonDocument<300> doc;
+	deserializeJson(doc, "{}");
+}
+END
+
+INCLUDED=()
+process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
+simplify_namespaces ../ArduinoJson-$TAG.hpp
+g++ -x c++ -c -o ../smoketest.o - <<END
+#include "../ArduinoJson-$TAG.hpp"
+int main() {
+	ArduinoJson::StaticJsonDocument<300> doc;
+	ArduinoJson::deserializeJson(doc, "{}");
+}
+END

extras/scripts/create-build-envs.sh

@@ -2,7 +2,7 @@
 
 export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
 
-cd $(dirname $0)/..
+cd $(dirname $0)/../..
 ROOT=$(pwd)
 
 mkdir "build"

extras/scripts/publish-particle-library.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-SOURCE_DIR="$(dirname "$0")/.."
+SOURCE_DIR="$(dirname "$0")/../.."
 WORK_DIR=$(mktemp -d)
 trap 'rm -rf "$WORK_DIR"' EXIT
 

extras/scripts/publish.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
 VERSION="$1"
 DATE=$(date +%F)
@@ -56,6 +56,6 @@ commit_new_version
 add_tag
 push
 
-scripts/build-arduino-package.sh
-scripts/build-single-header.sh
-scripts/wandbox/publish.sh "../ArduinoJson-$TAG.h"
+extras/scripts/build-arduino-package.sh
+extras/scripts/build-single-header.sh
+extras/scripts/wandbox/publish.sh "../ArduinoJson-$TAG.h"

extras/tests/CMakeLists.txt

@@ -2,6 +2,8 @@
 # Copyright Benoit Blanchon 2014-2019
 # MIT License
 
+add_subdirectory(catch)
+
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 	add_compile_options(
 		-pedantic
@@ -70,6 +72,7 @@ if(MSVC)
 	)
 endif()
 
+include_directories(Helpers)
 add_subdirectory(ElementProxy)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)

extras/tests/ElementProxy/CMakeLists.txt

@@ -5,6 +5,7 @@
 add_executable(ElementProxyTests
 	add.cpp
 	clear.cpp
+	compare.cpp
 	remove.cpp
 	set.cpp
 	size.cpp

extras/tests/ElementProxy/compare.cpp

@@ -0,0 +1,28 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("ElementProxy::operator==()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("same value") {
+    doc.add(1);
+    doc.add(1);
+
+    REQUIRE(doc[0] == doc[1]);
+    REQUIRE_FALSE(doc[0] != doc[1]);
+  }
+
+  SECTION("different values") {
+    doc.add(1);
+    doc.add(2);
+
+    REQUIRE_FALSE(doc[0] == doc[1]);
+    REQUIRE(doc[0] != doc[1]);
+  }
+}

extras/tests/Helpers/CustomReader.hpp

@@ -0,0 +1,26 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#pragma once
+
+#include <sstream>
+
+class CustomReader {
+  std::stringstream _stream;
+
+ public:
+  CustomReader(const char* input) : _stream(input) {}
+
+  int read() {
+    return _stream.get();
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    _stream.read(buffer, static_cast<std::streamsize>(length));
+    return static_cast<size_t>(_stream.gcount());
+  }
+
+ private:
+  CustomReader(const CustomReader&);
+};

extras/tests/Helpers/Stream.h

@@ -0,0 +1,14 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#pragma once
+
+// Reproduces Arduino's Stream class
+class Stream  // : public Print
+{
+ public:
+  virtual ~Stream() {}
+  virtual int read() = 0;
+  virtual size_t readBytes(char *buffer, size_t length) = 0;
+};

extras/tests/JsonArray/isNull.cpp

@@ -0,0 +1,58 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::isNull()") {
+  SECTION("returns true") {
+    JsonArray arr;
+    REQUIRE(arr.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
+    JsonArray arr = doc.to<JsonArray>();
+    REQUIRE(arr.isNull() == false);
+  }
+}
+
+TEST_CASE("JsonArrayConst::isNull()") {
+  SECTION("returns true") {
+    JsonArrayConst arr;
+    REQUIRE(arr.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
+    JsonArrayConst arr = doc.to<JsonArray>();
+    REQUIRE(arr.isNull() == false);
+  }
+}
+
+TEST_CASE("JsonArray::operator bool()") {
+  SECTION("returns false") {
+    JsonArray arr;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonArray arr = doc.to<JsonArray>();
+    REQUIRE(static_cast<bool>(arr) == true);
+  }
+}
+
+TEST_CASE("JsonArrayConst::operator bool()") {
+  SECTION("returns false") {
+    JsonArrayConst arr;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonArrayConst arr = doc.to<JsonArray>();
+    REQUIRE(static_cast<bool>(arr) == true);
+  }
+}

extras/tests/JsonDeserializer/input_types.cpp

@@ -6,6 +6,8 @@
 #include <catch.hpp>
 #include <sstream>
 
+#include "CustomReader.hpp"
+
 TEST_CASE("deserializeJson(const std::string&)") {
   DynamicJsonDocument doc(4096);
 
@@ -113,3 +115,14 @@ TEST_CASE("deserializeJson(VLA)") {
   REQUIRE(err == DeserializationError::Ok);
 }
 #endif
+
+TEST_CASE("deserializeJson(CustomReader)") {
+  DynamicJsonDocument doc(4096);
+  CustomReader reader("[4,2]");
+  DeserializationError err = deserializeJson(doc, reader);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc.size() == 2);
+  REQUIRE(doc[0] == 4);
+  REQUIRE(doc[1] == 2);
+}