jsonschema_rs 0.57.0 → 0.58.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11217286a118f4602ff911fcb2b4bd68810935fd7bf08fcffdd6ad906804683f
-  data.tar.gz: cdbf9193f44e167d360fd34032089368d86dc6971f87fe7118da6549b46efd36
+  metadata.gz: 3d103456dca13639e36727ecaf9167a8987ed63700a9bc4ff3c1bca7cc63f8cb
+  data.tar.gz: 7c039aab47da8511612717a0c99d2b88ae31ecf1e7a12ea3bc1543b65ff9d8dc
 SHA512:
-  metadata.gz: '0875f5b26b56167b3e71a6278620d72db85ea80d5c8b14fa44197c5cfc36b12ec85703c809ed07bd5bb847dcebfc018a18cecb1d5727c05809ff50af3903a85d'
-  data.tar.gz: 537158f7caeba6c57e103b6630869cd78b929c2e3ffee0e12c7b267797b89449fb97446d7d163040e65a9e39c9d1916e61e298441ccb01ea90061d447a923033
+  metadata.gz: e7236e4000dd7689d44b1acdd46706100626e9cc5c4530a3572d46a9cf0321ba11f22f20c39dfa99966b487d67cbf792fc56ced20ade29e8bf5bab9dda8b6c53
+  data.tar.gz: 0a795afa9e35a5d7f1a9c2dfdef3b6c24120af1908269fe4b71c53ba662a13a49a15d244c17ab122fff705a0e69325efccefd7f449bf72aa0627f4f349bfc7f0

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## [Unreleased]
 
+## [0.58.1] - 2026-09-26
+
+### Performance
+
+- `uri` and `uri-reference` formats check the syntax directly instead of parsing each value into a URI.
+
+## [0.58.0] - 2026-09-25
+
+### Performance
+
+- `oneOf` and `anyOf` whose branches each require a property fixed to a distinct string validate only the branch matching the instance's value.
+- `Meta.valid?` and `Meta.validate!` check a schema against the bundled drafts without converting it first, 2 to 5x faster on the benchmarked schemas.
+
+### Fixed
+
+- `Canonical.find_unsatisfiable` missing a `oneOf` over `$ref` branches beside a sibling none of them admits.
+- A value with no JSON form nested under `type: null` failing validation silently (it should raise `TypeError`).
+
 ## [0.57.0] - 2026-09-22
 
 ### Added
