jsonschema_rs 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51236b02371703841ea00783cfc0a9d5b97281a27a527c390795ab02f5e88aac
-  data.tar.gz: 87fb69c295b4a82d16d20fab2368aa9eb7b90167f2135b411ee8b0279db0399d
+  metadata.gz: 8edaf1942b912082da745998a2b61bcb9d01b15078b788c5c459631c539f6a83
+  data.tar.gz: f6f35c2591c66ffe57bee54a12fd7b065fae77a96b7070abd82aae967cda8d39
 SHA512:
-  metadata.gz: abc58a0cf0669380c5c3035a76586e45d952584cf5742878a451a10dab18ebfb5a7210bf80f022da8a3b302ead4364337554544537f7432e46161343b8cf7888
-  data.tar.gz: 991fdcf4e5661180a09918c7bce74c3afd9adf73543b8f1ba4d0f2c046e2feccb4cb9bb757e3f315c126665d67455eaecd938d24338b8dd18c0f30b4b897ca59
+  metadata.gz: 0b44497016a6e8c454bff10e8d94b668045d981f68e4970bfc366c6c4a28bd92406fb557dcb508b78ad34278a05494184f9da3c8cff567d221a70710d928b0b4
+  data.tar.gz: c56077fb3714d3ff419de02fc7dd1bb876388987f9ae65f50b7b93a4ddba95e4a249df0f4c4fa2aeaebad9dfd1c6fba4e8ac08eb311f9305452f02c345465e88

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+## [0.45.0] - 2026-03-08
+
+### Added
+
+- `JSONSchema.bundle(schema, ...)`: produce a Compound Schema Document with all external `$ref` targets embedded in a draft-appropriate container (`definitions` for Draft 4/6/7, `$defs` for Draft 2019-09/2020-12; [Appendix B](https://json-schema.org/draft/2020-12/json-schema-core#appendix-B)). [#791](https://github.com/Stranger6667/jsonschema/issues/791).
+- `ValidationError#absolute_keyword_location` to get the absolute keyword location URI of the schema node that produced the error.
+
+## [0.44.1] - 2026-03-03
+
+### Fixed
+
+- `hostname` format now applies legacy RFC 1034 semantics in Draft 4/6 and keeps IDNA A-label validation in Draft 7+.
+
 ## [0.44.0] - 2026-03-02
 
 ### Added
@@ -53,7 +66,9 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.44.0...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.45.0...HEAD
+[0.45.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.44.1...ruby-v0.45.0
+[0.44.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.44.0...ruby-v0.44.1
 [0.44.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.43.0...ruby-v0.44.0
 [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

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb"
-version = "0.44.0"
+version = "0.45.0"
 edition = "2021"
 authors = ["Dmitry Dygalo <dmitry@dygalo.dev>"]
 license = "MIT"
@@ -13,7 +13,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-jsonschema = { version = "0.44.0", default-features = false, features = ["arbitrary-precision", "resolve-http", "resolve-file", "tls-ring"] }
+jsonschema = { version = "0.45.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/README.md

@@ -49,6 +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
 - ♦️ Supports Ruby 3.2, 3.4 and 4.0
 
 ### Supported drafts
@@ -267,6 +268,30 @@ dump_a == dump_b # => true
 
 Main use case: deduplicating equivalent JSON Schemas.
 
+## Schema Bundling
+
+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.
+
+```ruby
+address_schema = {
+  "$schema" => "https://json-schema.org/draft/2020-12/schema",
+  "$id" => "https://example.com/address.json",
+  "type" => "object",
+  "properties" => { "street" => { "type" => "string" }, "city" => { "type" => "string" } },
+  "required" => ["street", "city"]
+}
+
+schema = {
+  "$schema" => "https://json-schema.org/draft/2020-12/schema",
+  "type" => "object",
+  "properties" => { "home" => { "$ref" => "https://example.com/address.json" } },
+  "required" => ["home"]
+}
+
+registry = JSONSchema::Registry.new([["https://example.com/address.json", address_schema]])
+bundled = JSONSchema.bundle(schema, registry: registry)
+```
+
 ## Meta-Schema Validation
 
 Validate that a JSON Schema document is itself valid:

data/ext/jsonschema/Cargo.lock

@@ -603,9 +603,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "iri-string"
@@ -666,9 +666,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.44.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267fb27be492e66ab147d2ce0233d88ae465b93c3565016e73998729bf3fe60f"
+checksum = "6f29616f6e19415398eb186964fb7cbbeef572c79bede3622a8277667924bbe3"
 dependencies = [
  "ahash",
  "bytecount",
@@ -696,7 +696,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -1043,9 +1043,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.44.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ecd0f3daefd4faff2e0821310c18e6e9d1fd00550bbd7e5a59d78184a071bc"
+checksum = "b8a618c14f8ba29d8193bb55e2bf13e4fb2b1115313ecb7ae94b43100c7ac7d5"
 dependencies = [
  "ahash",
  "fluent-uri",
@@ -1428,9 +1428,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "bytes",
  "libc",

data/ext/jsonschema/Cargo.toml

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

data/sig/jsonschema.rbs

@@ -41,6 +41,19 @@ module JSONSchema
     ?http_options: HttpOptions?
   ) -> Validator
 
+  # Bundle a JSON Schema into a Compound Schema Document.
+  # All externally-referenced schemas reachable via $ref are embedded in a
+  # draft-appropriate container (definitions for Draft 4/6/7, $defs for
+  # Draft 2019-09/2020-12).
+  # Original $ref values are preserved unchanged.
+  def self.bundle: (
+    untyped schema,
+    ?draft: draft?,
+    ?retriever: (^(String) -> untyped)?,
+    ?registry: Registry?,
+    ?base_uri: String?
+  ) -> Hash[String, untyped]
+
   # 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))

data/src/lib.rs

@@ -60,6 +60,7 @@ define_rb_intern!(static ID_AT_SCHEMA_PATH_POINTER: "@schema_path_pointer");
 define_rb_intern!(static ID_AT_EVALUATION_PATH_POINTER: "@evaluation_path_pointer");
 define_rb_intern!(static ID_AT_KIND: "@kind");
 define_rb_intern!(static ID_AT_INSTANCE: "@instance");
+define_rb_intern!(static ID_AT_ABSOLUTE_KEYWORD_LOCATION: "@absolute_keyword_location");
 define_rb_intern!(static ID_CAUSE: "cause");
 
 define_rb_intern!(static ID_SYM_MESSAGE: "message");
@@ -72,6 +73,7 @@ define_rb_intern!(static ID_SYM_INSTANCE: "instance");
 define_rb_intern!(static ID_SYM_INSTANCE_PATH_POINTER: "instance_path_pointer");
 define_rb_intern!(static ID_SYM_SCHEMA_PATH_POINTER: "schema_path_pointer");
 define_rb_intern!(static ID_SYM_EVALUATION_PATH_POINTER: "evaluation_path_pointer");
+define_rb_intern!(static ID_SYM_ABSOLUTE_KEYWORD_LOCATION: "absolute_keyword_location");
 
 struct BuiltValidator {
     validator: jsonschema::Validator,
@@ -373,11 +375,11 @@ fn into_ruby_error(
         mask,
     );
 
-    let (instance, kind, instance_path, schema_path, evaluation_path) = error.into_parts();
+    let parts = error.into_parts();
 
-    let instance_path_ptr = ruby.into_value(instance_path.as_str());
-    let schema_path_ptr = ruby.into_value(schema_path.as_str());
-    let evaluation_path_ptr = ruby.into_value(evaluation_path.as_str());
+    let instance_path_ptr = ruby.into_value(parts.instance_path.as_str());
+    let schema_path_ptr = ruby.into_value(parts.schema_path.as_str());
+    let evaluation_path_ptr = ruby.into_value(parts.evaluation_path.as_str());
 
     let into_path_segment = |segment: LocationSegment<'_>| -> Value {
         match segment {
@@ -386,8 +388,8 @@ fn into_ruby_error(
         }
     };
 
-    let kind_obj = ValidationErrorKind::new(ruby, &kind, mask)?;
-    let rb_instance = ser::value_to_ruby(ruby, instance.as_ref())?;
+    let kind_obj = ValidationErrorKind::new(ruby, &parts.kind, mask)?;
+    let rb_instance = ser::value_to_ruby(ruby, parts.instance.as_ref())?;
 
     let exc_class = ruby.get_inner(&VALIDATION_ERROR_CLASS);
 
@@ -400,21 +402,27 @@ fn into_ruby_error(
     )?;
     exc.ivar_set(
         *ID_AT_INSTANCE_PATH,
-        ruby.ary_from_iter(instance_path.into_iter().map(&into_path_segment)),
+        ruby.ary_from_iter(parts.instance_path.into_iter().map(&into_path_segment)),
     )?;
     exc.ivar_set(
         *ID_AT_SCHEMA_PATH,
-        ruby.ary_from_iter(schema_path.into_iter().map(&into_path_segment)),
+        ruby.ary_from_iter(parts.schema_path.into_iter().map(&into_path_segment)),
     )?;
     exc.ivar_set(
         *ID_AT_EVALUATION_PATH,
-        ruby.ary_from_iter(evaluation_path.into_iter().map(&into_path_segment)),
+        ruby.ary_from_iter(parts.evaluation_path.into_iter().map(&into_path_segment)),
     )?;
     exc.ivar_set(*ID_AT_INSTANCE_PATH_POINTER, instance_path_ptr)?;
     exc.ivar_set(*ID_AT_SCHEMA_PATH_POINTER, schema_path_ptr)?;
     exc.ivar_set(*ID_AT_EVALUATION_PATH_POINTER, evaluation_path_ptr)?;
     exc.ivar_set(*ID_AT_KIND, ruby.into_value(kind_obj))?;
     exc.ivar_set(*ID_AT_INSTANCE, rb_instance)?;
+    let absolute_location = if let Some(uri) = parts.absolute_keyword_location {
+        ruby.into_value(uri.as_str())
+    } else {
+        ruby.qnil().as_value()
+    };
+    exc.ivar_set(*ID_AT_ABSOLUTE_KEYWORD_LOCATION, absolute_location)?;
 
     if is_custom {
         if let Some(cause) = CUSTOM_KEYWORD_CAUSE.with(|cell| cell.borrow_mut().take()) {
@@ -838,6 +846,22 @@ fn validator_for(ruby: &Ruby, args: &[Value]) -> Result<Validator, Error> {
     })
 }
 
+fn bundle(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
+    let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
+    let (schema,) = parsed_args.required;
+    let kw = extract_kwargs(ruby, parsed_args.keywords)?;
+
+    let json_schema = to_schema_value(ruby, schema)?;
+    let parsed = build_parsed_options(ruby, kw, None)?;
+    match parsed.options.bundle(&json_schema) {
+        Ok(bundled) => ser::value_to_ruby(ruby, &bundled),
+        Err(e @ jsonschema::ReferencingError::Unretrievable { .. }) => {
+            Err(referencing_error(ruby, e.to_string()))
+        }
+        Err(e) => Err(Error::new(ruby.exception_runtime_error(), e.to_string())),
+    }
+}
+
 /// to_string(object) -> String
 ///
 /// Serialize a Ruby value to canonical JSON.
@@ -1315,6 +1339,7 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
         &*ID_SYM_INSTANCE_PATH_POINTER,
         &*ID_SYM_SCHEMA_PATH_POINTER,
         &*ID_SYM_EVALUATION_PATH_POINTER,
+        &*ID_SYM_ABSOLUTE_KEYWORD_LOCATION,
     ] {
         let _: Value = validation_error_rclass.funcall("attr_reader", (sym_id.to_symbol(),))?;
     }
@@ -1331,6 +1356,7 @@ fn init(ruby: &Ruby) -> Result<(), 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("bundle", function!(bundle, -1))?;
     module.define_singleton_method("valid?", function!(is_valid, -1))?;
     module.define_singleton_method("validate!", function!(validate, -1))?;
     module.define_singleton_method("each_error", function!(each_error, -1))?;

metadata

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