jsonschema_rs 0.42.2 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7d5176039d2b2ed57477cf0df4ae678c7621a1bdd58928f446c248c891faaa
-  data.tar.gz: '09bb34e4ab1ade80c168cd1e0a5261f9a84915f4f044a1a7d3172b0c8e381b7a'
+  metadata.gz: 511735bb41a48b95a424e5b92436aafe412822923eb943c0afd831ccbbcc94f8
+  data.tar.gz: 15ee16fe53ab1c97071e21cce8cf2f3ff5b74d758d63319f25133f5165a8c74c
 SHA512:
-  metadata.gz: d0b1526111cdbe307b01244486e827f93cfa390f79daf41e1ccfb920ec1ab9050e6474d49282627d303e5e28af8da629e7c35153a2321e6ae22b8e323b04b2b1
-  data.tar.gz: ebc8c709a96970c566bb26ee36a9373a13c91b7ebdb3634c43c0b33250dc7df8a227836e727d86497c190d41a853d911e03bd3cd625a75050c04b970253da759
+  metadata.gz: ead73ff80442e834f88215faa2c7d56f90bfdc4d8d3340211a313f74ba0ded0cb0da35e4400fb6554aafd3e0295b6c2ba18f94f26768cda847192941549f0c58
+  data.tar.gz: 5af852de21e182955493ab5dc5ffc0b7e71735128d98247508d0ff153432014387590398ca38c138ff72d2cd55bbf2ab4db0a32e83f7da810769c6ad5eeb239c

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [0.43.0] - 2026-02-28
+
+### Added
+
+- `validator_cls_for(schema)` function to detect and return the appropriate validator class for a schema.
+
+### Fixed
+
+- `anyOf`, `format`, `unevaluatedProperties`, and `unevaluatedItems` now correctly collect annotations per spec.
+
+### Performance
+
+- Optimize `pattern` and `patternProperties` for `^(a|b|c)$` alternations via linear array scan.
+- Optimize `^\S*$` patterns by replacing regex with a direct ECMA-262 whitespace check.
+
 ## [0.42.2] - 2026-02-26
 
 ### Changed
@@ -28,6 +43,7 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.42.2...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.43.0...HEAD
+[0.43.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.42.2...ruby-v0.43.0
 [0.42.2]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.42.1...ruby-v0.42.2
 [0.42.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.42.0...ruby-v0.42.1

data/Cargo.toml

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

data/ext/jsonschema/Cargo.lock

@@ -667,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.42.2"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44c9bb95f6ac9270bf4fd38d71c2f8704b9fe0323a293af7a5284cbd60a39b2"
+checksum = "2dcfbe6df48e0121219eefc8d6a30b872ac2769c7896454bda06f7b64129fa22"
 dependencies = [
  "ahash",
  "bytecount",
@@ -697,7 +697,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.42.2"
+version = "0.43.0"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -1044,9 +1044,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.42.2"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d4124f489451bb67c59d67fa16f3ae9b5690b290406a7538e38458632666df"
+checksum = "37add1aa1d619a975521d262d09f100f1f767791c9386c03679450f30acd78c1"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

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

data/lib/jsonschema/version.rb

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

data/sig/jsonschema.rbs

@@ -32,6 +32,10 @@ module JSONSchema
     ?http_options: HttpOptions?
   ) -> Validator
 
+  # Detect the JSON Schema draft for a schema and return the corresponding validator class.
+  # Draft is detected automatically from the `$schema` field. Defaults to Draft202012Validator.
+  def self.validator_cls_for: (untyped schema) -> (singleton(Draft4Validator) | singleton(Draft6Validator) | singleton(Draft7Validator) | singleton(Draft201909Validator) | singleton(Draft202012Validator))
+
   # One-off validation returning boolean.
   def self.valid?: (
     untyped schema,

data/src/lib.rs

@@ -22,7 +22,8 @@ use magnus::{
     prelude::*,
     scan_args::scan_args,
     value::{Lazy, ReprValue},
-    DataTypeFunctions, Error, Exception, ExceptionClass, RClass, RModule, RObject, Ruby, Value,
+    DataTypeFunctions, Error, Exception, ExceptionClass, RClass, RHash, RModule, RObject, Ruby,
+    Value,
 };
 use referencing::unescape_segment;
 use std::{
@@ -776,6 +777,38 @@ impl Validator {
     }
 }
 
+/// validator_cls_for(schema) -> Class
+///
+/// Detect the JSON Schema draft for a schema and return the corresponding validator class.
+/// Draft is detected automatically from the `$schema` field. Defaults to Draft202012Validator.
+///
+///     >>> cls = JSONSchema.validator_cls_for({"type" => "string"})
+///     >>> validator = cls.new({"type" => "string"})
+///     >>> cls = JSONSchema.validator_cls_for({"$schema" => "http://json-schema.org/draft-07/schema#", "type" => "string"})
+///     >>> validator = cls.new({"$schema" => "http://json-schema.org/draft-07/schema#", "type" => "string"})
+///
+fn validator_cls_for(ruby: &Ruby, schema: Value) -> Result<RClass, Error> {
+    let draft = if let Some(hash) = RHash::from_value(schema) {
+        if let Ok(uri) = hash.aref::<_, String>(ruby.str_new("$schema")) {
+            jsonschema::Draft::from_schema_uri(&uri)
+        } else {
+            jsonschema::Draft::default()
+        }
+    } else {
+        jsonschema::Draft::default()
+    };
+
+    let module = ruby.define_module("JSONSchema")?;
+    let cls_name = match draft {
+        jsonschema::Draft::Draft4 => "Draft4Validator",
+        jsonschema::Draft::Draft6 => "Draft6Validator",
+        jsonschema::Draft::Draft7 => "Draft7Validator",
+        jsonschema::Draft::Draft201909 => "Draft201909Validator",
+        jsonschema::Draft::Draft202012 | jsonschema::Draft::Unknown | _ => "Draft202012Validator",
+    };
+    module.const_get::<&str, RClass>(cls_name)
+}
+
 fn validator_for(ruby: &Ruby, args: &[Value]) -> Result<Validator, Error> {
     let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (schema,) = parsed_args.required;
@@ -1287,6 +1320,7 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     module.define_error("ReferencingError", ruby.exception_standard_error())?;
 
     // Module-level functions
+    module.define_singleton_method("validator_cls_for", function!(validator_cls_for, 1))?;
     module.define_singleton_method("validator_for", function!(validator_for, -1))?;
     module.define_singleton_method("valid?", function!(is_valid, -1))?;
     module.define_singleton_method("validate!", function!(validate, -1))?;

metadata

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