Complete rewrite of the validator - aiming a 2.0-release

Schema a now "parsed" into C++-validator-objects in a first
step and then validation takes place with these objects.

Errors are now handled via a user-provided error-handler
allowing the user to collect all errors at once or bail out
when a certain threshold is reached. Fixes #36 and #8.

One (sub-)schema can now be referenced with different URIs. Fixes #9

JSON schema draft 7 is now supported. Fixes #35

.clang-format

@@ -7,9 +7,11 @@ AllowShortFunctionsOnASingleLine: Inline
 BreakBeforeBraces: Linux
 ColumnLimit:     0
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IndentWidth:     2
-ObjCBlockIndentWidth: 2
+IndentWidth:     4
+IndentPPDirectives: AfterHash
+ObjCBlockIndentWidth: 0
 SpaceAfterCStyleCast: true
-TabWidth:        2
+TabWidth:        4
+AccessModifierOffset: -4
 UseTab:          ForIndentation
 ...

.travis.yml

@@ -60,7 +60,7 @@ script:
   - $CXX --version
 
   # put json.hpp to nlohmann
-  - mkdir -p nlohmann && wget https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp -O nlohmann/json.hpp
+  - mkdir -p nlohmann && wget https://github.com/nlohmann/json/releases/download/v3.5.0/json.hpp -O nlohmann/json.hpp
 
   # compile and execute unit tests
   - mkdir -p build && cd build

CMakeLists.txt

@@ -32,7 +32,7 @@ endif()
 
 # and one for the validator
 add_library(json-schema-validator
-    src/json-schema-draft4.json.cpp
+    src/json-schema-draft7.json.cpp
     src/json-uri.cpp
     src/json-validator.cpp)
 
@@ -95,8 +95,13 @@ if (BUILD_EXAMPLES)
     # simple json-schema-validator-executable
     add_executable(json-schema-validate app/json-schema-validate.cpp)
     target_link_libraries(json-schema-validate json-schema-validator)
+
+    add_executable(readme app/readme.cpp)
+    target_link_libraries(readme json-schema-validator)
 endif()
 
+#add_subdirectory(ng)
+
 if (BUILD_TESTS)
     # test-zone
     enable_testing()

README.md

@@ -1,53 +1,68 @@
 
 [![Build Status](https://travis-ci.org/pboettch/json-schema-validator.svg?branch=master)](https://travis-ci.org/pboettch/json-schema-validator)
 
-# Modern C++ JSON schema validator
+# JSON schema validator for JSON for Modern C++
 
 # What is it?
 
 This is a C++ library for validating JSON documents based on a
 [JSON Schema](http://json-schema.org/) which itself should validate with
-[draft-4 of JSON Schema Validation](http://json-schema.org/schema).
+[draft-7 of JSON Schema Validation](http://json-schema.org/schema).
 
 First a disclaimer: *It is work in progress and
-contributions or hints or discussions are welcome.*
+contributions or hints or discussions are welcome.* Even though a 2.0.0 release is immenent.
 
 Niels Lohmann et al develop a great JSON parser for C++ called [JSON for Modern
 C++](https://github.com/nlohmann/json). This validator is based on this
 library, hence the name.
 
-The name is for the moment purely marketing, because there is, IMHO, not so much
-modern C++ inside. There is plenty of space to make it more modern.
-
 External documentation is missing as well. However the API of the validator
-will be rather simple.
+is rather simple.
+
+# New in version 2
+
+Although significant changes have been coorporate to the 2 version
+(a complete rewrite) the API is compatible with the 1.0.0 release. Except for
+the namespace which is now `nlohmann::json_schema.
+
+Version **2** supports JSON schema draft 7, whereas 1 was supporting draft 4
+only. Please update your schemas.
+
+The primary change in 2 is the way a schema is used. While in version 1 the schema was
+kept as a JSON-document and used again and again during validation, in versin 2 the schema
+is parsed into compiled C++ objects which are then used during validation. There are surely
+still optimizations to be done, but validation speed has improved by factor 100
+or more.
+
+In JSON-schema one sub-schema can be
 
 # Design goals
 
 The main goal of this validator is to produce *human-comprehensible* error
-messages if a JSON-document/instance does not comply with its schema. This is
-done with exceptions thrown at the users with a helpful message telling what's
-wrong with the document while validating.
+messages if a JSON-document/instance does not comply to its schema.
+
+By default this is done with exceptions thrown at the users with a helpful
+message telling what's wrong with the document while validating.
+
+With **2.0.0** the user can passed a `json_scheam::basic_error_handler` derived object
+along with the instance to validate to receive a each time a validation error occurs
+and decice what to do (throwing, counting, collecting).
 
 Another goal was to use Niels Lohmann's JSON-library. This is why the validator
 lives in his namespace.
 
 # Weaknesses
 
-Schema-reference resolution is not recursivity-proven: If there is a nested
-cross-schema reference, it will not stop.  (Though I haven't tested it)
-
-Numerical validation uses `int64_t`, `uint64_t` or `double`, depending on if
+Numerical validation uses nlohmann integer, unsigned and floating point types, depending on if
 the schema type is "integer" or "number". Bignum (i.e. arbitrary precision and
 range) is not supported at this time.
 
-Unsigned integer validation will only take place if the following two conditions are true:
-- The nlohmann `type()` of the json object under validation is `nlohmann::json::value_t::number_unsigned`
-- The schema specifies a numerical minimum greater than or equal to 0
+Currently JSON-URI with "plain name fragments" are not supported. So referring to an URI
+with `$ref: "file.json#plain"` will not work.
 
 # How to use
 
-The current state of the build-system needs at least version **3.1.1** of NLohmann's
+The current state of the build-system needs at least version **3.5.0** of NLohmann's
 JSON library. It is looking for the `json.hpp` within a `nlohmann/`-path.
 
 When build the library you need to provide the path to the directory where the include-file
@@ -66,7 +81,7 @@ cmake .. \
     -DNLOHMANN_JSON_DIR=<path/to/>nlohmann/json.hpp \
     -DJSON_SCHEMA_TEST_SUITE_PATH=<path/to/JSON-Schema-test-suite> # optional
 make # install
-ctest # if test-suite has been given
+ctest # run unit, non-regression and test-suite tests
 ```
 ### As a subdirectory from within
 
@@ -93,7 +108,6 @@ In your initial call to cmake simply add:
 ```bash
 cmake -DBUILD_SHARED_LIBS=ON
 ```
-
 ## Code
 
 See also `app/json-schema-validate.cpp`.
@@ -104,13 +118,12 @@ See also `app/json-schema-validate.cpp`.
 #include "json-schema.hpp"
 
 using nlohmann::json;
-using nlohmann::json_uri;
-using nlohmann::json_schema_draft4::json_validator;
+using nlohmann::json_schema::json_validator;
 
 // The schema is defined based upon a string literal
 static json person_schema = R"(
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "A person",
     "properties": {
         "name": {
@@ -137,55 +150,74 @@ static json person_schema = R"(
 static json bad_person = {{"age", 42}};
 static json good_person = {{"name", "Albert"}, {"age", 42}};
 
-int main(){
-
-    /* json-parse the schema */
-
-    json_validator validator; // create validator
-
-    try {
-        validator.set_root_schema(person_schema); // insert root-schema
-    } catch (const std::exception &e) {
-        std::cerr << "Validation of schema failed, here is why: " << e.what() << "\n";
-        return EXIT_FAILURE;
-    }
-
-    /* json-parse the people */
-
-    for (auto &person : {bad_person, good_person})
-    {
-        std::cout << "About to validate this person:\n" << std::setw(2) << person << std::endl;
-        try {
-            validator.validate(person); // validate the document
-            std::cout << "Validation succeeded\n";
-        } catch (const std::exception &e) {
-            std::cerr << "Validation failed, here is why: " << e.what() << "\n";
-        }
-    }
-    return EXIT_SUCCESS;
+int main()
+{
+	/* json-parse the schema */
+
+	json_validator validator; // create validator
+
+	try {
+		validator.set_root_schema(person_schema); // insert root-schema
+	} catch (const std::exception &e) {
+		std::cerr << "Validation of schema failed, here is why: " << e.what() << "\n";
+		return EXIT_FAILURE;
+	}
+
+	/* json-parse the people - API of 1.0.0, default throwing error handler */
+
+	for (auto &person : {bad_person, good_person}) {
+		std::cout << "About to validate this person:\n"
+		          << std::setw(2) << person << std::endl;
+		try {
+			validator.validate(person); // validate the document
+			std::cout << "Validation succeeded\n";
+		} catch (const std::exception &e) {
+			std::cerr << "Validation failed, here is why: " << e.what() << "\n";
+		}
+	}
+
+	/* json-parse the people - with custom error handler */
+	class custom_error_handler : public nlohmann::json_schema::basic_error_handler
+	{
+		void error(const std::string &path, const json &instance, const std::string &message) override
+		{
+			nlohmann::json_schema::basic_error_handler::error(path, instance, message);
+			std::cerr << "ERROR: '" << path << "' - '" << instance << "': " << message << "\n";
+		}
+	};
+
+
+	for (auto &person : {bad_person, good_person}) {
+		std::cout << "About to validate this person:\n"
+		          << std::setw(2) << person << std::endl;
+
+		custom_error_handler err;
+		validator.validate(person, err); // validate the document - uses the default throwing error-handler
+
+		if (err)
+			std::cerr << "Validation failed\n";
+		else
+			std::cout << "Validation succeeded\n";
+	}
+
+	return EXIT_SUCCESS;
 }
-
 ```
 
 # Compliance
 
 There is an application which can be used for testing the validator with the
 [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
+In order to simplify the testing, the test-suite is included in the repository.
 
 If you have cloned this repository providing a path the repository-root via the
 cmake-variable `JSON_SCHEMA_TEST_SUITE_PATH` will enable the test-target(s).
 
 All required tests are **OK**.
 
-**12** optional tests of **305** total (required + optional) tests are failing:
-
-- 10 of them are `format`-strings which are not supported.
-- big numbers are not working (2)
-
 # Additional features
 
 ## Default values
 
 The goal is to create an empty document, based on schema-defined
 default-values, recursively populated.
-

app/json-schema-validate.cpp

@@ -1,27 +1,10 @@
 /*
- * Modern C++ JSON schema validator
+ * JSON schema validator for JSON for modern C++
  *
- * Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+ * Copyright (c) 2016-2019 Patrick Boettcher <p@yai.se>.
  *
- * Copyright (c) 2016 Patrick Boettcher <patrick.boettcher@posteo.de>.
+ * SPDX-License-Identifier: MIT
  *
- * 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.
  */
 #include <json-schema.hpp>
 
@@ -30,7 +13,7 @@
 
 using nlohmann::json;
 using nlohmann::json_uri;
-using nlohmann::json_schema_draft4::json_validator;
+using nlohmann::json_schema::json_validator;
 
 static void usage(const char *name)
 {
@@ -47,9 +30,10 @@ static void usage(const char *name)
 
 static void loader(const json_uri &uri, json &schema)
 {
-	std::fstream lf("." + uri.path());
+	std::string filename = "./" + uri.path();
+	std::fstream lf(filename);
 	if (!lf.good())
-		throw std::invalid_argument("could not open " + uri.url() + " tried with " + uri.path());
+		throw std::invalid_argument("could not open " + uri.url() + " tried with " + filename);
 
 	try {
 		lf >> schema;
@@ -58,6 +42,15 @@ static void loader(const json_uri &uri, json &schema)
 	}
 }
 
+class custom_error_handler : public nlohmann::json_schema::basic_error_handler
+{
+	void error(const std::string &path, const json &instance, const std::string &message) override
+	{
+		nlohmann::json_schema::basic_error_handler::error(path, instance, message);
+		std::cerr << "ERROR: '" << path << "' - '" << instance << "': " << message << "\n";
+	}
+};
+
 int main(int argc, char *argv[])
 {
 	if (argc != 2)
@@ -95,10 +88,16 @@ int main(int argc, char *argv[])
 
 	try {
 		std::cin >> document;
-		validator.validate(document);
 	} catch (std::exception &e) {
+		std::cerr << "json parsing failed: " << e.what() << " at offset: " << std::cin.tellg() << "\n";
+		return EXIT_FAILURE;
+	}
+
+	custom_error_handler err;
+	validator.validate(document, err);
+
+	if (err) {
 		std::cerr << "schema validation failed\n";
-		std::cerr << e.what() << " at offset: " << std::cin.tellg() << "\n";
 		return EXIT_FAILURE;
 	}