rusty_json_schema 0.5.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08915b084567c0b3e6538c697087291a41a5503bbe746c6e9c779a1b83f889c
-  data.tar.gz: 4f80c40236138fc5f063e45a804b642470836190fb3defc6430bbb2972f91667
+  metadata.gz: 29f2fb5ead80040422387ea9ee95e400f8a48a3e376dcfc1755330d4db14a52a
+  data.tar.gz: 7588135d9a3f0cc439195f272f6f142937060282a43668681e5e8570d05317a1
 SHA512:
-  metadata.gz: 823b2666a7422de6d00ef4acab4d49844e94503000c31d3a16b213dd3b4ddf866d10d35bbdf2cd1700918deb038a5ad38cf01b4fd8291f5cbe96561c66ef40a8
-  data.tar.gz: ae9884e9efe7db0395e89cff031dcaccc71562259d1dafd6b77164629d0e9e6c4bb216382054f2ac2bf4a9c9fd3ec169657738b1f0b114b56d4609063694dba2
+  metadata.gz: 5ca5e12925de57af28fb53216313181409a9523e91414f711615d9ab4ea819c19e5be1ef76e0c6868942082e16263ac0ed5ff25867cb5f0a2a94ae3b87711dc1
+  data.tar.gz: e140c075a9d5e0d58dc7d391abf250c53704e9f5cb1bc14e742f5f31e57e1335a085b117b589ab1b6fab8520cfcd565078da1a7b86e92977f115f5a9f31f3458

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "json_schema"
-version = "0.5.0"
+version = "0.15.0"
 authors = ["Leszek Zalewski <leszekzalewski@fastmail.fm>"]
 edition = "2018"
 
@@ -9,6 +9,6 @@ name = "json_schema"
 crate-type = ["cdylib"]
 
 [dependencies]
-libc = "0.2.81"
-jsonschema = "0.5.0"
+libc = "0.2.121"
+jsonschema = "0.15.0"
 serde_json = "1.0"

data/README.md

@@ -47,7 +47,7 @@ To get validation errors
 
 ```ruby
 validator.validate(event_json)
-# => ["invalid...", ...]
+# => ["path \"...\": invalid...", ...]
 ```
 
 ## Development

data/lib/rusty_json_schema/validator.rb

@@ -17,10 +17,27 @@ module RustyJSONSchema
 
     # Simple validation without actual error messages
     #
+    # ## Examples
+    #
+    #     validator = RustyJSONSchema.build(json_schema)
+    #     validator.valid?(event)
+    #     # => false|true
+    #
     def valid?(event)
       Binding.is_valid(self, RustyJSONSchema.dump(event))
     end
 
+    # Full validation and error messages
+    #
+    # ## Examples
+    #
+    #     validator = RustyJSONSchema.build(json_schema)
+    #     validator.validate(event)
+    #     # => [
+    #     #   'path "/foo": "rusty" is not a "number"',
+    #     #   ...
+    #     # ]
+    #
     def validate(event)
       Binding.validate(self, RustyJSONSchema.dump(event)).to_a
     end

data/lib/rusty_json_schema/version.rb

@@ -2,6 +2,6 @@
 
 module RustyJSONSchema
 
-  VERSION = "0.5.0"
+  VERSION = "0.15.0"
 
 end

data/rusty_json_schema.gemspec

@@ -16,12 +16,13 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
     Currently during heavy development.
   STR
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["homepage_uri"]      = spec.homepage
-  spec.metadata["source_code_uri"]   = spec.homepage
-  spec.metadata["changelog_uri"]     = "https://github.com/driv3r/rusty_json_schema/blob/main/CHANGELOG.md"
+  spec.metadata["allowed_push_host"]     = "https://rubygems.org"
+  spec.metadata["homepage_uri"]          = spec.homepage
+  spec.metadata["source_code_uri"]       = spec.homepage
+  spec.metadata["changelog_uri"]         = "https://github.com/driv3r/rusty_json_schema/blob/main/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files = Dir[
     "lib/**/*",

data/src/lib.rs

@@ -7,29 +7,24 @@ use std::ffi::{CStr, CString};
 use std::os::raw::{c_char, c_uint};
 
 /*
- * Our wrapper struct for schema and schema value,
- * we need to hold onto value in order to not have
- * it freed up, as JSONSchema uses it as reference.
+ * Our wrapper struct for schema, we need to hold
+ * onto value in order to not have it freed up.
  */
 pub struct Validator {
-    schema: &'static JSONSchema<'static>,
-    schema_value: &'static Value,
+    schema: &'static JSONSchema,
 }
 
 impl Validator {
     /*
-     * With Box::leak we avoid freeing up of schema
-     * and schema value, we free them up separately
-     * in the Drop implementation
+     * With Box::leak we avoid freeing up of schema,
+     * we free them up separately in the Drop implementation
      */
     fn new(schema: Value) -> Validator {
-        let boxed_schema: &'static Value = Box::leak(Box::new(schema));
-        let boxed_compile: &'static JSONSchema<'static> =
-            Box::leak(Box::new(JSONSchema::compile(boxed_schema).unwrap()));
+        let boxed_compile: &'static JSONSchema =
+            Box::leak(Box::new(JSONSchema::compile(&schema).unwrap()));
 
         Validator {
             schema: boxed_compile,
-            schema_value: boxed_schema,
         }
     }
 
@@ -42,7 +37,12 @@ impl Validator {
 
         if let Err(validation_errors) = self.schema.validate(event) {
             for error in validation_errors {
-                errors.push(error.to_string());
+                let path = match format!("{}", error.instance_path).as_str() {
+                    "" => "/".to_string(),
+                    p => p.to_string(),
+                };
+
+                errors.push(format!("path \"{}\": {}", path, error));
             }
         }
 
@@ -58,7 +58,6 @@ impl Drop for Validator {
     fn drop(&mut self) {
         unsafe {
             Box::from_raw(self.schema as *const _ as *mut JSONSchema);
-            Box::from_raw(self.schema_value as *const _ as *mut Value);
         }
     }
 }
@@ -209,9 +208,9 @@ mod tests {
         let result = unsafe { helper_validate_result_as_vec(raw_result) };
 
         let expectation: Vec<String> = vec![
-            String::from("\'\"rusty\"\' is not of type \'number\'"),
-            String::from("\'1\' is not of type \'string\'"),
-            String::from("\'baz\' is a required property"),
+            String::from("path \"/bar\": \"rusty\" is not of type \"number\""),
+            String::from("path \"/foo\": 1 is not of type \"string\""),
+            String::from("path \"/\": \"baz\" is a required property"),
         ];
 
         assert_eq!(result, expectation);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusty_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Leszek Zalewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thermite
@@ -85,6 +85,7 @@ metadata:
   homepage_uri: https://github.com/driv3r/rusty_json_schema
   source_code_uri: https://github.com/driv3r/rusty_json_schema
   changelog_uri: https://github.com/driv3r/rusty_json_schema/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -93,15 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: FFI wrapper around jsonschema-rs Rust library.