@@ -577,7 +595,9 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.57.0...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.58.1...HEAD
+[0.58.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.58.0...ruby-v0.58.1
+[0.58.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.57.0...ruby-v0.58.0
 [0.57.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.56.0...ruby-v0.57.0
 [0.56.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.55.1...ruby-v0.56.0
 [0.55.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.55.0...ruby-v0.55.1

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb"
-version = "0.57.0"
+version = "0.58.1"
 edition = "2021"
 authors = ["Dmitry Dygalo <dmitry@dygalo.dev>"]
 license = "MIT"
@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 strum = "0.28.0"
-jsonschema = { version = "0.57.0", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros", "idna"] }
+jsonschema = { version = "0.58.1", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros", "idna"] }
 magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = "0.9"
 serde = { workspace = true }

data/README.md

@@ -700,6 +700,18 @@ Valid draft symbols: `:draft4`, `:draft6`, `:draft7`, `:draft201909`, `:draft202
 
 For detailed benchmarks, see our [full performance comparison](https://github.com/Stranger6667/jsonschema/blob/master/crates/jsonschema-rb/BENCHMARKS.md).
 
+### Compile-Time Validators
+
+If you ship your own extension and know the schema at build time, the Rust crate's
+`#[jsonschema::validator(..., backend = Magnus)]` macro compiles it into a validator that reads
+Ruby objects directly, so nothing is parsed or compiled when your extension is loaded, and
+validation runs up to 3.5x faster than with a validator built at run time. See the
+[macro documentation](https://docs.rs/jsonschema/latest/jsonschema/#ruby-extension-modules).
+
+This is not available from the `jsonschema_rs` gem, which takes its schemas at run time.
+A complete extension with its build and test commands lives in
+[`examples/magnus-extension`](https://github.com/Stranger6667/jsonschema/tree/master/examples/magnus-extension).
+
 ## Acknowledgements
 
 This library draws API design inspiration from the Python [`jsonschema`](https://github.com/python-jsonschema/jsonschema) package. We're grateful to the Python `jsonschema` maintainers and contributors for their pioneering work in JSON Schema validation.

data/ext/jsonschema/Cargo.lock

@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71160ed5f6dbe36a2d6be79f4ca03ee09a99d2866f340faed49458913449aefa"
+checksum = "0a083dc3204bad08c6654f3648b2e840668d843044605df8850b16d2b24d307f"
 dependencies = [
  "ahash",
  "bytecount",
@@ -709,6 +709,7 @@ dependencies = [
  "jsonschema-macros",
  "jsonschema-regex",
  "jsonschema-value",
+ "magnus",
  "num-bigint",
  "num-cmp",
  "num-traits",
@@ -726,9 +727,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5421caa3ea97392a353a9bc57b33ac844a6a128f4c3d11ac6c12cc462072ac"
+checksum = "3d4122586f4bc6260bc1daf3782617bb4bce181df639ab379b2ba0e911882ed2"
 dependencies = [
  "jsonschema-macros-core",
  "proc-macro2",
@@ -736,9 +737,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros-core"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c1e51f90029687e9fe880db5ff56b1a99e66eef2464a862f7a8408aed851168"
+checksum = "846b779b6a48769d491d2c44ebf57ad04f27a6d1edbe9e7f257926d57c98e739"
 dependencies = [
  "fancy-regex",
  "indexmap",
@@ -755,7 +756,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.57.0"
+version = "0.58.1"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -769,18 +770,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d2120d8466ffcdc1b3be4b88ff0e9191bf5b6b09b1b1af1eef9aff8f465ea3"
+checksum = "655372e8fbbefa3e5bd9b7397b4937bf75b4a71f1f84d85122cbd7758b57c8b0"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbfa40a42415369d940b3848f3ce08099f1f1ac04d73e8580f4d652617c4f44"
+checksum = "0a6ed45167e78187301842eab0510c7dd5d7e7d065d275ef0fe01ddd25f6607b"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1135,9 +1136,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06f6798be4fed305e74df8b1fb90cf59c6b8cc17aa3febeb1830c0c6b627b3e"
+checksum = "c9bf6d3c834f2614907b0fd413854581ecb48f0a713ea5d6cdfbce36f24e700e"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb-ext"
-version = "0.57.0"
+version = "0.58.1"
 edition = "2021"
 publish = false
 
@@ -10,10 +10,10 @@ name = "jsonschema_rb"
 path = "../../src/lib.rs"
 
 [dependencies]
-jsonschema = { version = "0.57.0", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros", "idna"] }
+jsonschema = { version = "0.58.1", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros", "idna"] }
 magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = "0.9"
-referencing = "0.57.0"
+referencing = "0.58.1"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["arbitrary_precision"] }
 strum = "0.28.0"

data/lib/jsonschema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSchema
-  VERSION = "0.57.0"
+  VERSION = "0.58.1"
 end

data/src/lib.rs

@@ -18,7 +18,7 @@ mod validator_map;
 use jsonschema::{
     json::{
         magnus_child, magnus_invalidate_members_cache, magnus_is_object, magnus_probe_root,
-        magnus_take_pending_error, Magnus, MagnusPendingErrorScope, PendingError, RbNode,
+        magnus_take_pending_error, Magnus, MagnusPendingErrorScope, RbNode,
     },
     paths::LocationSegment,
     ValidationOptions,
@@ -550,19 +550,10 @@ fn handle_callback_panic(ruby: &Ruby, err: Box<dyn std::any::Any + Send>) -> Err
     })
 }
 
-fn pending_error_to_ruby(ruby: &Ruby, error: PendingError) -> Error {
-    match error {
-        PendingError::Type(message) => Error::new(ruby.exception_type_error(), message),
-        PendingError::Encoding(message) => Error::new(ruby.exception_encoding_error(), message),
-        PendingError::Argument(message) => Error::new(ruby.exception_arg_error(), message),
-    }
-}
-
 /// Run validation over `instance` in place, raising anything the representation could only record.
 ///
 /// Accessors cannot fail, so a value the representation cannot read is stashed and surfaced here.
 fn surface_pending_errors<T>(
-    ruby: &Ruby,
     instance: Value,
     run: impl FnOnce(RbNode<'_>) -> Result<T, Error>,
 ) -> Result<T, Error> {
@@ -573,11 +564,11 @@ fn surface_pending_errors<T>(
     let node = RbNode::new(instance.as_raw());
     magnus_probe_root(node);
     if let Some(error) = magnus_take_pending_error() {
-        return Err(pending_error_to_ruby(ruby, error));
+        return Err(Error::from(error));
     }
     let result = run(node)?;
     if let Some(error) = magnus_take_pending_error() {
-        return Err(pending_error_to_ruby(ruby, error));
+        return Err(Error::from(error));
     }
     Ok(result)
 }
@@ -633,14 +624,14 @@ impl Validator {
     }
 
     fn is_valid(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<bool, Error> {
-        surface_pending_errors(ruby, instance, |node| {
+        surface_pending_errors(instance, |node| {
             let result = catch_unwind_silent(AssertUnwindSafe(|| rb_self.validator.is_valid(node)));
             result.map_err(|err| handle_callback_panic(ruby, err))
         })
     }
 
     fn validate(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<(), Error> {
-        surface_pending_errors(ruby, instance, |node| {
+        surface_pending_errors(instance, |node| {
             let _scope = KeywordCauseScope::enter();
             let result = catch_unwind_silent(AssertUnwindSafe(|| rb_self.validator.validate(node)));
             match result {
@@ -657,7 +648,7 @@ impl Validator {
     }
 
     fn iter_errors(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<Value, Error> {
-        surface_pending_errors(ruby, instance, |node| {
+        surface_pending_errors(instance, |node| {
             let _scope = KeywordCauseScope::enter();
 
             if ruby.block_given() {
@@ -704,7 +695,7 @@ impl Validator {
     }
 
     fn evaluate(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<Evaluation, Error> {
-        surface_pending_errors(ruby, instance, |node| {
+        surface_pending_errors(instance, |node| {
             let _scope = KeywordCauseScope::enter();
             let result = catch_unwind_silent(AssertUnwindSafe(|| rb_self.validator.evaluate(node)));
             match result {
@@ -923,7 +914,7 @@ fn is_valid(ruby: &Ruby, args: &[Value]) -> Result<bool, Error> {
         &json_schema,
     )?;
 
-    surface_pending_errors(ruby, instance, |node| {
+    surface_pending_errors(instance, |node| {
         let _callback_roots =
             has_ruby_callbacks.then(|| CallbackRootGuard::new(ruby, &callback_roots));
         catch_unwind_silent(AssertUnwindSafe(|| validator.is_valid(node)))
@@ -954,7 +945,7 @@ fn validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
         &json_schema,
     )?;
 
-    surface_pending_errors(ruby, instance, |node| {
+    surface_pending_errors(instance, |node| {
         let _callback_roots =
             has_ruby_callbacks.then(|| CallbackRootGuard::new(ruby, &callback_roots));
         match catch_unwind_silent(AssertUnwindSafe(|| validator.validate(node))) {
@@ -993,7 +984,7 @@ fn each_error(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
         &json_schema,
     )?;
 
-    surface_pending_errors(ruby, instance, |node| {
+    surface_pending_errors(instance, |node| {
         let _callback_roots =
             has_ruby_callbacks.then(|| CallbackRootGuard::new(ruby, &callback_roots));
 
@@ -1057,7 +1048,7 @@ fn evaluate(ruby: &Ruby, args: &[Value]) -> Result<Evaluation, Error> {
         &json_schema,
     )?;
 
-    surface_pending_errors(ruby, instance, |node| {
+    surface_pending_errors(instance, |node| {
         let _callback_roots =
             has_ruby_callbacks.then(|| CallbackRootGuard::new(ruby, &callback_roots));
         match catch_unwind_silent(AssertUnwindSafe(|| validator.evaluate(node))) {
@@ -1161,24 +1152,40 @@ define_draft_validator!(
     jsonschema::Draft::Draft202012
 );
 
-fn meta_is_valid(ruby: &Ruby, args: &[Value]) -> Result<bool, Error> {
-    use magnus::scan_args::get_kwargs;
-    let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
-    let (schema,) = parsed_args.required;
-    let kw: magnus::scan_args::KwArgs<(), (Option<Option<&Registry>>,), ()> =
-        get_kwargs(parsed_args.keywords, &[], &[*options::KW_REGISTRY])?;
-    let registry = kw.optional.0.flatten();
+// A Ruby string holds JSON text; anything else is read in place.
+fn json_text_schema(schema: Value) -> Option<serde_json::Value> {
+    let rstring = RString::from_value(schema)?;
+    #[allow(unsafe_code)]
+    let bytes = unsafe { rstring.as_slice() };
+    serde_json::from_slice(bytes).ok()
+}
 
-    let json_schema = to_schema_value(ruby, schema)?;
+// The bundled meta-schemas are compiled in and read the Ruby object in place; `None` sends a
+// `$schema` outside them through its chain.
+fn compiled_meta_is_valid(schema: Value) -> Option<Result<bool, Error>> {
+    #[allow(unsafe_code)]
+    let node = RbNode::new(schema.as_raw());
+    match jsonschema::meta::magnus::draft_of(node) {
+        jsonschema::Draft::Unknown => None,
+        draft => Some(jsonschema::meta::magnus::is_valid_fn(draft)(&schema)),
+    }
+}
 
-    let result = if let Some(registry) = registry {
-        jsonschema::meta::options()
-            .with_registry(registry.inner.as_ref())
-            .validate(&json_schema)
-    } else {
-        jsonschema::meta::validate(&json_schema)
-    };
+fn compiled_meta_validate(
+    schema: &Value,
+) -> Option<Result<Result<(), jsonschema::ValidationError<'_>>, Error>> {
+    #[allow(unsafe_code)]
+    let node = RbNode::new(schema.as_raw());
+    match jsonschema::meta::magnus::draft_of(node) {
+        jsonschema::Draft::Unknown => None,
+        draft => Some(jsonschema::meta::magnus::validate_fn(draft)(schema)),
+    }
+}
 
+fn meta_result_to_bool(
+    ruby: &Ruby,
+    result: Result<(), jsonschema::ValidationError<'_>>,
+) -> Result<bool, Error> {
     match result {
         Ok(()) => Ok(true),
         Err(error) => {
@@ -1190,7 +1197,7 @@ fn meta_is_valid(ruby: &Ruby, args: &[Value]) -> Result<bool, Error> {
     }
 }
 
-fn meta_validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
+fn meta_is_valid(ruby: &Ruby, args: &[Value]) -> Result<bool, Error> {
     use magnus::scan_args::get_kwargs;
     let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (schema,) = parsed_args.required;
@@ -1198,27 +1205,59 @@ fn meta_validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
         get_kwargs(parsed_args.keywords, &[], &[*options::KW_REGISTRY])?;
     let registry = kw.optional.0.flatten();
 
-    let json_schema = to_schema_value(ruby, schema)?;
-
-    let result = if let Some(registry) = registry {
-        jsonschema::meta::options()
+    if let Some(registry) = registry {
+        let json_schema = to_schema_value(ruby, schema)?;
+        let result = jsonschema::meta::options()
             .with_registry(registry.inner.as_ref())
-            .validate(&json_schema)
-    } else {
-        jsonschema::meta::validate(&json_schema)
-    };
+            .validate(&json_schema);
+        return meta_result_to_bool(ruby, result);
+    }
+    if let Some(json_schema) = json_text_schema(schema) {
+        return meta_result_to_bool(ruby, jsonschema::meta::validate(&json_schema));
+    }
+    surface_pending_errors(schema, |node| {
+        if let Some(result) = compiled_meta_is_valid(schema) {
+            return result;
+        }
+        match jsonschema::meta::is_valid_for::<Magnus>(node) {
+            Ok(valid) => Ok(valid),
+            Err(error) => meta_result_to_bool(ruby, Err(error)),
+        }
+    })
+}
 
-    match result {
-        Ok(()) => Ok(()),
-        Err(error) => {
-            if let jsonschema::error::ValidationErrorKind::Referencing(err) = error.kind() {
-                return Err(referencing_error(ruby, err.to_string()));
-            }
-            #[allow(unsafe_code)]
-            let node = RbNode::new(schema.as_raw());
-            Err(raise_validation_error(ruby, error, Some(node), None))
+fn meta_validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
+    use magnus::scan_args::get_kwargs;
+    let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
+    let (schema,) = parsed_args.required;
+    let kw: magnus::scan_args::KwArgs<(), (Option<Option<&Registry>>,), ()> =
+        get_kwargs(parsed_args.keywords, &[], &[*options::KW_REGISTRY])?;
+    let registry = kw.optional.0.flatten();
+
+    let raise = |error: jsonschema::ValidationError<'_>| {
+        if let jsonschema::error::ValidationErrorKind::Referencing(err) = error.kind() {
+            return referencing_error(ruby, err.to_string());
         }
+        #[allow(unsafe_code)]
+        let node = RbNode::new(schema.as_raw());
+        raise_validation_error(ruby, error, Some(node), None)
+    };
+    if let Some(registry) = registry {
+        let json_schema = to_schema_value(ruby, schema)?;
+        return jsonschema::meta::options()
+            .with_registry(registry.inner.as_ref())
+            .validate(&json_schema)
+            .map_err(raise);
     }
+    if let Some(json_schema) = json_text_schema(schema) {
+        return jsonschema::meta::validate(&json_schema).map_err(raise);
+    }
+    surface_pending_errors(schema, |node| {
+        if let Some(result) = compiled_meta_validate(&schema) {
+            return result?.map_err(raise);
+        }
+        jsonschema::meta::validate_for::<Magnus>(node).map_err(raise)
+    })
 }
 
 // ValidationError instance methods (defined from Rust, called on exception instances)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonschema_rs
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.1
 platform: ruby
 authors:
 - Dmitry Dygalo