oj 3.13.22 → 3.13.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90ba7b2698041767008afd20cef0dbd6ba1af0d97affa2253b12e199e6c528d
-  data.tar.gz: f9a8219f0b6f66ef0608136068d78cbc6c8b1ee765bfaa68eeb828cae1401fd8
+  metadata.gz: 3d2f8a01b7a59da7cd25ed3551065dddd9e31e5184989804d172c2e39cc769d6
+  data.tar.gz: 7211a96856ec44173fa9dcc7245e3cb2f6b7c2e22a746ef35f168126873f4c88
 SHA512:
-  metadata.gz: e72d7030911b6609946437de78aaf4fa9003a598c77dca472c2998f9af6115436e817fb4c46ec0ead55cb1ccb0ba80298c2ab060fab9fe37d0ec825d0ec6e5e4
-  data.tar.gz: 4aacdb9f034a2548a3eb942b4a29fb66a9839a63770bd10d0b8b62d93d944070d78ee53ca26881f05108047cc9c120efb3a732048b0be51a608f144f2ad0a374
+  metadata.gz: ee3ad5cac6cac48bcf7fdf682e69770dfee08b502735cc75b84ae1635196fdcdaf2fde021e32e6d897bdc6935e111882ddc48fa5a274fe0d98ad45c2fdf68917
+  data.tar.gz: 3e05212fa84a2bf05954ec870ac27da7c845335b411507aa0bf5e45497403cccf4c40990f0ee8cee6d21f19163f33116bb240836795482737eaa744bc5ff6d94

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.13.23 - 2022-11-06
+
+- Fixed issue with Oj::Parser extension regarding GC timeing.
+
 ## 3.13.22 - 2022-11-01
 
 - Reorganized Oj::Parser code to allow for parser extensions in C.

data/ext/oj/oj.c

@@ -243,7 +243,7 @@ struct _options oj_default_options = {
  *references
  * - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist
  * - *:symbol_keys* [_Boolean_|_nil_] use symbols instead of strings for hash keys
- * - *:escape_mode* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] determines the
+ * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_] determines the
  *characters to escape
  * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically modifying
  *classes or reloading classes then don't use this)
@@ -251,7 +251,7 @@ struct _options oj_default_options = {
  *to use for JSON
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
- * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_] load decimals as BigDecimal instead
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] load decimals as BigDecimal instead
  *of as a Float. :auto pick the most precise for the number of digits. :float should be the same as
  *ruby. :fast may require rounding but is must faster.
  * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float when in

data/ext/oj/parser.c

@@ -1145,7 +1145,9 @@ static void parser_free(void *ptr) {
     p = (ojParser)ptr;
     buf_cleanup(&p->key);
     buf_cleanup(&p->buf);
-    p->free(p);
+    if (NULL != p->free) {
+        p->free(p);
+    }
     xfree(ptr);
 }
 
@@ -1156,7 +1158,9 @@ static void parser_mark(void *ptr) {
         if (0 != p->reader) {
             rb_gc_mark(p->reader);
         }
-        p->mark(p);
+        if (NULL != p->mark) {
+            p->mark(p);
+        }
     }
 }
 

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module.
-  VERSION = '3.13.22'
+  VERSION = '3.13.23'
 end

data/pages/Options.md

@@ -66,6 +66,10 @@ Determines how to load decimals.
 
  - `:auto` the most precise for the number of digits is used.
 
+ - `:fast` faster conversion to Float.
+
+ - `:ruby` convert to Float using the Ruby `to_f` conversion.
+
 This can also be set with `:decimal_class` when used as a load or
 parse option to match the JSON gem. In that case either `Float`,
 `BigDecimal`, or `nil` can be provided.
@@ -154,6 +158,8 @@ Determines the characters to escape when dumping. Only the :ascii and
 
  - `:json` follows the JSON specification. This is the default mode.
 
+ - `:slash` escapes `/` characters.
+
  - `:xss_safe` escapes HTML and XML characters such as `&` and `<`.
 
  - `:ascii` escapes all non-ascii or characters with the hi-bit set.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.22
+  version: 3.13.23
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -110,7 +110,6 @@ files:
 - ext/oj/fast.c
 - ext/oj/intern.c
 - ext/oj/intern.h
-- ext/oj/introspect.c
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c

data/ext/oj/introspect.c

@@ -1,96 +0,0 @@
-
-#include "cache.h"
-#include "oj.h"
-#include "parser.h"
-#include "usual.h"
-
-#define BYTE_OFFSETS_STACK_INC_SIZE 256
-
-VALUE mod = Qnil;
-
-typedef struct _introspect {
-    struct _usual usual;
-    void (*start)(struct _ojParser *p);
-    void (*free)(struct _ojParser *p);
-    void (*mark)(struct _ojParser *p);
-    void (*open_object)(struct _ojParser *p);
-    void (*close_object)(struct _ojParser *p);
-
-    int len;
-    int cur;
-    long *stack;
-
-} * Introspect;
-
-static void dfree(ojParser p) {
-    Introspect d = (Introspect)p->ctx;
-
-    xfree(d->stack);
-    // As with the mark() function, this function should still work.
-    d->free(p);
-}
-
-static void start(ojParser p) {
-    Introspect d = (Introspect)p->ctx;
-
-    d->start(p);
-
-    d->stack = ALLOC_N(long, BYTE_OFFSETS_STACK_INC_SIZE);
-    d->len = BYTE_OFFSETS_STACK_INC_SIZE;
-    d->cur = 0;
-}
-
-static void open_object(ojParser p) {
-    Introspect d = (Introspect)p->ctx;
-
-    d->open_object(p);
-
-    // TBD add offset
-}
-
-static void close_object(ojParser p) {
-    Introspect d = (Introspect)p->ctx;
-
-    d->close_object(p);
-
-    // TBD set offset on hash
-}
-
-static VALUE new_parser(VALUE self, VALUE ropts) {
-    volatile VALUE pv = oj_parser_new();
-    ojParser       p  = (ojParser)DATA_PTR(pv);
-    Introspect     d  = ALLOC(struct _introspect);
-
-    oj_init_usual(p, &d->usual);
-
-    // Set the options before switching to the Introspect delegate.
-    p->ctx    = (void *)d;
-
-    d->free = p->free;
-    p->free   = dfree;
-
-    d->start = p->start;
-    p->start  = start;
-
-    // We are cheating with the mark, free, and options functions. Since
-    // struct _usual is the first member of struct _introspect the cast to
-    // Usual in the usual.c mark() function should still work just fine.
-
-    d->open_object = p->funcs[TOP_FUN].open_object;
-    p->funcs[TOP_FUN].open_object = open_object;
-
-    d->close_object = p->funcs[TOP_FUN].close_object;
-    p->funcs[TOP_FUN].close_object = close_object;
-
-    Check_Type(ropts, T_HASH);
-    oj_parser_set_option(p, ropts);
-
-    return pv;
-}
-
-void Init_introspect(void) {
-    mod = rb_define_module("Introspect");
-    rb_gc_register_address(&mod);
-
-    rb_define_module_function(mod, "parser", new_parser, 1);
-}