rj_schema 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2182b7542e9cddebeff0ff48ebb1ab8a7bf1b6469c1d8e6d4fd4ae2fa5c427
-  data.tar.gz: 773e1dc3ca67f29f37fe466d9cb07e56ebf400394bb6f294642cc917283b6cd4
+  metadata.gz: 63c4400e2d664fec17f2c334e8a73d1ecb016fdc741770445a2da3dc11fa2663
+  data.tar.gz: c053fcfb64541aa5cc5117b10607e07e2bc358a81cf3b6d05da7f1d1623b2165
 SHA512:
-  metadata.gz: 4057db9510a3eb7276b7d4d408b6ac74c6806290fad5fae52581987ca1e5be6c23efe5885f1c773a509260c5d45c627e0a93c942a5fc4e862d514df20944c259
-  data.tar.gz: f4e4d2e501f4e5d1c882fadd192e14514425153d7bb75554879dc79b9c66d317785591b512d7daaa44b0d47169fd010ebd4bb212b2aad11a7590f448080aa4fe
+  metadata.gz: c54993fbfdfe94fc4b9d4fb2bfde3608aaaeb61fd3cc944dc5cbe72b3a5d1bf29418e93816e883993ce9750e454d6bf426fa72daabd3055758de65b0dbb1e34f
+  data.tar.gz: 6c3295339208e03a8d4ddf3c1d4f81c39ae90514dc1c41c240c7395d534520a482c26922632f9f1204e3f4c56f46918af4802f61232e43ad09219a0a103c4ca4

data/ext/rj_schema/rj_schema.cpp

@@ -10,16 +10,6 @@
 
 #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(TRUFFLERUBY)
-namespace std {
-	static inline void* ruby_nonempty_memcpy(void *dest, const void *src, size_t n) {
-		return ::ruby_nonempty_memcpy(dest, src, n);
-	}
-};
-#endif
 
 #define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
 #define RAPIDJSON_SCHEMA_USE_STDREGEX 1
@@ -30,6 +20,11 @@ namespace std {
 #include <rapidjson/error/error.h>
 #include <rapidjson/error/en.h>
 
+#include <ruby.h>
+#include <ruby/version.h>
+
+#include <cstdio>
+
 typedef rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator> ErrorType;
 typedef std::unordered_map<std::string, VALUE> SchemaInput;
 typedef std::unordered_map<ID, rapidjson::SchemaDocument> SchemaCollection;
@@ -263,6 +258,55 @@ VALUE perform_validation(VALUE self, VALUE schema_arg, VALUE document_arg, VALUE
 	}
 }
 
+VALUE perform_sax_validation(VALUE self, VALUE schema_arg, VALUE file_arg) {
+	SchemaManager* schema_manager;
+	Data_Get_Struct(self, SchemaManager, schema_manager);
+
+	auto validate = [&file_arg](const rapidjson::SchemaDocument& schema) -> VALUE {
+		rapidjson::SchemaValidator validator(schema);
+		char buffer[4096];
+		FILE* fp = std::fopen(StringValuePtr(file_arg), "r");
+
+		if (!fp) {
+			rb_raise(rb_eArgError, "file not found: %s", StringValuePtr(file_arg));
+			return -1;
+		}
+
+		rapidjson::Reader reader;
+		rapidjson::FileReadStream is(fp, buffer, sizeof(buffer));
+
+		if (!reader.Parse(is, validator)) {
+    	if (validator.IsValid()) {
+				std::fclose(fp);
+				return Qtrue;
+			} else {
+				std::fclose(fp);
+				return Qfalse;
+			}
+		}
+
+		std::fclose(fp);
+		return Qtrue;
+	};
+
+	if (SYMBOL_P(schema_arg)) {
+		auto it = schema_manager->collection.find(SYM2ID(schema_arg));
+		if (it == schema_manager->collection.end())
+			rb_raise(rb_eArgError, "schema not found: %s", rb_id2name(SYM2ID(schema_arg)));
+		return validate(it->second);
+	}
+	else {
+		auto schema = rapidjson::SchemaDocument(
+			parse_document(schema_arg),
+			0,
+			0,
+			&schema_manager->provider
+		);
+		return validate(schema);
+	}
+}
+
+
 extern "C" VALUE validator_validate(int argc, VALUE* argv, VALUE self) {
 	VALUE schema_arg, document_arg, opts;
 
@@ -287,6 +331,10 @@ extern "C" VALUE validator_valid(VALUE self, VALUE schema_arg, VALUE document_ar
 	return perform_validation(self, schema_arg, document_arg, Qfalse, Qfalse, Qfalse);
 }
 
+extern "C" VALUE validator_sax_valid(VALUE self, VALUE schema_arg, VALUE file_arg) {
+	return perform_sax_validation(self, schema_arg, file_arg);
+}
+
 extern "C" void validator_free(SchemaManager* schema_manager) {
 	delete schema_manager;
 }
@@ -337,4 +385,5 @@ extern "C" void Init_rj_schema(void) {
 	rb_define_method(cValidator, "initialize", reinterpret_cast<VALUE(*)(...)>(validator_initialize), -1);
 	rb_define_method(cValidator, "validate", reinterpret_cast<VALUE(*)(...)>(validator_validate), -1);
 	rb_define_method(cValidator, "valid?", reinterpret_cast<VALUE(*)(...)>(validator_valid), 2);
+	rb_define_method(cValidator, "sax_valid?", reinterpret_cast<VALUE(*)(...)>(validator_sax_valid), 2);
 }

data/lib/rj_schema.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rj_schema
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Christian Semmler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -748,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: JSON schema validation with RapidJSON