rj_schema 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a67416e1ea1608900c2cb2eaaa4171700b66cc2ba041ff0c3b1238f4987a57b
-  data.tar.gz: faca49b0027dc70baf288ef5a2895db4515cf4caadbbbdf1be7ecb5f48741bcd
+  metadata.gz: 9b4465c406c185df39ae9a8c7cb0d27e6e0e0e5516a060482e6c07aee908ccac
+  data.tar.gz: be9ad80bd7a0d1840aa5730e46da6d8a1b839d74df4cab36bc777ec0307bed78
 SHA512:
-  metadata.gz: 732c91fc1e727478782f5f8570cb610f03a0f3c7f5b99d08935acb3c887255a853b1dd03e7a74e1c8014a2bf23787569d34978fe27743aa02f6f3a7549506b42
-  data.tar.gz: d16a2f482a2365dd15aae15240e726a8ffffeb148a56f81e8410cede5ca1fd033c928da902fa1e95b6984b4d078827b47b203086724ffca8ad9955bf252bf346
+  metadata.gz: e46aa197637d5b5bb026134b0eadcac0714ad65692b10479d69f93ccf49b10304a4ffdebf42a4925d7f6e9f11a814789f27a9bf48fc75d429e08e77513b2f5a7
+  data.tar.gz: fe08e34c5c1e06826109db6779918da9c386f64c6de040ca642749a73481e9c1e3bd70b797600e9a07da9afc52c28a729f6460755cee532a4190e274e7fd26c8

data/ext/rj_schema/rj_schema.cpp

@@ -8,13 +8,13 @@
 #include <rapidjson/filereadstream.h>
 #include <rapidjson/prettywriter.h>
 
-typedef std::unordered_map<std::string, rapidjson::SchemaDocument> RemoteSchemaCollection;
+typedef std::unordered_map<std::string, rapidjson::SchemaDocument> SchemaCollection;
 
-class RemoteSchemaDocumentProvider : public rapidjson::IRemoteSchemaDocumentProvider {
-	RemoteSchemaCollection* schema_collection;
+class SchemaDocumentProvider : public rapidjson::IRemoteSchemaDocumentProvider {
+	SchemaCollection* schema_collection;
 
 	public:
-		RemoteSchemaDocumentProvider(RemoteSchemaCollection* schema_collection) : schema_collection(schema_collection) { }
+		SchemaDocumentProvider(SchemaCollection* schema_collection) : schema_collection(schema_collection) { }
 		virtual const rapidjson::SchemaDocument* GetRemoteDocument(const char* uri, rapidjson::SizeType length) {
 			auto it = schema_collection->find(std::string(uri, length));
 			if (it == schema_collection->end())
@@ -23,10 +23,10 @@ class RemoteSchemaDocumentProvider : public rapidjson::IRemoteSchemaDocumentProv
 		}
 };
 
-struct RemoteSchemaManager {
-	RemoteSchemaCollection collection;
-	RemoteSchemaDocumentProvider provider;
-	RemoteSchemaManager() : provider(&collection) { }
+struct SchemaManager {
+	SchemaCollection collection;
+	SchemaDocumentProvider provider;
+	SchemaManager() : provider(&collection) { }
 };
 
 rapidjson::Document parse_document(VALUE arg) {
@@ -39,12 +39,9 @@ rapidjson::Document parse_document(VALUE arg) {
 		arg = rb_funcall(arg, rb_intern("to_json"), 0);
 	}
 
-	const char* json_document = StringValuePtr(arg);
-	auto length = RSTRING_LEN(arg);
-
 	rapidjson::Document document;
 
-	if (document.Parse(json_document, length).HasParseError())
+	if (document.Parse(StringValuePtr(arg), RSTRING_LEN(arg)).HasParseError())
 		throw std::invalid_argument("document is not valid JSON");
 
 	return document;
@@ -52,8 +49,8 @@ rapidjson::Document parse_document(VALUE arg) {
 
 VALUE perform_validation(VALUE self, VALUE schema_arg, VALUE document_arg, bool with_errors) {
 	try {
-		RemoteSchemaManager* schema_manager;
-		Data_Get_Struct(self, RemoteSchemaManager, schema_manager);
+		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 {
 			rapidjson::SchemaValidator validator(schema);
@@ -103,17 +100,17 @@ extern "C" VALUE validator_valid(VALUE self, VALUE schema_arg, VALUE document_ar
 	return perform_validation(self, schema_arg, document_arg, false);
 }
 
-extern "C" void validator_free(RemoteSchemaManager* schema_manager) {
+extern "C" void validator_free(SchemaManager* schema_manager) {
 	delete schema_manager;
 }
 
 extern "C" VALUE validator_alloc(VALUE self) {
-	auto* schema_manager = new RemoteSchemaManager;
+	auto* schema_manager = new SchemaManager;
 	return Data_Wrap_Struct(self, NULL, validator_free, schema_manager);
 }
 
 extern "C" int validator_initialize_load_schema(VALUE key, VALUE value, VALUE input) {
-	auto* schema_manager = reinterpret_cast<RemoteSchemaManager*>(input);
+	auto* schema_manager = reinterpret_cast<SchemaManager*>(input);
 
 	try {
 		schema_manager->collection.emplace(
@@ -137,8 +134,8 @@ extern "C" VALUE validator_initialize(int argc, VALUE* argv, VALUE self) {
 	if (argc == 0)
 		return self;
 
-	RemoteSchemaManager* schema_manager;
-	Data_Get_Struct(self, RemoteSchemaManager, schema_manager);
+	SchemaManager* schema_manager;
+	Data_Get_Struct(self, SchemaManager, schema_manager);
 
 	rb_hash_foreach(argv[0], reinterpret_cast<int(*)(...)>(validator_initialize_load_schema), reinterpret_cast<VALUE>(schema_manager));
 

data/lib/rj_schema.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 class RjSchema
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 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.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Christian Semmler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler