oj-introspect 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718229e62c9fde37495f36cb674b79025c626a934d188698a0e2c87937566809
-  data.tar.gz: 490a556129f5d13bc29c1b422e0af6cded6d97c88ead6b953ada4abf06ada594
+  metadata.gz: 74ab6b62802075f9e3c9d9efc7fb13a2eca6d61c6da2f58e1b5f853fe08841c8
+  data.tar.gz: 13874ca3c2afea6ba3fb9de442f904b1dd8fe24131f7c4430ee496c01b6fd627
 SHA512:
-  metadata.gz: 92ddcdc95170deef8d6854a879c5c910181ab6a16bbdb175e8d92ab67169ca80ee36d7ddfdcbf3aa45c036955c60d6642c53e45d9bbed3f3584aac61335c83cf
-  data.tar.gz: a45c33ee35937db46ee01819b25264b9d7e9336a014a93edaba0cf878b5ad5d3a4a3303f8357b9848253d2953a50c2679469cc52e62ceabeb462da2616f43338
+  metadata.gz: c7bfa4f6a854ae76136e01f102b63c231b055c06b3fbe5941b98b0c3a00b6d79653fad56afde069fc2907e693164ac1385ef4c3363e817cb48fb12592a99da4d
+  data.tar.gz: b151a7bbc3f00291110db4c30f5bfb2cbdbcfdc3ac150062ba98f07f58598cd71eaced956bca86a40fb6fce83c529a2599a2b6948d95495b6fe8e665b0b13658

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 gem "benchmark-ips"
 gem "pry"
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rake-compiler"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oj-introspect (0.6.0)
+    oj-introspect (0.7.1)
       oj (>= 3.13.23)
 
 GEM
@@ -15,7 +15,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (12.3.3)
+    rake (13.0.6)
     rake-compiler (1.2.0)
       rake
     rspec (3.12.0)
@@ -39,7 +39,7 @@ DEPENDENCIES
   benchmark-ips
   oj-introspect!
   pry
-  rake (~> 12.0)
+  rake (~> 13.0)
   rake-compiler
   rspec (~> 3.0)
 

data/ext/oj-introspect/extconf.rb

@@ -7,6 +7,22 @@ oj_version_file_path = Pathname.new(oj_version_file)
 
 OJ_HEADERS = oj_version_file_path.join('..', '..', '..', 'ext', 'oj').to_s
 
+cc_version = `#{RbConfig.expand("$(CC) --version".dup)}`
+if cc_version.match?(/clang/i)
+  # Ignore symbols loaded from Oj in case Ruby is compiled without
+  # "-Wl,-undefined,dynamic_lookup" (related to https://bugs.ruby-lang.org/issues/19005)
+  symfile = File.join(__dir__, 'oj.sym')
+  dynamic_symbols = File.readlines(symfile)
+  dynamic_symbols.each do |sym|
+    $DLDFLAGS << " -Wl,-U,#{sym.strip}"
+  end
+
+  # Needed for Ruby 3.2 ABI check: https://github.com/ruby/ruby/pull/5474
+  if RUBY_VERSION >= "3.2"
+    $LDFLAGS << " -Wl,-exported_symbol,_ruby_abi_version"
+  end
+end
+
 dir_config('oj', [OJ_HEADERS], [])
 
 create_makefile("oj/introspect/introspect_ext")

data/ext/oj-introspect/introspect.c

@@ -30,6 +30,10 @@ typedef struct _introspect_S {
   void (*delegated_close_array_key_func)(struct _ojParser *p);
 } * IntrospectDelegate;
 
+static VALUE introspection_key;
+static VALUE start_byte_key;
+static VALUE end_byte_key;
+
 static void dfree(ojParser p) {
   IntrospectDelegate d = (IntrospectDelegate)p->ctx;
 
@@ -53,10 +57,11 @@ static void start(ojParser p) {
 }
 
 static void copy_ruby_str(char **target, VALUE source) {
-  size_t len = RSTRING_LEN(source);
+  const char *ruby_str = StringValueCStr(source);
+  size_t len = strlen(ruby_str);
+
   *target = ALLOC_N(char, len + 1);
-  memcpy(*target, RSTRING_PTR(source), len);
-  (*target)[len] = '\0'; // Parantheses are important as it means => (*target + sizeof(char) * len)
+  strncpy(*target, ruby_str, len + 1);
 }
 
 static VALUE option(ojParser p, const char *key, VALUE value) {
@@ -148,9 +153,9 @@ static void set_introspection_values(ojParser p) {
     if(!d->introspect) return;
 
     volatile VALUE obj = rb_hash_new();
-    rb_hash_aset(obj, ID2SYM(rb_intern("start_byte")), INT2FIX(pop(p)));
-    rb_hash_aset(obj, ID2SYM(rb_intern("end_byte")), INT2FIX(p->cur));
-    rb_hash_aset(*(d->usual.vtail - 1), ID2SYM(rb_intern("__oj_introspection")), obj);
+    rb_hash_aset(obj, start_byte_key, INT2FIX(pop(p)));
+    rb_hash_aset(obj, end_byte_key, INT2FIX(p->cur));
+    rb_hash_aset(*(d->usual.vtail - 1), introspection_key, obj);
 }
 
 static void close_object_introspected(ojParser p) {
@@ -181,7 +186,7 @@ static void close_array_key_introspected(ojParser p) {
 static void init_introspect_parser(ojParser p, VALUE ropts) {
   IntrospectDelegate d = ALLOC(struct _introspect_S);
 
-  oj_init_usual(p, (Usual)d);
+  oj_init_usual(p, &d->usual);
 
   // now function mangling...
   d->delegated_free_func = p->free;
@@ -245,10 +250,6 @@ static VALUE rb_new_introspect_parser(int argc, VALUE *argv, VALUE self) {
 
   init_introspect_parser(p, options);
 
-  // This locks the object in memory and is never recovered. Best to let the
-  // mark function handle it.
-  // rb_gc_register_address(&oj_parser);
-
   return oj_parser;
 }
 
@@ -272,6 +273,14 @@ void Init_introspect_ext() {
   VALUE parser_module = rb_const_get(oj_module, rb_intern("Parser"));
   VALUE introspection_class = rb_define_class_under(oj_module, "Introspect", rb_cObject);
 
+  introspection_key = ID2SYM(rb_intern("__oj_introspection"));
+  rb_gc_register_address(&introspection_key);
+  start_byte_key = ID2SYM(rb_intern("start_byte"));
+  rb_gc_register_address(&start_byte_key);
+  end_byte_key = ID2SYM(rb_intern("end_byte"));
+  rb_gc_register_address(&end_byte_key);
+
+  rb_const_set(introspection_class, rb_intern("KEY"), introspection_key);
   rb_define_singleton_method(parser_module, "introspect", rb_get_default_introspect_parser, 0);
   rb_define_singleton_method(introspection_class, "new", rb_new_introspect_parser, -1);
 }

data/ext/oj-introspect/oj.sym

@@ -0,0 +1,3 @@
+_oj_init_usual
+_oj_parser_new
+_oj_parser_set_option

data/lib/oj/introspect/version.rb

@@ -1,5 +1,5 @@
 module Oj
   class Introspect
-    VERSION = "0.6.0"
+    VERSION = "0.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj-introspect
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -47,6 +47,7 @@ files:
 - bin/test_run
 - ext/oj-introspect/extconf.rb
 - ext/oj-introspect/introspect.c
+- ext/oj-introspect/oj.sym
 - lib/oj/introspect.rb
 - lib/oj/introspect/version.rb
 - oj-introspect.gemspec