🔀 Merge branch 'feature/messagepack' into develop

.gitignore

@@ -18,3 +18,5 @@ benchmarks/files/numbers/*.json
 .idea
 cmake-build-debug
 
+
+test/test-*

.travis.yml

@@ -39,7 +39,7 @@ matrix:
         sources: ['ubuntu-toolchain-r-test']
         packages: [g++-4.9, valgrind]
     after_success:
-      - valgrind --error-exitcode=1 --leak-check=full test/json_unit
+      - make check TEST_PREFIX="valgrind --error-exitcode=1 --leak-check=full " TEST_PATTERN=""
 
   # cppcheck
 
@@ -68,9 +68,10 @@ matrix:
       - tar xf lcov_1.11.orig.tar.gz
       - sudo make -C lcov-1.11/ install
       - gem install coveralls-lcov
+      - pip install --user cpp-coveralls
     after_success:
       - make clean
-      - CXXFLAGS="--coverage -g -O0" CPPFLAGS="-DNDEBUG" make
+      - CXXFLAGS="--coverage -g -O0" CPPFLAGS="-DNDEBUG" make json_unit
       - test/json_unit "*"
       - coveralls --build-root test --exclude src/catch.hpp --exclude src/unit-algorithms.cpp --exclude src/unit-allocator.cpp --exclude src/unit-capacity.cpp --exclude src/unit-class_const_iterator.cpp --exclude src/unit-class_iterator.cpp --exclude src/unit-class_lexer.cpp --exclude src/unit-class_parser.cpp --exclude src/unit-comparison.cpp --exclude src/unit-concepts.cpp --exclude src/unit-constructor1.cpp --exclude src/unit-constructor2.cpp --exclude src/unit-convenience.cpp --exclude src/unit-conversions.cpp --exclude src/unit-deserialization.cpp --exclude src/unit-element_access1.cpp --exclude src/unit-element_access2.cpp --exclude src/unit-inspection.cpp --exclude src/unit-iterator_wrapper.cpp --exclude src/unit-iterators1.cpp --exclude src/unit-iterators2.cpp --exclude src/unit-json_patch.cpp --exclude src/unit-json_pointer.cpp --exclude src/unit-modifiers.cpp --exclude src/unit-pointer_access.cpp --exclude src/unit-readme.cpp --exclude src/unit-reference_access.cpp --exclude src/unit-regression.cpp --exclude src/unit-serialization.cpp --exclude src/unit-testsuites.cpp --exclude src/unit-unicode.cpp --include ../src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
       - lcov --directory src --directory test/src --capture --output-file coverage.info --rc lcov_branch_coverage=1 --no-external
@@ -236,11 +237,8 @@ script:
   - uname -a
   - $CXX --version
 
-  # compile
-  - make
-
-  # execute unit tests
-  - test/json_unit "*"
+  # compile and execute unit tests
+  - make check
 
   # check if homebrew works (only checks develop branch)
   - if [ `which brew` ]; then
@@ -249,51 +247,3 @@ script:
     brew install nlohmann_json --HEAD ;
     brew test nlohmann_json ;
     fi
-
-#language: cpp
-#
-#dist: trusty
-#sudo: required
-#
-#env:
-#  global:
-#   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-#   #   via the "travis encrypt" command using the project repo's public key
-#   - secure: "m89SSgE+ASLO38rSKx7MTXK3n5NkP9bIx95jwY71YEiuFzib30PDJ/DifKnXxBjvy/AkCGztErQRk/8ZCvq+4HXozU2knEGnL/RUitvlwbhzfh2D4lmS3BvWBGS3N3NewoPBrRmdcvnT0xjOGXxtZaJ3P74TkB9GBnlz/HmKORA="
-#
-## from http://stackoverflow.com/a/32127147/266378
-#matrix:
-#  include:
-#    - os: linux
-#      compiler: gcc
-#      addons:
-#        apt:
-#          sources: ['ubuntu-toolchain-r-test']
-#          packages: ['g++-4.9', 'valgrind', 'python-pip', 'python-yaml']
-#      before_script:
-#        - pip install --user git+git://github.com/eddyxu/cpp-coveralls.git
-#      after_success:
-#        - make clean
-#        - touch src/json.hpp
-#        - make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage -std=c++11 -lstdc++" CXX=$COMPILER
-#        - test/json_unit "*"
-#        - coveralls --build-root test --exclude src/catch.hpp --exclude src/unit-algorithms.cpp --exclude src/unit-allocator.cpp --exclude src/unit-capacity.cpp --exclude src/unit-class_const_iterator.cpp --exclude src/unit-class_iterator.cpp --exclude src/unit-class_lexer.cpp --exclude src/unit-class_parser.cpp --exclude src/unit-comparison.cpp --exclude src/unit-concepts.cpp --exclude src/unit-constructor1.cpp --exclude src/unit-constructor2.cpp --exclude src/unit-convenience.cpp --exclude src/unit-conversions.cpp --exclude src/unit-deserialization.cpp --exclude src/unit-element_access1.cpp --exclude src/unit-element_access2.cpp --exclude src/unit-inspection.cpp --exclude src/unit-iterator_wrapper.cpp --exclude src/unit-iterators1.cpp --exclude src/unit-iterators2.cpp --exclude src/unit-json_patch.cpp --exclude src/unit-json_pointer.cpp --exclude src/unit-modifiers.cpp --exclude src/unit-pointer_access.cpp --exclude src/unit-readme.cpp --exclude src/unit-reference_access.cpp --exclude src/unit-regression.cpp --exclude src/unit-serialization.cpp --exclude src/unit-testsuites.cpp --exclude src/unit-unicode.cpp --include ../src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
-#      env: COMPILER=g++-4.9  
-#
-#    - os: linux
-#      compiler: gcc
-#      before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
-#      addons:
-#        apt:
-#          sources: ['ubuntu-toolchain-r-test']
-#          packages: ['g++-5', 'valgrind']
-#        coverity_scan:
-#          project:
-#            name: "nlohmann/json"
-#            description: "Build submitted via Travis CI"
-#          notification_email: niels.lohmann@gmail.com
-#          build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
-#          build_command: "make"
-#          branch_pattern: coverity_scan
-#      env: COMPILER=g++-5
-#

Makefile

@@ -5,7 +5,8 @@ RE2C = re2c
 SED = sed
 
 # main target
-all: json_unit
+all:
+	$(MAKE) -C test
 
 # clean up
 clean:
@@ -21,14 +22,14 @@ clean:
 
 # build unit tests
 json_unit:
-	@$(MAKE) -C test
+	@$(MAKE) json_unit -C test
 
 # run unit tests
-check: json_unit
-	test/json_unit "*"
+check:
+	$(MAKE) check -C test
 
-check-fast: json_unit
-	test/json_unit
+check-fast:
+	$(MAKE) check -C test TEST_PATTERN=""
 
 
 ##########################################################################
@@ -69,6 +70,7 @@ cppcheck:
 clang_sanitize: clean
 	CXX=clang++ CXXFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer" $(MAKE)
 
+
 ##########################################################################
 # maintainer targets
 ##########################################################################

doc/examples/from_cbor.cpp

+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<uint8_t> v = {0xa2, 0x67, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                              0x74, 0xf5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                              0x61, 0x00
+                             };
+
+    // deserialize it with CBOR
+    json j = json::from_cbor(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}

doc/examples/from_cbor.link

+<a target="_blank" href="http://melpon.org/wandbox/permlink/TDPaxmQ7PsvfWxrs"><b>online</b></a>
\ No newline at end of file

doc/examples/from_cbor.output

+{
+  "compact": true,
+  "schema": 0
+}

doc/examples/from_msgpack.cpp

+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<uint8_t> v = {0x82, 0xa7, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                              0x74, 0xc3, 0xa6, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                              0x61, 0x00
+                             };
+
+    // deserialize it with MessagePack
+    json j = json::from_msgpack(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}

doc/examples/from_msgpack.link

+<a target="_blank" href="http://melpon.org/wandbox/permlink/7vRGmLdVcYM7POhE"><b>online</b></a>
\ No newline at end of file

doc/examples/from_msgpack.output

+{
+  "compact": true,
+  "schema": 0
+}

doc/examples/to_cbor.cpp

+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON value
+    json j = R"({"compact": true, "schema": 0})"_json;
+
+    // serialize it to CBOR
+    std::vector<uint8_t> v = json::to_cbor(j);
+
+    // print the vector content
+    for (auto& byte : v)
+    {
+        std::cout << "0x" << std::hex << std::setw(2) << std::setfill('0') << (int)byte << " ";
+    }
+    std::cout << std::endl;
+}

doc/examples/to_cbor.link

+<a target="_blank" href="http://melpon.org/wandbox/permlink/UaDbrgZ8OPWaShY8"><b>online</b></a>
\ No newline at end of file

doc/examples/to_cbor.output

+0xa2 0x67 0x63 0x6f 0x6d 0x70 0x61 0x63 0x74 0xf5 0x66 0x73 0x63 0x68 0x65 0x6d 0x61 0x00 

doc/examples/to_msgpack.cpp

+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON value
+    json j = R"({"compact": true, "schema": 0})"_json;
+
+    // serialize it to MessagePack
+    std::vector<uint8_t> v = json::to_msgpack(j);
+
+    // print the vector content
+    for (auto& byte : v)
+    {
+        std::cout << "0x" << std::hex << std::setw(2) << std::setfill('0') << (int)byte << " ";
+    }
+    std::cout << std::endl;
+}

doc/examples/to_msgpack.link

+<a target="_blank" href="http://melpon.org/wandbox/permlink/jvaU8GEfAusb5dKf"><b>online</b></a>
\ No newline at end of file

doc/examples/to_msgpack.output

+0x82 0xa7 0x63 0x6f 0x6d 0x70 0x61 0x63 0x74 0xc3 0xa6 0x73 0x63 0x68 0x65 0x6d 0x61 0x00 

test/CMakeLists.txt

@@ -6,6 +6,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
     "src/unit-algorithms.cpp"
     "src/unit-allocator.cpp"
     "src/unit-capacity.cpp"
+    "src/unit-cbor.cpp"
     "src/unit-class_const_iterator.cpp"
     "src/unit-class_iterator.cpp"
     "src/unit-class_lexer.cpp"
@@ -26,6 +27,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
     "src/unit-json_patch.cpp"
     "src/unit-json_pointer.cpp"
     "src/unit-modifiers.cpp"
+    "src/unit-msgpack.cpp"
     "src/unit-pointer_access.cpp"
     "src/unit-readme.cpp"
     "src/unit-reference_access.cpp"

test/Makefile

@@ -10,6 +10,7 @@ SOURCES = src/unit.cpp \
           src/unit-algorithms.cpp \
           src/unit-allocator.cpp \
           src/unit-capacity.cpp \
+          src/unit-cbor.cpp \
           src/unit-class_const_iterator.cpp \
           src/unit-class_iterator.cpp \
           src/unit-class_lexer.cpp \
@@ -30,6 +31,7 @@ SOURCES = src/unit.cpp \
           src/unit-json_patch.cpp \
           src/unit-json_pointer.cpp \
           src/unit-modifiers.cpp \
+          src/unit-msgpack.cpp \
           src/unit-pointer_access.cpp \
           src/unit-readme.cpp \
           src/unit-reference_access.cpp \
@@ -40,7 +42,20 @@ SOURCES = src/unit.cpp \
 
 OBJECTS = $(SOURCES:.cpp=.o)
 
-all: json_unit
+TESTCASES = $(patsubst src/unit-%.cpp,test-%,$(wildcard src/unit-*.cpp))
+
+##############################################################################
+# main rules
+##############################################################################
+
+all: $(TESTCASES)
+
+clean:
+	rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda) $(TESTCASES)
+
+##############################################################################
+# single test file
+##############################################################################
 
 json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
 	@echo "[CXXLD] $@"
@@ -50,5 +65,16 @@ json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp
 	@echo "[CXX]   $@"
 	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
-clean:
-	rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda)
+
+##############################################################################
+# individual test cases
+##############################################################################
+
+test-%: src/unit-%.cpp ../src/json.hpp src/catch.hpp
+	@echo "[CXXLD] $@"
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DCATCH_CONFIG_MAIN $< -o $@
+
+TEST_PATTERN = "*"
+TEST_PREFIX = ""
+check: $(TESTCASES)
+	@cd .. ; for testcase in $(TESTCASES); do echo "Executing $$testcase..."; $(TEST_PREFIX)test/$$testcase $(TEST_PATTERN) || exit 1; done

test/data/json.org/1.json.cbor

+hglossaryhGlossDiviGlossListjGlossEntryhGlossDeflGlossSeeAlsocGMLcXMLdparaxHA meta-markup language, used to create markup languages such as DocBook.hGlossSeefmarkupgAcronymdSGMLiGlossTermx$Standard Generalized Markup LanguagefAbbrevmISO 8879:1986fSortAsdSGMLbIDdSGMLetitleaSetitlepexample glossary
\ No newline at end of file

test/data/json.org/2.json.cbor

+dmenuepopuphmenuitemgonclicknCreateNewDoc()evaluecNewgonclickiOpenDoc()evaluedOpengonclickjCloseDoc()evalueeClosebiddfileevaluedFile
\ No newline at end of file

test/data/json.org/2.json.msgpack

+menupopupmenuitemonclickCreateNewDoc()valueNewonclickOpenDoc()valueOpenonclickCloseDoc()valueCloseidfilevalueFile
\ No newline at end of file

test/data/json.org/3.json.cbor

+fwidgetedebugbondtextgvOffsetdestyledbolddnameetext1ghOffsetionMouseUpx)sun1.opacity = (sun1.opacity / 100) * 90;ddatajClick Hereialignmentfcenterdsize$fwindowewidth
fheight
dnamekmain_windowetitlexSample Konfabulator WidgeteimagegvOffsetcsrcnImages/Sun.pngialignmentfcenterdnamedsun1ghOffset
\ No newline at end of file

test/data/json.org/4.json.cbor

+gweb-apposervlet-mappingjcofaxToolsh/tools/*hcofaxCDSa/kfileServleti/static/*jcofaxAdminh/admin/*jcofaxEmails/cofaxutil/aemail/*ftaglibotaglib-locationw/WEB-INF/tlds/cofax.tldjtaglib-uriicofax.tldgservletlservlet-namehcofaxCDSjinit-param*ocachePagesStoredxsearchEngineListTemplatexforSearchEnginesList.htmxconfigGlossary:adminEmailmksm@pobox.comlmaxUrlLength
rdataStoreTestQueryx"SET NOCOUNT ON;select test='test';sdefaultFileTemplatesarticleTemplate.htmpdataStoreLogFilex$/usr/local/tomcat/logs/datastore.logstemplateLoaderClassxorg.cofax.FilesTemplateLoaderndataStoreClassvorg.cofax.SqlDataStorepredirectionClassxorg.cofax.SqlRedirectionttemplateOverridePath`scacheTemplatesStore2ldataStoreUrlx;jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goonxsearchEngineFileTemplatetforSearchEngines.htmocachePagesTrackucachePackageTagsStoremdataStoreNameecofaxqdataStorePasswordrdataStoreTestQueryfuseJSPsdefaultListTemplateplistTemplate.htmxconfigGlossary:poweredByeCofaxmdataStoreUserbsaojspListTemplateplistTemplate.jspojspFileTemplatesarticleTemplate.jspqdataStoreMaxConnsdscachePagesDirtyRead
+qcachePagesRefresh
+scacheTemplatesTrackdwdataStoreConnUsageLimitdxconfigGlossary:installationAtpPhiladelphia, PAtsearchEngineRobotsDbqWEB-INF/robots.dbvtemplateProcessorClassxorg.cofax.WysiwygTemplatewcachePackageTagsRefresh<xconfigGlossary:staticPatho/content/staticltemplatePathitemplatesluseDataStoreucacheTemplatesRefreshodataStoreDriverx,com.microsoft.jdbc.sqlserver.SQLServerDriverxconfigGlossary:poweredByIconq/images/cofax.gifucachePackageTagsTrackqdataStoreLogLeveledebugrdataStoreInitConns
+mservlet-classxorg.cofax.cds.CDSServletlservlet-namejcofaxEmailjinit-parampmailHostOverrideemail2hmailHostemail1mservlet-classxorg.cofax.cds.EmailServletlservlet-namejcofaxAdminmservlet-classxorg.cofax.cds.AdminServletlservlet-namekfileServletmservlet-classxorg.cofax.cds.FileServletlservlet-namejcofaxToolsjinit-paramklogLocationx%/usr/local/tomcat/logs/CofaxTools.logrfileTransferFolderx4/usr/local/tomcat/webapps/content/fileTransferFolderclog
gdataLog
odataLogLocationx"/usr/local/tomcat/logs/dataLog.logladminGroupIDmlookInContext
oremovePageCachex%/content/admin/remove?cache=pages&id=sremoveTemplateCachex)/content/admin/remove?cache=templates&id=jlogMaxSize`ndataLogMaxSize`jbetaServerltemplatePathotoolstemplates/mservlet-classxorg.cofax.cms.CofaxToolsServlet
\ No newline at end of file

test/data/json.org/5.json.cbor

+dmenufheaderjSVG ViewereitemsbiddOpenbidgOpenNewelabelhOpen NewbidfZoomInelabelgZoom InbidgZoomOutelabelhZoom OutbidlOriginalViewelabelmOriginal ViewbidgQualitybidePausebiddMutebiddFindelabelgFind...bidiFindAgainelabeljFind AgainbiddCopybidiCopyAgainelabeljCopy AgainbidgCopySVGelabelhCopy SVGbidgViewSVGelabelhView SVGbidjViewSourceelabelkView SourcebidfSaveAselabelgSave AsbiddHelpbideAboutelabelxAbout Adobe CVG Viewer...
\ No newline at end of file

test/data/json_roundtrip/roundtrip01.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip01.json.msgpack

+‘À
\ No newline at end of file

test/data/json_roundtrip/roundtrip02.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip02.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip03.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip03.json.msgpack

+‘В
\ No newline at end of file

test/data/json_roundtrip/roundtrip05.json.cbor

+cfoo
\ No newline at end of file

test/data/json_roundtrip/roundtrip05.json.msgpack

+‘£foo
\ No newline at end of file

test/data/json_roundtrip/roundtrip06.json.cbor

+€
\ No newline at end of file

test/data/json_roundtrip/roundtrip06.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip07.json.cbor

+ 
\ No newline at end of file

test/data/json_roundtrip/roundtrip07.json.msgpack

+€
\ No newline at end of file

test/data/json_roundtrip/roundtrip09.json.cbor

+cfoocbar
\ No newline at end of file

test/data/json_roundtrip/roundtrip09.json.msgpack

+£foo£bar
\ No newline at end of file

test/data/json_roundtrip/roundtrip10.json.cbor

+aacfoocbar
\ No newline at end of file

test/data/json_roundtrip/roundtrip10.json.msgpack

+afoobar
\ No newline at end of file

test/data/json_roundtrip/roundtrip11.json.cbor

+ 
\ No newline at end of file

test/data/json_roundtrip/roundtrip11.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip12.json.cbor

+:
\ No newline at end of file

test/data/json_roundtrip/roundtrip13.json.cbor

+;"}
\ No newline at end of file

test/data/json_roundtrip/roundtrip13.json.msgpack

+~
\ No newline at end of file

test/data/json_roundtrip/roundtrip14.json.cbor

+;
\ No newline at end of file

test/data/json_roundtrip/roundtrip15.json.cbor

+

\ No newline at end of file

test/data/json_roundtrip/roundtrip15.json.msgpack

+

\ No newline at end of file

test/data/json_roundtrip/roundtrip16.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip16.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip17.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip17.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip18.json.cbor

+"}
\ No newline at end of file

test/data/json_roundtrip/roundtrip18.json.msgpack

+"}
\ No newline at end of file

test/data/json_roundtrip/roundtrip19.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip19.json.msgpack

+‘Ο
\ No newline at end of file

test/data/json_roundtrip/roundtrip22.json.cbor

+?n
\ No newline at end of file

test/data/json_roundtrip/roundtrip22.json.msgpack

+?n
\ No newline at end of file

test/data/json_roundtrip/roundtrip23.json.cbor

+n
\ No newline at end of file

test/data/json_roundtrip/roundtrip23.json.msgpack

+˿n
\ No newline at end of file

test/data/json_roundtrip/roundtrip27.json.cbor

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip27.json.msgpack

+
\ No newline at end of file

test/data/json_roundtrip/roundtrip30.json.cbor

+9	
\ No newline at end of file

test/data/json_roundtrip/roundtrip30.json.msgpack

+9	
\ No newline at end of file

test/data/json_roundtrip/roundtrip31.json.cbor

+F/)U
\ No newline at end of file

test/data/json_roundtrip/roundtrip31.json.msgpack

+F/)U
\ No newline at end of file

test/data/json_roundtrip/roundtrip32.json.cbor

+F/)U
\ No newline at end of file

test/data/json_roundtrip/roundtrip32.json.msgpack

+F/)U
\ No newline at end of file

test/data/json_tests/pass2.json.cbor

+lNot too deep
\ No newline at end of file

test/data/json_tests/pass2.json.msgpack

+‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘¬Not too deep
\ No newline at end of file

test/data/json_tests/pass3.json.cbor

+¡wJSON Test Pattern pass3¢lIn this testpIt is an object.sThe outermost valuexmust be an object or array.
\ No newline at end of file