rapidjson 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722ff2bcb2ebfc8ab861d5066e53e938933bd03d2e7f4bca7662233fa0a8a314
-  data.tar.gz: 59d25e68af12d81bc3b5517a88de320a76a72c6b5d7cc9d26758084bd604b9fe
+  metadata.gz: 5e6a9c6ee55bf39622dca0dec0df0edb42de2f121dfd81b6711e3e730c7beb90
+  data.tar.gz: 2d3f80f79aa7e61cc0340f253891bfb4c6f67d3c80c1bf8a6e23b132d7dd8334
 SHA512:
-  metadata.gz: 4eea208e695986e0e312c3794ba44852057f86a8159c4d862518482d263f2d13ef94fff481c38e2d7a79f881a13cef08e65eff4d49ded5c85378891bc79dab85
-  data.tar.gz: cafbbb2e33c4adecdfac50d1fc0bb34e3c1b019828af29714b0005a8a24955c3914c79e7a9690161589597b3df12928d6adddad8887014fd48fb36b58525f25d
+  metadata.gz: f0e242022084c035eec3fc8deede180bf390f9275aae83bf923ee7ab2076bb5abc1860eded72bc6c43aa8eb9803d492b7477f1923fa343cc2348d72dff809872
+  data.tar.gz: 34092b2851dade4bf8adcec4dcf8e8fe66a561a41910c9ff99ac721d6aad48d6340bde69f586973d1f004583aa5eb5c5d278117375418edfe0365a91f339a963

data/ext/rapidjson/cext.cc

@@ -19,26 +19,44 @@ typedef RubyStringBuffer DefaultBuffer;
 static VALUE
 dump(VALUE _self, VALUE obj, VALUE pretty, VALUE as_json, VALUE allow_nan) {
     // NB: as_json here is not marked by the extension, but is always on the stack
+    VALUE result;
+    int state;
+
     if (RTEST(pretty)) {
         RubyObjectEncoder<DefaultBuffer, PrettyWriter<DefaultBuffer> > encoder(as_json, RTEST(allow_nan));
-        return encoder.encode(obj);
+        encoder.writer.SetIndent(' ', 2);
+        result = encoder.encode_protected(obj, &state);
     } else {
         RubyObjectEncoder<DefaultBuffer, Writer<DefaultBuffer> > encoder(as_json, RTEST(allow_nan));
-        return encoder.encode(obj);
+        result = encoder.encode_protected(obj, &state);
+    }
+
+    if (state) {
+        rb_jump_tag(state);
     }
+    return result;
 }
 
 static VALUE
-load(VALUE _self, VALUE string) {
-    RubyObjectHandler handler;
-    Reader reader;
-    char *cstring = StringValueCStr(string); // fixme?
-    StringStream ss(cstring);
-    ParseResult ok = reader.Parse(ss, handler);
+load(VALUE _self, VALUE string, VALUE allow_nan) {
+    RubyObjectHandler handler(RTEST(allow_nan));
+    ParseResult ok;
+
+    {
+        char *cstring = StringValueCStr(string); // fixme?
+        StringStream ss(cstring);
+        Reader reader;
+        ok = reader.Parse<kParseNanAndInfFlag>(ss, handler);
+    }
 
     if (!ok) {
-        rb_raise(rb_eParseError, "JSON parse error: %s (%lu)",
-                GetParseError_En(ok.Code()), ok.Offset());
+        VALUE err = handler.GetErr();
+        if (RTEST(err)) {
+            rb_exc_raise(err);
+        } else {
+            rb_raise(rb_eParseError, "JSON parse error: %s (%lu)",
+                    GetParseError_En(ok.Code()), ok.Offset());
+        }
     }
 
     return handler.GetRoot();
@@ -68,7 +86,7 @@ Init_rapidjson(void)
     rb_global_variable(&rb_cRapidJSONFragment);
 
     rb_define_private_method(rb_cCoder, "_dump", dump, 4);
-    rb_define_method(rb_cCoder, "load", load, 1);
+    rb_define_method(rb_cCoder, "_load", load, 2);
     rb_define_method(rb_cCoder, "valid_json?", valid_json_p, 1);
 
     VALUE rb_eRapidJSONError = rb_const_get(rb_mRapidJSON, rb_intern("Error"));

data/ext/rapidjson/encoder.hh

@@ -8,7 +8,6 @@ using namespace rapidjson;
 template <typename B = RubyStringBuffer, typename W=Writer<B> >
 class RubyObjectEncoder {
     B buf;
-    W writer;
     VALUE as_json;
     bool allow_nan;
 
@@ -200,10 +199,26 @@ class RubyObjectEncoder {
             allow_nan = allow_nan_;
         };
 
+        W writer;
         int depth;
 
         VALUE encode(VALUE obj) {
             encode_any(obj, true);
             return buf.GetRubyString();
         }
+
+        struct protected_args {
+            RubyObjectEncoder *encoder;
+            VALUE obj;
+        };
+
+        static VALUE encode_protected_cb(VALUE data) {
+            struct protected_args *args = (struct protected_args *)data;
+            return args->encoder->encode(args->obj);
+        }
+
+        VALUE encode_protected(VALUE obj, int *state) {
+            struct protected_args args = { this, obj };
+            return rb_protect(encode_protected_cb, (VALUE)&args, state);
+        }
 };

data/ext/rapidjson/parser.hh

@@ -50,6 +50,10 @@ struct RubyObjectHandler : public BaseReaderHandler<UTF8<>, RubyObjectHandler> {
     }
 
     bool Double(double d) {
+        if (!isfinite(d) && !allow_nan) {
+            err = rb_exc_new_cstr(rb_eParseError, "JSON parse error: Invalid float value");
+            return false;
+        }
         return PutValue(rb_float_new(d));
     }
 
@@ -92,7 +96,7 @@ struct RubyObjectHandler : public BaseReaderHandler<UTF8<>, RubyObjectHandler> {
             depth++;
             return true;
         } else {
-            rb_raise(rb_eParseError, "JSON parse error: input too deep");
+            err = rb_exc_new_cstr(rb_eParseError, "JSON parse error: input too deep");
             return false;
         }
     }
@@ -140,12 +144,18 @@ struct RubyObjectHandler : public BaseReaderHandler<UTF8<>, RubyObjectHandler> {
         return stack[0];
     }
 
-    RubyObjectHandler(): depth(0) {
+    VALUE GetErr() {
+        return err;
+    }
+
+    RubyObjectHandler(bool allow_nan): err(Qfalse), depth(0), allow_nan(allow_nan) {
         stack[0] = Qundef;
     }
 
     static const int MAX_DEPTH = 256;
-    int depth;
     VALUE stack[MAX_DEPTH];
     VALUE last_key[MAX_DEPTH];
+    VALUE err;
+    int depth;
+    bool allow_nan;
 };

data/lib/rapidjson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RapidJSON
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/rapidjson.rb

@@ -17,6 +17,10 @@ module RapidJSON
     def dump(object)
       _dump(object, @pretty, @to_json_proc, @allow_nan)
     end
+
+    def load(string)
+      _load(string, @allow_nan)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapidjson
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies: []
 description: Fast JSON encoder/decoder based using RapidJSON
 email: