rj_schema 0.2.6 → 1.0.3

data/ext/rj_schema/rapidjson/test/unittest/valuetest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
@@ -1078,9 +1078,9 @@ static void TestArray(T& x, Allocator& allocator) {
 }
 
 TEST(Value, Array) {
+    Value::AllocatorType allocator;
     Value x(kArrayType);
     const Value& y = x;
-    Value::AllocatorType allocator;
 
     EXPECT_EQ(kArrayType, x.GetType());
     EXPECT_TRUE(x.IsArray());
@@ -1119,6 +1119,16 @@ TEST(Value, Array) {
     z.SetArray();
     EXPECT_TRUE(z.IsArray());
     EXPECT_TRUE(z.Empty());
+
+    // PR #1503: assign from inner Value
+    {
+        CrtAllocator a; // Free() is not a noop
+        GenericValue<UTF8<>, CrtAllocator> nullValue;
+        GenericValue<UTF8<>, CrtAllocator> arrayValue(kArrayType);
+        arrayValue.PushBack(nullValue, a);
+        arrayValue = arrayValue[0]; // shouldn't crash (use after free)
+        EXPECT_TRUE(arrayValue.IsNull());
+    }
 }
 
 TEST(Value, ArrayHelper) {
@@ -1481,9 +1491,9 @@ static void TestObject(T& x, Allocator& allocator) {
 }
 
 TEST(Value, Object) {
+    Value::AllocatorType allocator;
     Value x(kObjectType);
     const Value& y = x; // const version
-    Value::AllocatorType allocator;
 
     EXPECT_EQ(kObjectType, x.GetType());
     EXPECT_TRUE(x.IsObject());

data/ext/rj_schema/rapidjson/test/unittest/writertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rj_schema.cpp

@@ -9,10 +9,11 @@
 #endif
 
 #include <unordered_map>
+#include <sstream>
 #include <ruby.h>
 #include <ruby/version.h>
 
-#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 7)) && defined(__GLIBC__)
+#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 7)) && !defined(TRUFFLERUBY)
 namespace std {
 	static inline void* ruby_nonempty_memcpy(void *dest, const void *src, size_t n) {
 		return ::ruby_nonempty_memcpy(dest, src, n);
@@ -25,8 +26,11 @@ namespace std {
 
 #include <rapidjson/schema.h>
 #include <rapidjson/filereadstream.h>
-#include <rapidjson/prettywriter.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/error/error.h>
+#include <rapidjson/error/en.h>
 
+typedef rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator> ErrorType;
 typedef std::unordered_map<std::string, VALUE> SchemaInput;
 typedef std::unordered_map<ID, rapidjson::SchemaDocument> SchemaCollection;
 struct SchemaManager;
@@ -93,25 +97,149 @@ const rapidjson::SchemaDocument* SchemaManager::provide(const char* uri, rapidjs
 	throw std::invalid_argument(std::string("$ref remote schema not provided: ") + uri);
 }
 
-VALUE perform_validation(VALUE self, VALUE schema_arg, VALUE document_arg, bool with_errors) {
+static void CreateHumanErrorMessages(std::ostringstream& ss, const ErrorType& errors, size_t depth = 0, const char* context = 0) {
+	auto get_string = [](const ErrorType& val) -> std::string {
+		if (val.IsString())
+			return val.GetString();
+		else if (val.IsDouble())
+			return std::to_string(val.GetDouble());
+		else if (val.IsUint())
+			return std::to_string(val.GetUint());
+		else if (val.IsInt())
+			return std::to_string(val.GetInt());
+		else if (val.IsUint64())
+			return std::to_string(val.GetUint64());
+		else if (val.IsInt64())
+			return std::to_string(val.GetInt64());
+		else if (val.IsBool() && val.GetBool())
+			return "true";
+		else if (val.IsBool())
+			return "false";
+		else if (val.IsFloat())
+			return std::to_string(val.GetFloat());
+		return "";
+	};
+
+	auto handle_error = [&ss, &get_string](const char* errorName, const ErrorType& error, size_t depth, const char* context) {
+		if (!error.ObjectEmpty()) {
+			int code = error["errorCode"].GetInt();
+			std::string message(GetValidateError_En(static_cast<rapidjson::ValidateErrorCode>(code)));
+
+			for (const auto& member : error.GetObject()) {
+				std::string insertName("%");
+				insertName += member.name.GetString();
+				std::size_t insertPos = message.find(insertName);
+
+				if (insertPos != std::string::npos) {
+					std::string insertString("");
+					const ErrorType& insert = member.value;
+
+					if (insert.IsArray()) {
+						for (ErrorType::ConstValueIterator itemsItr = insert.Begin(); itemsItr != insert.End(); ++itemsItr) {
+							if (itemsItr != insert.Begin())
+								insertString += ",";
+
+							insertString += get_string(*itemsItr);
+						}
+					}
+					else {
+						insertString += get_string(insert);
+					}
+
+					message.replace(insertPos, insertName.length(), insertString);
+				}
+			}
+
+			std::string indent(depth * 2, ' ');
+			ss << indent << "Error Name: " << errorName << std::endl;
+			ss << indent << "Message: " << message << std::endl;
+			ss << indent << "Instance: " << error["instanceRef"].GetString() << std::endl;
+			ss << indent << "Schema: " << error["schemaRef"].GetString() << std::endl;
+			if (depth > 0)
+				ss << indent << "Context: " << context << std::endl;
+			ss << std::endl;
+
+			if (error.HasMember("errors")) {
+				depth++;
+				const ErrorType& childErrors = error["errors"];
+
+				if (childErrors.IsArray()) {
+					for (const auto& item : childErrors.GetArray()) {
+						CreateHumanErrorMessages(ss, item, depth, errorName);
+					}
+				}
+				else if (childErrors.IsObject()) {
+					for (const auto& member : childErrors.GetObject()) {
+						CreateHumanErrorMessages(ss, member.value, depth, errorName);
+					}
+				}
+			}
+		}
+	};
+
+	for (const auto& member : errors.GetObject()) {
+		const char* errorName = member.name.GetString();
+		const ErrorType& errorContent = member.value;
+
+		if (errorContent.IsArray()) {
+			for (const auto& item : errorContent.GetArray()) {
+				handle_error(errorName, item, depth, context);
+			}
+		}
+		else if (errorContent.IsObject()) {
+			handle_error(errorName, errorContent, depth, context);
+		}
+	}
+}
+
+VALUE perform_validation(VALUE self, VALUE schema_arg, VALUE document_arg, VALUE continue_on_error, VALUE machine_errors, VALUE human_errors) {
+	if (continue_on_error == Qnil)
+		continue_on_error = Qfalse;
+	if (machine_errors == Qnil)
+		machine_errors = Qtrue;
+	if (human_errors == Qnil)
+		human_errors = Qfalse;
+
 	try {
 		SchemaManager* schema_manager;
 		Data_Get_Struct(self, SchemaManager, schema_manager);
+
 		auto document = parse_document(document_arg);
-		auto validate = [with_errors, &document](const rapidjson::SchemaDocument& schema) -> VALUE {
+		auto validate = [&continue_on_error, &machine_errors, &human_errors, &document](const rapidjson::SchemaDocument& schema) -> VALUE {
 			rapidjson::SchemaValidator validator(schema);
-			if (document.Accept(validator)) {
-				return with_errors ? rb_ary_new() : Qtrue;
-			}
-			else {
-				if (!with_errors)
-					return Qfalse;
+
+			if (continue_on_error == Qtrue)
+				validator.SetValidateFlags(rapidjson::RAPIDJSON_VALIDATE_DEFAULT_FLAGS | rapidjson::kValidateContinueOnErrorFlag);
+
+			document.Accept(validator);
+
+			if (machine_errors == Qfalse && human_errors == Qfalse)
+				return validator.IsValid() ? Qtrue : Qfalse;
+
+			VALUE result = rb_hash_new();
+
+			if (machine_errors == Qtrue) {
 				rapidjson::StringBuffer buffer;
-				rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
+				rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
 				validator.GetError().Accept(writer);
-				VALUE errors = rb_funcall(rb_const_get(rb_cObject, rb_intern("JSON")), rb_intern("parse"), 1, rb_str_new_cstr(buffer.GetString()));
-				return RB_TYPE_P(errors, T_HASH) ? rb_ary_new4(1, &errors) : errors;
+				rb_hash_aset(
+				  result,
+				  ID2SYM(rb_intern("machine_errors")),
+				  rb_funcall(rb_const_get(rb_cObject, rb_intern("JSON")), rb_intern("parse"), 1, rb_str_new_cstr(buffer.GetString()))
+				);
+			}
+
+			if (human_errors == Qtrue) {
+				std::ostringstream ss;
+				CreateHumanErrorMessages(ss, validator.GetError());
+				rb_hash_aset(
+				  result,
+				  ID2SYM(rb_intern("human_errors")),
+				  rb_str_new_cstr(ss.str().c_str())
+				);
 			}
+
+			return result;
 		};
 
 		if (SYMBOL_P(schema_arg)) {
@@ -135,12 +263,28 @@ VALUE perform_validation(VALUE self, VALUE schema_arg, VALUE document_arg, bool
 	}
 }
 
-extern "C" VALUE validator_validate(VALUE self, VALUE schema_arg, VALUE document_arg) {
-	return perform_validation(self, schema_arg, document_arg, true);
+extern "C" VALUE validator_validate(int argc, VALUE* argv, VALUE self) {
+	VALUE schema_arg, document_arg, opts;
+
+	rb_scan_args(argc, argv, "2:", &schema_arg, &document_arg, &opts);
+
+	if (NIL_P(opts))
+		opts = rb_hash_new();
+
+	VALUE result = perform_validation(
+	  self,
+	  schema_arg,
+	  document_arg,
+	  rb_hash_aref(opts, ID2SYM(rb_intern("continue_on_error"))),
+	  rb_hash_aref(opts, ID2SYM(rb_intern("machine_errors"))),
+	  rb_hash_aref(opts, ID2SYM(rb_intern("human_errors")))
+	);
+
+	return (result == Qtrue || result == Qfalse) ? rb_hash_new() : result;
 }
 
 extern "C" VALUE validator_valid(VALUE self, VALUE schema_arg, VALUE document_arg) {
-	return perform_validation(self, schema_arg, document_arg, false);
+	return perform_validation(self, schema_arg, document_arg, Qfalse, Qfalse, Qfalse);
 }
 
 extern "C" void validator_free(SchemaManager* schema_manager) {
@@ -191,6 +335,6 @@ extern "C" void Init_rj_schema(void) {
 
 	rb_define_alloc_func(cValidator, validator_alloc);
 	rb_define_method(cValidator, "initialize", reinterpret_cast<VALUE(*)(...)>(validator_initialize), -1);
-	rb_define_method(cValidator, "validate", reinterpret_cast<VALUE(*)(...)>(validator_validate), 2);
+	rb_define_method(cValidator, "validate", reinterpret_cast<VALUE(*)(...)>(validator_validate), -1);
 	rb_define_method(cValidator, "valid?", reinterpret_cast<VALUE(*)(...)>(validator_valid), 2);
 }

data/lib/rj_schema.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 class RjSchema
-  VERSION = '0.2.6'
+  VERSION = '1.0.3'
 end
 
 require 'rj_schema/rj_schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rj_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.0.3
 platform: ruby
 authors:
 - Christian Semmler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -231,6 +231,7 @@ files:
 - ext/rj_schema/rapidjson/bin/jsonschema/tests/draft4/type.json
 - ext/rj_schema/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
 - ext/rj_schema/rapidjson/bin/jsonschema/tox.ini
+- ext/rj_schema/rapidjson/bin/types/alotofkeys.json
 - ext/rj_schema/rapidjson/bin/types/booleans.json
 - ext/rj_schema/rapidjson/bin/types/floats.json
 - ext/rj_schema/rapidjson/bin/types/guids.json
@@ -239,6 +240,11 @@ files:
 - ext/rj_schema/rapidjson/bin/types/nulls.json
 - ext/rj_schema/rapidjson/bin/types/paragraphs.json
 - ext/rj_schema/rapidjson/bin/types/readme.txt
+- ext/rj_schema/rapidjson/bin/unittestschema/address.json
+- ext/rj_schema/rapidjson/bin/unittestschema/allOf_address.json
+- ext/rj_schema/rapidjson/bin/unittestschema/anyOf_address.json
+- ext/rj_schema/rapidjson/bin/unittestschema/idandref.json
+- ext/rj_schema/rapidjson/bin/unittestschema/oneOf_address.json
 - ext/rj_schema/rapidjson/contrib/natvis/LICENSE
 - ext/rj_schema/rapidjson/contrib/natvis/README.md
 - ext/rj_schema/rapidjson/contrib/natvis/rapidjson.natvis
@@ -317,6 +323,7 @@ files:
 - ext/rj_schema/rapidjson/example/simplereader/simplereader.cpp
 - ext/rj_schema/rapidjson/example/simplewriter/simplewriter.cpp
 - ext/rj_schema/rapidjson/example/sortkeys/sortkeys.cpp
+- ext/rj_schema/rapidjson/example/traverseaspointer.cpp
 - ext/rj_schema/rapidjson/example/tutorial/tutorial.cpp
 - ext/rj_schema/rapidjson/include/rapidjson/allocators.h
 - ext/rj_schema/rapidjson/include/rapidjson/cursorstreamwrapper.h
@@ -354,6 +361,7 @@ files:
 - ext/rj_schema/rapidjson/include/rapidjson/schema.h
 - ext/rj_schema/rapidjson/include/rapidjson/stream.h
 - ext/rj_schema/rapidjson/include/rapidjson/stringbuffer.h
+- ext/rj_schema/rapidjson/include/rapidjson/uri.h
 - ext/rj_schema/rapidjson/include/rapidjson/writer.h
 - ext/rj_schema/rapidjson/include_dirs.js
 - ext/rj_schema/rapidjson/library.json
@@ -373,6 +381,7 @@ files:
 - ext/rj_schema/rapidjson/test/unittest/CMakeLists.txt
 - ext/rj_schema/rapidjson/test/unittest/allocatorstest.cpp
 - ext/rj_schema/rapidjson/test/unittest/bigintegertest.cpp
+- ext/rj_schema/rapidjson/test/unittest/clzlltest.cpp
 - ext/rj_schema/rapidjson/test/unittest/cursorstreamwrappertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/documenttest.cpp
 - ext/rj_schema/rapidjson/test/unittest/dtoatest.cpp
@@ -385,6 +394,7 @@ files:
 - ext/rj_schema/rapidjson/test/unittest/jsoncheckertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/namespacetest.cpp
 - ext/rj_schema/rapidjson/test/unittest/ostreamwrappertest.cpp
+- ext/rj_schema/rapidjson/test/unittest/platformtest.cpp
 - ext/rj_schema/rapidjson/test/unittest/pointertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/prettywritertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/readertest.cpp
@@ -396,6 +406,7 @@ files:
 - ext/rj_schema/rapidjson/test/unittest/strtodtest.cpp
 - ext/rj_schema/rapidjson/test/unittest/unittest.cpp
 - ext/rj_schema/rapidjson/test/unittest/unittest.h
+- ext/rj_schema/rapidjson/test/unittest/uritest.cpp
 - ext/rj_schema/rapidjson/test/unittest/valuetest.cpp
 - ext/rj_schema/rapidjson/test/unittest/writertest.cpp
 - ext/rj_schema/rapidjson/test/valgrind.supp
@@ -737,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: JSON schema validation with RapidJSON