jsonschema_rs 0.50.1 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acba28bc0257f16171af9a56176f5278c09c28431fca51617d325cde3a6798f
-  data.tar.gz: 6c87343882695b9c1e1e5a1fdbc2a66cbabc33a5f0dee58a30b5d6dee1643210
+  metadata.gz: 60286fc7bf517866e7429a90e42fa4505ea769ba9728c1d03fcd1dafe2ff63ce
+  data.tar.gz: 6aaea36a12a38414cac3ec8af674b2b944cfd451dcf682488525f62fe12ee98e
 SHA512:
-  metadata.gz: 6fb0b5f41da70c05b4ce56f721de089ee215485edc38160c9b0770ed70f66d7672d6db55c6a573def409079b06fa0c4e9e218adc2bfe750e946a9da6cace439d
-  data.tar.gz: d6614c068ca1f3f7eb8aede6a8b37321cad426f7b6158b7f870aab73fce44ceab7fa6afdef01617581571cce389281a206841ec1a34ad40e969b4b02759a0c23
+  metadata.gz: bb0c6f0d5db65db03bc05d11cd636d8fc37b9b61a33b3674da032de2ec1a31df43f595bc9c16964bace627362a699fb032e0d90f459d81a0f68222eb6e251f5d
+  data.tar.gz: 03a44cfe94869f6ccf039205ee42eedddf84cd11005b44f3d0b9db75efdaf2c63166a82d71332fc65e03cb41a959355737bbff7a9750c99a50ec061d0112ef1e

data/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 ## [Unreleased]
 
+## [0.52.0] - 2026-08-27
+
+### Added
+
+- The `offline:` keyword argument, refusing to fetch references outside `registry:`.
+
+### Fixed
+
+- Canonicalization not idempotent where a `patternProperties` `$ref` matches a key `properties` names.
+- The `draft:` keyword argument and the `Draft201909Validator` / `Draft202012Validator` classes gating keywords on the vocabularies of the `$schema` they override, so the validator accepted every instance.
+- `valid?` disagreeing with `validate!`, `each_error`, and `evaluate` on a schema that reaches its own `$ref` twice, one of them under `not`.
+
+## [0.51.0] - 2026-08-23
+
+### Added
+
+- `vocabularies` option, declaring support for a vocabulary this library does not implement.
+
+### Fixed
+
+- The `uniqueItems` length ceiling not reading an `items` or `contains` schema written as a `$ref`.
+- The Draft 2020-12 Format-Assertion vocabulary read as an annotation, so a meta-schema requiring it accepted values its `format` rejects.
+- An unrecognized `format` accepted under a meta-schema requiring the Format-Assertion vocabulary (it should be rejected).
+- A meta-schema requiring a vocabulary this library does not implement accepted (it should be rejected).
+- The Draft 2019-09 Format vocabulary declared `true` read as an annotation, so a meta-schema requiring it accepted values its `format` rejects.
+- The bundled `https://json-schema.org/draft/2020-12/meta/format-assertion` meta-schema not declaring its vocabulary, so a schema written against it annotated `format` instead of asserting it.
+- A meta-schema without `$id` keeping its `$vocabulary` unread, so a schema written against it got every Draft 2020-12 vocabulary.
+- A schema naming a bundled vocabulary meta-schema as its `$schema` rejected as an unknown meta-schema (it should build).
+- The `regex` format reading the Rust regex dialect (it should read the ECMA-262 dialect in Unicode mode).
+- The `uri-template` format rejecting an apostrophe in a literal (it should accept it, per RFC 6570 errata 6937).
+- The `duration` format accepting weeks combined with a time part, such as `P1WT1H` (it should reject it).
+- Stack overflow compiling `unevaluatedProperties` or `unevaluatedItems` beside a `$ref` that cycles back to the node, written as `#`, through its `$id`, or through a chain of definitions.
+
+### Performance
+
+- Building `unevaluatedProperties` or `unevaluatedItems` over a deep `allOf` or `$ref` chain costs its depth instead of its square.
+
 ## [0.50.1] - 2026-08-22
 
 ### Changed
@@ -442,7 +479,9 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.50.1...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.52.0...HEAD
+[0.52.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.51.0...ruby-v0.52.0
+[0.51.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.50.1...ruby-v0.51.0
 [0.50.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.50.0...ruby-v0.50.1
 [0.50.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.9...ruby-v0.50.0
 [0.49.9]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.8...ruby-v0.49.9

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb"
-version = "0.50.1"
+version = "0.52.0"
 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.50.1", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
+jsonschema = { version = "0.52.0", 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

@@ -49,7 +49,7 @@ end
 - 🌐 Remote reference fetching (network/file)
 - 🔧 Custom keywords and format validators
 - ✨ Meta-schema validation for schema documents
-- 📦 Schema bundling into Compound Schema Documents
+- 📦 Schema bundling into Compound Schema Documents, and `$ref` dereferencing
 - 🧮 Experimental schema canonicalization
 - ♦️ Supports Ruby 3.2, 3.4 and 4.0
 
@@ -371,7 +371,7 @@ Compare a request schema new-against-old and a response schema old-against-new:
 
 Both operands must share one setup - the same draft, format policy, regular-expression engine and definitions - or `IncompatibleOperands` is raised. `UnsupportedOperand` means an operand is a `Raw` pass-through, and `UnsupportedResult` that the canonical form does not support the result. All three live under `JSONSchema::Canonical`.
 
-## Schema Bundling
+## Schema Bundling and Dereferencing
 
 Produce a Compound Schema Document ([Appendix B](https://json-schema.org/draft/2020-12/json-schema-core#appendix-B)) by embedding all external `$ref` targets into a draft-appropriate container. The result validates identically to the original.
 
@@ -395,6 +395,12 @@ registry = JSONSchema::Registry.new([["https://example.com/address.json", addres
 bundled = JSONSchema.bundle(schema, registry: registry)
 ```
 
+`dereference` instead replaces each `$ref` with the schema it points to, for consumers that do not resolve references. Circular references are left in place.
+
+```ruby
+dereferenced = JSONSchema.dereference(schema, registry: registry)
+```
+
 ## Meta-Schema Validation
 
 Validate that a JSON Schema document is itself valid:
@@ -644,6 +650,7 @@ JSONSchema.valid?(schema, instance,
   formats: { "name" => proc },     # Custom format validators
   keywords: { "name" => Klass },   # Custom keyword validators
   registry: registry,              # Pre-registered schemas
+  vocabularies: ["https://..."],   # Vocabularies implemented by custom keywords
   pattern_options: opts,           # RegexOptions or FancyRegexOptions
   email_options: opts,             # EmailOptions
   http_options: opts               # HttpOptions

data/ext/jsonschema/Cargo.lock

@@ -269,9 +269,9 @@ dependencies = [
 
 [[package]]
 name = "fraction"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33fee0259ffdc3d7bd64438b6b08437884d4df5700f9cb8a23b079c3958ae578"
+checksum = "e246562084dde8ebbcc943b261c406ce4f68e5032ec28029a251a47d6a295500"
 dependencies = [
  "num",
  "num-bigint",
@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29b6bb4e22283b09119c671e57ac6a185e9a0c70c31585e56b729b626d877753"
+checksum = "0ee5867390f14ee43278d8d05d3af5f5314eeccb4684e6049033f2ba4ae3d4ae"
 dependencies = [
  "ahash",
  "bytecount",
@@ -726,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000c297a4271d226040b519b13132ec685b0e5db6256e1dac53091c932232a81"
+checksum = "31552147ec28242b841ab069f8ba32b2548d2a3ff7c47b0085078c5bc84c49de"
 dependencies = [
  "jsonschema-macros-core",
  "proc-macro2",
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros-core"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d14c9603a90595803e9ad8a62487f8d19f31dcd3848e3b99cac44db21c1cada"
+checksum = "fbdfa029e60c8f29b8069de429929f33b0da3109ad95f8428728a68bb6f2c0fc"
 dependencies = [
  "fancy-regex",
  "indexmap",
@@ -755,7 +755,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.50.1"
+version = "0.52.0"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -769,18 +769,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497fbf3b1ca53b1e23a253f636e88e7a2031387388b8140199a0f240fcadf647"
+checksum = "1a7bbc0f53dcb425cf3bae539be26b406b7053e6995e34e4b04477091e600044"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84ca3f39446973a810fc90fc2645ada8c24284f6deb009c78b776813973887d"
+checksum = "0d3e24abcd5f7eff512eb6bb915ac67772f2e7142ae5b5ac67b4ac75bd417d46"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1133,9 +1133,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.50.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0a32a2a2c2d7dd0ee54705b5fd641be73037271928f68e9b0e7205b71c9d30"
+checksum = "b6326ce79629af4702ac033666390011ccc70fe82ffedd62824d061f133bd10b"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb-ext"
-version = "0.50.1"
+version = "0.52.0"
 edition = "2021"
 publish = false
 
@@ -10,10 +10,10 @@ name = "jsonschema_rb"
 path = "../../src/lib.rs"
 
 [dependencies]
-jsonschema = { version = "0.50.1", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
+jsonschema = { version = "0.52.0", 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.50.1"
+referencing = "0.52.0"
 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.50.1"
+  VERSION = "0.52.0"
 end

data/sig/jsonschema.rbs

@@ -310,6 +310,7 @@ module JSONSchema
     untyped schema,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?mask: String?,
@@ -326,6 +327,7 @@ module JSONSchema
     untyped schema,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?mask: ::String?,
     ?base_uri: ::String?,
     ?retriever: (^(::String) -> untyped)?,
@@ -371,6 +373,7 @@ module JSONSchema
     ?draft: draft?,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?mask: String?,
@@ -389,6 +392,7 @@ module JSONSchema
     ?draft: draft?,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?mask: String?,
@@ -407,6 +411,7 @@ module JSONSchema
     ?draft: draft?,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?mask: String?,
@@ -423,6 +428,7 @@ module JSONSchema
     ?draft: draft?,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?mask: String?,
@@ -441,6 +447,7 @@ module JSONSchema
     ?draft: draft?,
     ?validate_formats: bool?,
     ?ignore_unknown_formats: bool?,
+    ?vocabularies: Array[String]?,
     ?base_uri: String?,
     ?retriever: (^(String) -> untyped)?,
     ?formats: Hash[String, ^(String) -> bool]?,

data/src/evaluation.rs

@@ -26,7 +26,7 @@ impl Evaluation {
     }
 
     fn is_valid(&self) -> bool {
-        self.inner.flag().valid
+        self.inner.is_valid()
     }
 
     /// Simplest output format — only a "valid" key.
@@ -95,10 +95,7 @@ impl Evaluation {
     }
 
     fn inspect(&self) -> String {
-        format!(
-            "#<JSONSchema::Evaluation valid={}>",
-            self.inner.flag().valid
-        )
+        format!("#<JSONSchema::Evaluation valid={}>", self.inner.is_valid())
     }
 }
 

data/src/lib.rs

@@ -200,9 +200,11 @@ fn build_parsed_options(
         formats,
         keywords,
         registry,
+        kw.vocabularies,
         kw.pattern_options,
         kw.email_options,
         kw.http_options,
+        kw.offline,
     )
 }
 

data/src/options.rs

@@ -36,6 +36,8 @@ define_rb_intern!(static KW_FORMATS: "formats");
 define_rb_intern!(static KW_KEYWORDS: "keywords");
 define_rb_intern!(pub(crate) static KW_REGISTRY: "registry");
 // Extra kwarg names (extracted before get_kwargs)
+define_rb_intern!(static KW_VOCABULARIES: "vocabularies");
+define_rb_intern!(static KW_OFFLINE: "offline");
 define_rb_intern!(static KW_PATTERN_OPTIONS: "pattern_options");
 define_rb_intern!(static KW_EMAIL_OPTIONS: "email_options");
 define_rb_intern!(static KW_HTTP_OPTIONS: "http_options");
@@ -224,31 +226,39 @@ pub fn parse_draft_symbol(ruby: &Ruby, val: Value) -> Result<jsonschema::Draft,
 
 pub struct ExtractedKwargs {
     pub base: BaseKwargs,
+    pub vocabularies: Option<Vec<String>>,
     pub pattern_options: Option<Value>,
     pub email_options: Option<Value>,
     pub http_options: Option<Value>,
+    pub offline: Option<bool>,
 }
 
 pub fn extract_kwargs(_ruby: &Ruby, kw: RHash) -> Result<ExtractedKwargs, Error> {
+    let vocabularies = extract_vocabularies(&kw)?;
     let pattern_options = extract_and_delete(&kw, *KW_PATTERN_OPTIONS)?;
     let email_options = extract_and_delete(&kw, *KW_EMAIL_OPTIONS)?;
     let http_options = extract_and_delete(&kw, *KW_HTTP_OPTIONS)?;
+    let offline = extract_offline(&kw)?;
 
     let ids = base_option_ids();
     let base_kw: KwArgs<(), BaseKwargs, ()> = get_kwargs(kw, &[], &ids)?;
 
     Ok(ExtractedKwargs {
         base: base_kw.optional,
+        vocabularies,
         pattern_options,
         email_options,
         http_options,
+        offline,
     })
 }
 
 pub fn extract_evaluate_kwargs(_ruby: &Ruby, kw: RHash) -> Result<ExtractedKwargs, Error> {
+    let vocabularies = extract_vocabularies(&kw)?;
     let pattern_options = extract_and_delete(&kw, *KW_PATTERN_OPTIONS)?;
     let email_options = extract_and_delete(&kw, *KW_EMAIL_OPTIONS)?;
     let http_options = extract_and_delete(&kw, *KW_HTTP_OPTIONS)?;
+    let offline = extract_offline(&kw)?;
 
     let ids = base_option_ids_no_mask();
     let base_kw: KwArgs<(), BaseKwargsNoMask, ()> = get_kwargs(kw, &[], &ids)?;
@@ -275,16 +285,20 @@ pub fn extract_evaluate_kwargs(_ruby: &Ruby, kw: RHash) -> Result<ExtractedKwarg
             keywords,
             registry,
         ),
+        vocabularies,
         pattern_options,
         email_options,
         http_options,
+        offline,
     })
 }
 
 pub fn extract_kwargs_no_draft(_ruby: &Ruby, kw: RHash) -> Result<ExtractedKwargs, Error> {
+    let vocabularies = extract_vocabularies(&kw)?;
     let pattern_options = extract_and_delete(&kw, *KW_PATTERN_OPTIONS)?;
     let email_options = extract_and_delete(&kw, *KW_EMAIL_OPTIONS)?;
     let http_options = extract_and_delete(&kw, *KW_HTTP_OPTIONS)?;
+    let offline = extract_offline(&kw)?;
 
     let ids = base_option_ids_no_draft();
     let base_kw: KwArgs<(), BaseKwargsNoDraft, ()> = get_kwargs(kw, &[], &ids)?;
@@ -311,12 +325,26 @@ pub fn extract_kwargs_no_draft(_ruby: &Ruby, kw: RHash) -> Result<ExtractedKwarg
             keywords,
             registry,
         ),
+        vocabularies,
         pattern_options,
         email_options,
         http_options,
+        offline,
     })
 }
 
+fn extract_offline(kw: &RHash) -> Result<Option<bool>, Error> {
+    extract_and_delete(kw, *KW_OFFLINE)?
+        .map(TryConvert::try_convert)
+        .transpose()
+}
+
+fn extract_vocabularies(kw: &RHash) -> Result<Option<Vec<String>>, Error> {
+    extract_and_delete(kw, *KW_VOCABULARIES)?
+        .map(TryConvert::try_convert)
+        .transpose()
+}
+
 /// Extract a key from a Ruby Hash and remove it, returning None if not present or nil.
 fn extract_and_delete(hash: &RHash, key: StaticId) -> Result<Option<Value>, Error> {
     let val: Option<Value> = hash.delete(key.to_symbol())?;
@@ -482,10 +510,19 @@ pub fn make_options_from_kwargs(
     formats: Option<RHash>,
     keywords: Option<RHash>,
     registry_val: Option<Value>,
+    vocabularies: Option<Vec<String>>,
     pattern_options_val: Option<Value>,
     email_options_val: Option<Value>,
     http_options_val: Option<Value>,
+    offline: Option<bool>,
 ) -> Result<ParsedOptions<'_>, Error> {
+    let offline = offline.unwrap_or(false);
+    if offline && retriever_val.is_some() {
+        return Err(Error::new(
+            ruby.exception_arg_error(),
+            "`offline` cannot be used together with `retriever`",
+        ));
+    }
     let mut opts = jsonschema::options_for::<Magnus>();
     let mut registry = None;
     let mut retriever = None;
@@ -506,6 +543,10 @@ pub fn make_options_from_kwargs(
         opts = opts.should_ignore_unknown_formats(ignore);
     }
 
+    for vocabulary in vocabularies.into_iter().flatten() {
+        opts = opts.with_vocabulary(vocabulary);
+    }
+
     if let Some(uri) = base_uri {
         opts = opts.with_base_uri(uri);
     }
@@ -541,7 +582,7 @@ pub fn make_options_from_kwargs(
             })?;
             registry = Some(reg.inner.as_ref());
 
-            if !retriever_was_provided && retriever.is_none() {
+            if !retriever_was_provided && retriever.is_none() && !offline {
                 if let Some(registry_retriever_value) = reg.retriever_value(ruby) {
                     if let Some(ret) = make_retriever(ruby, registry_retriever_value)? {
                         compilation_roots
@@ -803,6 +844,10 @@ pub fn make_options_from_kwargs(
             .map_err(|e| Error::new(ruby.exception_arg_error(), e.to_string()))?;
     }
 
+    if offline {
+        opts = opts.offline();
+    }
+
     Ok(ParsedOptions {
         mask,
         options: opts,

metadata

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