jsonschema_rs 0.49.0 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5089bd59db447c9dd706a0fcaf832dac6832d5be6662e988b7a386c8cd31e6b0
-  data.tar.gz: ed3f7c83e18c5b8eea755a6a814106693ac729a11325946e878daca82afa0a32
+  metadata.gz: 9d150c4402ac7014d11674fba8a3e7ae36638e1a671010b4b8494ede16c03858
+  data.tar.gz: 4af066e13c47db2d317113d3a6454eae0e2ad60f16c52b31648da7889055bef3
 SHA512:
-  metadata.gz: f15778547054d8aa3e988d34db28fa5144ed87821f4be792120366dc93ff3f2ae908f64610e72047f111f10617187ea6d0debd859be1cb5de11756af8bf874a0
-  data.tar.gz: 5d9f288ab525665571492a9e6a8f7846b01dc07f78cee128a998777edcfcb2fb8977dcab97735c4bbbb1634f6f3e350904ec9c1d4e1d987de3c86fefc030f24b
+  metadata.gz: 75713f7e5827481f37962d21c00ed968c8386f020ad1ec054f33d742b7036ad13354741f62e35eba0b82eb161be1b189a83f71e3a99f3fceacd917c2f56d334c
+  data.tar.gz: a7e7405400ba4dbf94954510ab490372c52258c16c61fe423285d73edcf8837e839601d462fe163bc289a040312d5bb32b9c25a7cd78323bf55b96de52abb613

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.49.1] - 2026-07-25
+
+### Fixed
+
+- `JSONSchema.canonicalize` rejecting `pattern_options` (it should take the same regex configuration as validators).
+- `InvalidPattern` failures raising the base `CanonicalizationError` (they should raise `JSONSchema::Canonical::InvalidPattern`).
+
 ## [0.49.0] - 2026-07-25
 
 ### Added
@@ -219,7 +226,8 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.0...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.1...HEAD
+[0.49.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.0...ruby-v0.49.1
 [0.49.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.48.5...ruby-v0.49.0
 [0.48.5]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.48.2...ruby-v0.48.5
 [0.48.2]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.48.1...ruby-v0.48.2

data/Cargo.toml

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

data/ext/jsonschema/Cargo.lock

@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eb9cf6891f8d15a89f7bcf8e812a62efef1fd8d9e7e4522f455875a1224875a"
+checksum = "9cc9116a0f75b7336e55eb2a2a0ddef86c37cadf02924a571751aa123d5a0290"
 dependencies = [
  "ahash",
  "bytecount",
@@ -726,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78fac461293b8d5484a845adbbfaa263ae76616ceae93283baaa4621736f9c54"
+checksum = "b78efbcc1da165d63e1944fa687b3c2c09e8e418e9481e25aeada6062160c1bf"
 dependencies = [
  "jsonschema-macros-core",
  "proc-macro2",
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros-core"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "937a50f77ead02f355faec45d36f0b739da183857002af4f3a2759451dc9aec3"
+checksum = "10c6550900b4a6be61392b8ddeb62b5c057975371ce93fca76d92542015f98bf"
 dependencies = [
  "fancy-regex",
  "indexmap",
@@ -755,7 +755,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.49.0"
+version = "0.49.1"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -768,18 +768,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b70811da032e736899c5045ee30f069ba241676739e6ed042c1f9ddd3ad47cde"
+checksum = "628a1f02bda4651d9a6088ee6386a92f0ee96255b0c99e9dfe1be91bf83bd838"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ceacf7ad8e9a1f6229a1354dc0ab238855623d219b6abf0a001c138241ec530"
+checksum = "75d94a372f8d81d070fd405065c6b1168d8248d1d6adad073ac708de254698c6"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1132,9 +1132,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.49.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbded44c4882a15738bd1bba376609f679292d758c0b3c389a2ef4a0ea6ce9b7"
+checksum = "978badf4419c9d0e1bc6e7466e99277f829d768257670c46d88121ca75e34bf7"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

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

data/lib/jsonschema/version.rb

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

data/sig/jsonschema.rbs

@@ -29,6 +29,9 @@ module JSONSchema
     class InvalidSchemaType < CanonicalizationError
     end
 
+    class InvalidPattern < CanonicalizationError
+    end
+
     # A schema reduced to canonical form: schemas accepting the same values share one form.
     class CanonicalSchema
       def to_json_schema: () -> untyped
@@ -164,7 +167,8 @@ module JSONSchema
   def self.canonicalize: (
     untyped schema,
     ?draft: draft?,
-    ?validate_formats: bool?
+    ?validate_formats: bool?,
+    ?pattern_options: (RegexOptions | FancyRegexOptions)?
   ) -> Canonical::CanonicalSchema
 
   # Create a validator with auto-detected draft version.

data/src/canonical.rs

@@ -14,13 +14,17 @@ use magnus::{
 };
 
 use crate::{
-    options::parse_draft_symbol,
+    options::{extract_pattern_options, parse_draft_symbol, RbPatternOptions},
     ser::{to_schema_value, value_to_ruby},
     static_id::define_rb_intern,
 };
 
 define_rb_intern!(static CANONICAL_KW_DRAFT: "draft");
 define_rb_intern!(static CANONICAL_KW_VALIDATE_FORMATS: "validate_formats");
+define_rb_intern!(static CANONICAL_KW_PATTERN_OPTIONS: "pattern_options");
+
+type CanonicalKwArgs =
+    magnus::scan_args::KwArgs<(), (Option<Value>, Option<bool>, Option<Value>), ()>;
 
 macro_rules! canonical_error_class {
     ($static_name:ident, $class_name:literal) => {
@@ -42,6 +46,7 @@ macro_rules! canonical_error_class {
 
 canonical_error_class!(CANONICALIZATION_ERROR_CLASS, "CanonicalizationError");
 canonical_error_class!(INVALID_SCHEMA_TYPE_CLASS, "InvalidSchemaType");
+canonical_error_class!(INVALID_PATTERN_CLASS, "InvalidPattern");
 
 fn canonicalization_error(ruby: &Ruby, error: CanonicalizationError) -> Error {
     if let CanonicalizationError::ValidationError(validation_error) = error {
@@ -52,6 +57,9 @@ fn canonicalization_error(ruby: &Ruby, error: CanonicalizationError) -> Error {
         CanonicalizationError::InvalidSchemaType(_) => {
             Error::new(ruby.get_inner(&INVALID_SCHEMA_TYPE_CLASS), message)
         }
+        CanonicalizationError::InvalidPattern { .. } => {
+            Error::new(ruby.get_inner(&INVALID_PATTERN_CLASS), message)
+        }
         // `ValidationError` returns above; future variants fall back to the base canonical error.
         _ => Error::new(ruby.get_inner(&CANONICALIZATION_ERROR_CLASS), message),
     }
@@ -892,12 +900,16 @@ fn canonicalize(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
     let parsed = scan_args::<(Value,), (), (), (), _, ()>(args)?;
     let (schema_arg,) = parsed.required;
     let keywords: RHash = parsed.keywords;
-    let base_kwargs: magnus::scan_args::KwArgs<(), (Option<Value>, Option<bool>), ()> = get_kwargs(
+    let base_kwargs: CanonicalKwArgs = get_kwargs(
         keywords,
         &[],
-        &[*CANONICAL_KW_DRAFT, *CANONICAL_KW_VALIDATE_FORMATS],
+        &[
+            *CANONICAL_KW_DRAFT,
+            *CANONICAL_KW_VALIDATE_FORMATS,
+            *CANONICAL_KW_PATTERN_OPTIONS,
+        ],
     )?;
-    let (draft_val, validate_formats) = base_kwargs.optional;
+    let (draft_val, validate_formats, pattern_options) = base_kwargs.optional;
 
     let schema_value = to_schema_value(ruby, schema_arg)?;
     let mut options = jsonschema::canonical::options();
@@ -907,6 +919,12 @@ fn canonicalize(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
     if let Some(validate_formats) = validate_formats {
         options = options.should_validate_formats(validate_formats);
     }
+    if let Some(val) = pattern_options {
+        match extract_pattern_options(ruby, val)? {
+            RbPatternOptions::Fancy(inner) => options = options.with_pattern_options(inner),
+            RbPatternOptions::Regex(inner) => options = options.with_pattern_options(inner),
+        }
+    }
     options
         .canonicalize(&schema_value)
         .map(|inner| ruby.obj_wrap(RbCanonicalSchema { inner }).as_value())
@@ -919,6 +937,7 @@ pub(crate) fn init_canonical(ruby: &Ruby, module: &RModule) -> Result<(), Error>
     let base_error =
         canonical_module.define_error("CanonicalizationError", ruby.exception_standard_error())?;
     canonical_module.define_error("InvalidSchemaType", base_error)?;
+    canonical_module.define_error("InvalidPattern", base_error)?;
 
     let canonical_schema = canonical_module.define_class("CanonicalSchema", ruby.class_object())?;
     canonical_schema.define_method(

data/src/options.rs

@@ -741,32 +741,9 @@ pub fn make_options_from_kwargs(
     }
 
     if let Some(val) = pattern_options_val {
-        if let Ok(fancy_opts) = <&FancyRegexOptions>::try_convert(val) {
-            let mut po = jsonschema::PatternOptions::fancy_regex();
-            if let Some(limit) = fancy_opts.backtrack_limit {
-                po = po.backtrack_limit(limit);
-            }
-            if let Some(limit) = fancy_opts.size_limit {
-                po = po.size_limit(limit);
-            }
-            if let Some(limit) = fancy_opts.dfa_size_limit {
-                po = po.dfa_size_limit(limit);
-            }
-            opts = opts.with_pattern_options(po);
-        } else if let Ok(regex_opts) = <&RegexOptions>::try_convert(val) {
-            let mut po = jsonschema::PatternOptions::regex();
-            if let Some(limit) = regex_opts.size_limit {
-                po = po.size_limit(limit);
-            }
-            if let Some(limit) = regex_opts.dfa_size_limit {
-                po = po.dfa_size_limit(limit);
-            }
-            opts = opts.with_pattern_options(po);
-        } else {
-            return Err(Error::new(
-                ruby.exception_type_error(),
-                "pattern_options must be a RegexOptions or FancyRegexOptions instance",
-            ));
+        match extract_pattern_options(ruby, val)? {
+            RbPatternOptions::Fancy(inner) => opts = opts.with_pattern_options(inner),
+            RbPatternOptions::Regex(inner) => opts = opts.with_pattern_options(inner),
         }
     }
 
@@ -953,6 +930,42 @@ impl RegexOptions {
     }
 }
 
+/// A `pattern_options` argument converted into [`jsonschema::PatternOptions`].
+pub(crate) enum RbPatternOptions {
+    Fancy(jsonschema::PatternOptions<jsonschema::FancyRegex>),
+    Regex(jsonschema::PatternOptions<jsonschema::Regex>),
+}
+
+pub(crate) fn extract_pattern_options(ruby: &Ruby, val: Value) -> Result<RbPatternOptions, Error> {
+    if let Ok(fancy_opts) = <&FancyRegexOptions>::try_convert(val) {
+        let mut po = jsonschema::PatternOptions::fancy_regex();
+        if let Some(limit) = fancy_opts.backtrack_limit {
+            po = po.backtrack_limit(limit);
+        }
+        if let Some(limit) = fancy_opts.size_limit {
+            po = po.size_limit(limit);
+        }
+        if let Some(limit) = fancy_opts.dfa_size_limit {
+            po = po.dfa_size_limit(limit);
+        }
+        Ok(RbPatternOptions::Fancy(po))
+    } else if let Ok(regex_opts) = <&RegexOptions>::try_convert(val) {
+        let mut po = jsonschema::PatternOptions::regex();
+        if let Some(limit) = regex_opts.size_limit {
+            po = po.size_limit(limit);
+        }
+        if let Some(limit) = regex_opts.dfa_size_limit {
+            po = po.dfa_size_limit(limit);
+        }
+        Ok(RbPatternOptions::Regex(po))
+    } else {
+        Err(Error::new(
+            ruby.exception_type_error(),
+            "pattern_options must be a RegexOptions or FancyRegexOptions instance",
+        ))
+    }
+}
+
 #[magnus::wrap(class = "JSONSchema::FancyRegexOptions", free_immediately, size)]
 pub struct FancyRegexOptions {
     pub backtrack_limit: Option<usize>,

metadata

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