rust_json_schema 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29e46fa7734afd93281656bfbd1380e07ac6a9d810e619ed0091967f74dc2394
-  data.tar.gz: 806994df60e5857e1c5d29d672a9098e22c4d29dd17d59dde52d2ca54c499858
+  metadata.gz: bef6e21b9050d5bd5a7734725db6453436984d9321e247b9eb880f3d33c9656e
+  data.tar.gz: 412a4aaccb9aebb656fcd7bd13a04b1bce922e11e7abb7d0ffa8e71fce0bdbcb
 SHA512:
-  metadata.gz: fca158592848060388e817a9b350b222f422df3ef7eb01f9b22785429889ff8b8d1f7770bcc68589030c7e02aecd0266b3f0cae2de391da853f83a007c8105d8
-  data.tar.gz: 00c3f526a81a7c837e195d1b81ded85e3cf6ade49bf2aedaa591b67636aa1ee1f72cf2ce393ad81dc8b226fef20a9a08ba48bd04da596713e18b1b89832686e7
+  metadata.gz: b8d5f9ae2557cbfc71a18fd61436615c3f2428bb1df3fb6e42955d34c1dbb6bd55d6b6a109d09d0a1f169f7c697337aae45881332c9842bdbb3281c04e7b2c0d
+  data.tar.gz: 16456292b2c5a0ed09bcda58c72e51f1c5e212227c0f0923bc7984101af4a5b972a36dff874b64c477ec00dabf7cbb4929e4be9df380d354f60e61c2049bb5f2

data/Cargo.lock

@@ -307,6 +307,27 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "fancy-regex"
 version = "0.11.0"
@@ -317,12 +338,33 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -510,6 +552,33 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -618,6 +687,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -695,6 +770,24 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -812,6 +905,50 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "openssl"
+version = "0.10.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -830,7 +967,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "smallvec",
  "windows-targets 0.48.5",
 ]
@@ -859,6 +996,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -913,6 +1056,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -966,26 +1118,48 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
+ "hyper-rustls",
+ "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "system-configuration",
  "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "rust_json_schema"
 version = "0.1.0"
@@ -993,6 +1167,7 @@ dependencies = [
  "jsonschema",
  "magnus",
  "rb-sys",
+ "reqwest",
  "serde_json",
 ]
 
@@ -1008,18 +1183,104 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustix"
+version = "0.38.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "seq-macro"
 version = "0.3.5"
@@ -1106,6 +1367,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -1144,6 +1411,19 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "time"
 version = "0.3.31"
@@ -1203,6 +1483,26 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.10"
@@ -1269,6 +1569,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.0"
@@ -1292,6 +1598,12 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1389,6 +1701,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"

data/README.md

@@ -4,13 +4,15 @@
 
 `rust_json_schema` is a Ruby wrapper gem for Rust's [jsonschema-rs crate](https://github.com/Stranger6667/jsonschema-rs).
 
