rust_json_schema 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fe337a421bd1dc7c86285685347052694d0277ec43517e575a0d18abe53a19
-  data.tar.gz: 64840e47fb7a9f03b8a40bb626b227f465a956e1b34c4f3247a0ec9c19894c48
+  metadata.gz: 29e46fa7734afd93281656bfbd1380e07ac6a9d810e619ed0091967f74dc2394
+  data.tar.gz: 806994df60e5857e1c5d29d672a9098e22c4d29dd17d59dde52d2ca54c499858
 SHA512:
-  metadata.gz: 2f91e752ffd9b53875f496e1872ef155428901fe080cfcae390be74074ddc4b642936886d80d23624c35924b53557a8eaee3a4a9bd49a73cd8202ca7719ecf1b
-  data.tar.gz: fce2704fcbfcc943b1c4013a67a2a4b30313695fe9be6f7787c8fbd1db3b6c16aca54bfff0612edf7f6b44828d2a70f0aba90c0c083c7fe3d8df9823a186478d
+  metadata.gz: fca158592848060388e817a9b350b222f422df3ef7eb01f9b22785429889ff8b8d1f7770bcc68589030c7e02aecd0266b3f0cae2de391da853f83a007c8105d8
+  data.tar.gz: 00c3f526a81a7c837e195d1b81ded85e3cf6ade49bf2aedaa591b67636aa1ee1f72cf2ce393ad81dc8b226fef20a9a08ba48bd04da596713e18b1b89832686e7

data/ext/rust_json_schema/src/lib.rs

@@ -12,12 +12,12 @@ struct Validator {
 }
 
 impl Validator {
-    fn new(ruby: &Ruby, json: String) -> Result<Validator, magnus::Error> {
+    fn new(json: String) -> Result<Validator, magnus::Error> {
         let value: serde_json::Value = match serde_json::from_str(&json) {
             Ok(value) => value,
             Err(error) => {
                 return Err(magnus::Error::new(
-                    ruby.get_inner(&JSON_PARSE_ERROR),
+                    Self::ruby().get_inner(&JSON_PARSE_ERROR),
                     error.to_string(),
                 ))
             }
@@ -27,7 +27,7 @@ impl Validator {
             Ok(schema) => schema,
             Err(error) => {
                 return Err(magnus::Error::new(
-                    ruby.get_inner(&SCHEMA_PARSE_ERROR),
+                    Self::ruby().get_inner(&SCHEMA_PARSE_ERROR),
                     error.to_string(),
                 ))
             }
@@ -36,14 +36,31 @@ impl Validator {
         Ok(Validator { schema })
     }
 
-    fn is_valid(&self, json: String) -> bool {
-        let value: serde_json::Value = serde_json::from_str(&json).unwrap();
+    fn is_valid(&self, json: String) -> Result<bool, magnus::Error> {
+        let value: serde_json::Value = match serde_json::from_str(&json) {
+            Ok(value) => value,
+            Err(error) => {
+                return Err(magnus::Error::new(
+                    Self::ruby().get_inner(&JSON_PARSE_ERROR),
+                    error.to_string(),
+                ));
+            }
+        };
 
-        self.schema.is_valid(&value)
+        Ok(self.schema.is_valid(&value))
     }
 
-    fn validate(&self, json: String) -> Vec<String> {
-        let value: serde_json::Value = serde_json::from_str(&json).unwrap();
+    fn validate(&self, json: String) -> Result<Vec<String>, magnus::Error> {
+        let value: serde_json::Value = match serde_json::from_str(&json) {
+            Ok(value) => value,
+            Err(error) => {
+                return Err(magnus::Error::new(
+                    Self::ruby().get_inner(&JSON_PARSE_ERROR),
+                    error.to_string(),
+                ))
+            }
+        };
+
         let mut errors: Vec<String> = vec![];
 
         if let Err(validation_errors) = self.schema.validate(&value) {
@@ -57,7 +74,11 @@ impl Validator {
             }
         }
 
-        errors
+        Ok(errors)
+    }
+
+    fn ruby() -> Ruby {
+        Ruby::get().unwrap()
     }
 }
 
@@ -97,5 +118,9 @@ fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
     class.define_method("valid?", method!(Validator::is_valid, 1))?;
     class.define_method("validate", method!(Validator::validate, 1))?;
 
+    // Ensure defined at load time
+    Lazy::force(&JSON_PARSE_ERROR, ruby);
+    Lazy::force(&SCHEMA_PARSE_ERROR, ruby);
+
     Ok(())
 }

data/lib/rust_json_schema/version.rb

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

data/lib/rust_json_schema.rb

@@ -2,14 +2,6 @@
 
 require_relative "rust_json_schema/version"
 
-# Tries to require the extension for the given Ruby version first
-begin
-  RUBY_VERSION =~ /(\d+\.\d+)/
-  require "rust_json_schema/#{Regexp.last_match(1)}/rust_json_schema"
-rescue LoadError
-  require_relative "rust_json_schema/rust_json_schema"
-end
-
 module RustJSONSchema
   class Error < StandardError; end
 
@@ -17,3 +9,11 @@ module RustJSONSchema
 
   class SchemaParseError < Error; end
 end
+
+# Tries to require the extension for the given Ruby version first
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require "rust_json_schema/#{Regexp.last_match(1)}/rust_json_schema"
+rescue LoadError
+  require_relative "rust_json_schema/rust_json_schema"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rust_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Taylor Thurlow