-This gem ships with precompiled binaries for Linux and macOS. Check the available gems on [Rubygems](https://rubygems.org/gems/rust_json_schema).
+The minimum Ruby version required by this gem is 3.0, due to the runtime Rust libraries that make the extensions possible (and easy).
 
-## Warning
+This gem ships with precompiled binaries for Linux and macOS. Check the available gems on [Rubygems](https://rubygems.org/gems/rust_json_schema). Precompiled binaries do not exist for non-standard rubies like JRuby or TruffleRuby, nor do they exist for Windows. I will review and accept PRs if you would like to work on adding these build targets.
+
+[rusty_json_schema](https://github.com/driv3r/rusty_json_schema) is a direct source of inspiration. Now that [bundler has explicit support for rust-backed Ruby gems](https://bundler.io/blog/2023/01/31/rust-gem-skeleton.html) as of early 2023, the Rust library code is a lot simpler that it previously needed to be, largely thanks to [magnus crate](https://github.com/matsadler/magnus) and the [rb-sys gem](https://github.com/oxidize-rb/rb-sys/tree/main/gem), and by extension, the [oxidize-rb team](https://github.com/oxidize-rb).
 
-I do not have any significant Rust programming experience, but this gem satisifies a need for a performant JSON Schema validation tool in Ruby land. While I intend to use this gem in a production environment, consider this code and library entirely experimental, at least until a 1.0 release, if it ever comes to that.
+## Warning
 
-[rusty_json_schema](https://github.com/driv3r/rusty_json_schema) is a direct source of inspiration (and in some cases, literal copy and paste, like some fixtures/specs). Now that [bundler has explicit support for rust-backed Ruby gems](https://bundler.io/blog/2023/01/31/rust-gem-skeleton.html) as of early 2023, the Rust library code is a lot simpler that it previously needed to be, largely thanks to [magnus crate](https://github.com/matsadler/magnus) and the [rb-sys gem](https://github.com/oxidize-rb/rb-sys/tree/main/gem), and by extension, the [oxidize-rb team](https://github.com/oxidize-rb).
+My experience with Rust is limited, but this gem does have tests, and it is deployed in production. Please confirm that the gem is working as expected before using it in any production-critical situation. If you are using this gem in a production environment, and have any comments or feedback, I would love to hear about it.
 
 ## Installation
 
@@ -25,7 +27,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 ```ruby
-validator = RustJSONSchema::Validator.new(<<~JSON)
+schema = <<~JSON
   {
     "properties": {
       "foo": { "type": "string" },
@@ -36,6 +38,12 @@ validator = RustJSONSchema::Validator.new(<<~JSON)
   }
 JSON
 
+validator = RustJSONSchema::Validator.new(
+  schema,
+  draft: :draft7,
+  with_meta_schemas: false
+)
+
 errors = validator.validate('{ "foo": 1, "bar": "wadus" }')
 # => [
 #   'path "/bar": "wadus" is not of type "number"',
@@ -44,15 +52,21 @@ errors = validator.validate('{ "foo": 1, "bar": "wadus" }')
 # ]
 ```
 
+### Options
+
+- `:draft` - Select the JSON schema draft number to use. Valid options are `draft4`, `draft6`, `draft7`, `draft201909`, and `draft202012`. Supported drafts are entirely determined by the `jsonschema` crate. The default draft is also determined by the crate. If new versions of the crate support additional draft versions, a code change in this gem will be required. I'm open to PRs to solve this problem - I don't know enough Rust to tell if it's easily done. *Both `draft201909` and `draft202012` are reported to have "some keywords not implemented", so use them at your own risk.*
+- `:with_meta_schemas` - See [docs.rs/jsonschema CompilationOptions with_meta_schemas](https://docs.rs/jsonschema/0.17.1/jsonschema/struct.CompilationOptions.html#method.with_meta_schemas). `false` by default.
+
+Any additional options provided by the `jsonschema` crate are options I do not understand or may not make sense to implement in a wrapper library such as this.
+
+`RustJSONSchema::Validator#options` is provided and will return a Hash containing configuration options from the underlying Rust library. While I make an effort for them to look similar, or identical, to the options passed into the `Validator` initializer, the initializer arguments and the returned Hash should not be considered one-to-one. It exists as a way to confirm the configuration of the underlying schema validator instance.
+
 ### Errors
 
 - All errors are subclasses of `RustJSONSchema::Error`.
 - Calling `RustJSONSchema::Validator#new`, `#validate` or `#valid?` with a string which is not valid JSON will raise `RustJSONSchema::JSONParseError`.
 - Calling `RustJSONSchema::Validator#new` with an invalid schema will raise `RustJSONSchema::SchemaParseError`.
-
-## TODO
-
-- Support passing options as `jsonschema-rs` does
+- Calling `RustJSONSchema::Validator#new` with an invalid draft version value will raise `RustJSONSchema::InvalidOptionsError`.
 
 ## Development
 

data/ext/rust_json_schema/Cargo.toml

@@ -10,7 +10,8 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-jsonschema = "0.17.1"
+jsonschema = { version = "0.17.1", features = ["draft201909", "draft202012"] }
+reqwest = { version = "*", features = ["rustls-tls"] }
 magnus = "0.6"
 serde_json = "1.0"
 rb-sys = { version = "*", default-features = false, features = ["ruby-static"] }

data/ext/rust_json_schema/src/lib.rs

@@ -1,46 +1,96 @@
+extern crate serde_json;
+
+use jsonschema::{Draft, JSONSchema};
 use magnus::{
-    exception::ExceptionClass, function, gc::register_mark_object, method, prelude::*, value::Lazy,
-    wrap, RModule, Ruby,
+    exception::ExceptionClass,
+    function,
+    gc::register_mark_object,
+    method,
+    prelude::*,
+    scan_args::{get_kwargs, scan_args},
+    value::Lazy,
+    wrap, Error, RHash, RModule, Ruby, StaticSymbol, Value,
 };
 
-extern crate serde_json;
-use jsonschema::JSONSchema;
-
 #[wrap(class = "RustJSONSchema::Validator")]
 struct Validator {
     schema: JSONSchema,
+    draft: Draft,
+    with_meta_schemas: bool,
 }
 
 impl Validator {
-    fn new(json: String) -> Result<Validator, magnus::Error> {
+    fn new(args: &[Value]) -> Result<Validator, Error> {
+        let args = scan_args::<_, (), (), (), _, ()>(args)?;
+        let (json,): (String,) = args.required;
+        let kwargs = get_kwargs::<_, (), (Option<Value>, Option<bool>), ()>(
+            args.keywords,
+            &[],
+            &["draft", "with_meta_schemas"],
+        )?;
+        let (draft_arg, with_meta_schemas_arg): (Option<Value>, Option<bool>) = kwargs.optional;
+
+        let draft = match draft_arg {
+            Some(draft) => match draft.to_string().to_lowercase().as_str() {
+                "draft4" => Draft::Draft4,
+                "draft6" => Draft::Draft6,
+                "draft7" => Draft::Draft7,
+                "draft201909" => Draft::Draft201909,
+                "draft202012" => Draft::Draft202012,
+                _ => {
+                    return Err(Error::new(
+                        Self::ruby().get_inner(&INVALID_OPTIONS_ERROR),
+                        format!("invalid draft: '{}'", draft.to_string()),
+                    ))
+                }
+            },
+            None => jsonschema::Draft::default(),
+        };
+
+        let with_meta_schemas = match with_meta_schemas_arg {
+            Some(with_meta_schemas) => with_meta_schemas,
+            None => false,
+        };
+
         let value: serde_json::Value = match serde_json::from_str(&json) {
             Ok(value) => value,
             Err(error) => {
-                return Err(magnus::Error::new(
+                return Err(Error::new(
                     Self::ruby().get_inner(&JSON_PARSE_ERROR),
                     error.to_string(),
                 ))
             }
         };
 
-        let schema = match JSONSchema::options().compile(&value) {
+        let mut schema = JSONSchema::options();
+        schema.with_draft(draft);
+
+        if with_meta_schemas {
+            schema.with_meta_schemas();
+        }
+
+        let schema = match schema.compile(&value) {
             Ok(schema) => schema,
             Err(error) => {
-                return Err(magnus::Error::new(
+                return Err(Error::new(
                     Self::ruby().get_inner(&SCHEMA_PARSE_ERROR),
                     error.to_string(),
                 ))
             }
         };
 
-        Ok(Validator { schema })
+        Ok(Validator {
+            schema,
+            draft,
+            with_meta_schemas,
+        })
     }
 
-    fn is_valid(&self, json: String) -> Result<bool, magnus::Error> {
+    fn is_valid(&self, json: String) -> Result<bool, Error> {
         let value: serde_json::Value = match serde_json::from_str(&json) {
             Ok(value) => value,
             Err(error) => {
-                return Err(magnus::Error::new(
+                return Err(Error::new(
                     Self::ruby().get_inner(&JSON_PARSE_ERROR),
                     error.to_string(),
                 ));
@@ -50,11 +100,31 @@ impl Validator {
         Ok(self.schema.is_valid(&value))
     }
 
-    fn validate(&self, json: String) -> Result<Vec<String>, magnus::Error> {
+    fn options(&self) -> Result<RHash, Error> {
+        let options = RHash::new();
+
+        options
+            .aset(
+                StaticSymbol::new("draft"),
+                StaticSymbol::new(format!("{:?}", self.draft).to_lowercase()),
+            )
+            .unwrap();
+
+        options
+            .aset(
+                StaticSymbol::new("with_meta_schemas"),
+                self.with_meta_schemas,
+            )
+            .unwrap();
+
+        Ok(options)
+    }
+
+    fn validate(&self, json: String) -> Result<Vec<String>, Error> {
         let value: serde_json::Value = match serde_json::from_str(&json) {
             Ok(value) => value,
             Err(error) => {
-                return Err(magnus::Error::new(
+                return Err(Error::new(
                     Self::ruby().get_inner(&JSON_PARSE_ERROR),
                     error.to_string(),
                 ))
@@ -89,9 +159,7 @@ static JSON_PARSE_ERROR: Lazy<ExceptionClass> = Lazy::new(|ruby| {
         .unwrap()
         .const_get("JSONParseError")
         .unwrap();
-    // ensure `ex` is never garbage collected (e.g. if constant is
-    // redefined) and also not moved under compacting GC.
-    register_mark_object(ex);
+    register_mark_object(ex); // avoid GC
     ex
 });
 
@@ -102,21 +170,31 @@ static SCHEMA_PARSE_ERROR: Lazy<ExceptionClass> = Lazy::new(|ruby| {
         .unwrap()
         .const_get("SchemaParseError")
         .unwrap();
-    // ensure `ex` is never garbage collected (e.g. if constant is
-    // redefined) and also not moved under compacting GC.
-    register_mark_object(ex);
+    register_mark_object(ex); // avoid GC
+    ex
+});
+
+static INVALID_OPTIONS_ERROR: Lazy<ExceptionClass> = Lazy::new(|ruby| {
+    let ex = ruby
+        .class_object()
+        .const_get::<_, RModule>("RustJSONSchema")
+        .unwrap()
+        .const_get("InvalidOptionsError")
+        .unwrap();
+    register_mark_object(ex); // avoid GC
     ex
 });
 
 #[magnus::init]
-fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
+fn init(ruby: &Ruby) -> Result<(), Error> {
     let module = ruby.define_module("RustJSONSchema")?;
-    let class = module.define_class("Validator", ruby.class_object())?;
-
-    class.define_singleton_method("new", function!(Validator::new, 1))?;
 
+    // RustJSONSchema::Validator
+    let class = module.define_class("Validator", ruby.class_object())?;
+    class.define_singleton_method("new", function!(Validator::new, -1))?;
     class.define_method("valid?", method!(Validator::is_valid, 1))?;
     class.define_method("validate", method!(Validator::validate, 1))?;
+    class.define_method("options", method!(Validator::options, 0))?;
 
     // Ensure defined at load time
     Lazy::force(&JSON_PARSE_ERROR, ruby);

data/lib/rust_json_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RustJSONSchema
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/rust_json_schema.rb

@@ -8,6 +8,8 @@ module RustJSONSchema
   class JSONParseError < Error; end
 
   class SchemaParseError < Error; end
+
+  class InvalidOptionsError < Error; end
 end
 
 # Tries to require the extension for the given Ruby version first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rust_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Taylor Thurlow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler