oj-introspect 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a72b92485dbfef2a4b2fe110e3209d277c1cb98a356648d5c37d65015906b1b
-  data.tar.gz: 9d8047afdd2b9434fd257f05eb3bafef180c57a3b7c8e5a873bdf954dfd2dfab
+  metadata.gz: a8344e4ea03bb224e5911727d82641178d51384929ec66d40518b44b9d06cf1a
+  data.tar.gz: 6cd47873367c3d0305b40022ca35e46f22060df2fa3d5997927161150cf6996c
 SHA512:
-  metadata.gz: 42c8c6afb2256ae41a156892379fa8535f3944f457105db6d6f6b1581008dccc2ba76e413eef725428ea70d384b69ae3d6a8657d745a3eedda7997d1da13910a
-  data.tar.gz: 12446b7a5f18442a2dd7695823b08ebe331a71d707583342f8b9d7034a0acef529df8368cf490b2928da6ae4d31f673783075b3a24d3f302b6dbe8aab34a8db9
+  metadata.gz: c6c63c1724ed3b9295eef1b7858f78ff926042a3bef6d558648822a7a144dd2426ad2e884f8173f576a23c484c2e50c2170c90d905aefe4efa0a4c56b6eccc58
+  data.tar.gz: 50992a4c4cc58fe8589afc32669ea6bbb34a699078112e853299b707389f4883ee9e82f1fc0370ee87f61fb9847edb111e2d0540205378b88f9fc05ec008672f

data/.gitignore

@@ -13,3 +13,4 @@
 *.bundle
 Makefile
 *.o
+*.so

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,8 +1,8 @@
 PATH
   remote: .
   specs:
-    oj-introspect (0.5.0)
-      oj (>= 3.13.22)
+    oj-introspect (0.7.0)
+      oj (>= 3.13.23)
 
 GEM
   remote: https://rubygems.org/
@@ -11,11 +11,11 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.5.0)
     method_source (1.0.0)
-    oj (3.13.22)
+    oj (3.13.23)
     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/introspect.c

@@ -26,8 +26,14 @@ typedef struct _introspect_S {
   void (*delegated_open_object_key_func)(struct _ojParser *p);
   void (*delegated_open_array_key_func)(struct _ojParser *p);
   void (*delegated_close_object_func)(struct _ojParser *p);
+  void (*delegated_close_object_key_func)(struct _ojParser *p);
+  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;
 
@@ -51,16 +57,18 @@ 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) {
   IntrospectDelegate d = (IntrospectDelegate)p->ctx;
 
   if(strcmp(key, "filter=") == 0) {
+    Check_Type(value, T_STRING);
     copy_ruby_str(&d->filter, value); // We need to copy the value as GC can free it later.
 
     return Qtrue;
@@ -144,12 +152,10 @@ static void set_introspection_values(ojParser p) {
 
     if(!d->introspect) return;
 
-    switch_introspection(d);
-
     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) {
@@ -159,10 +165,28 @@ static void close_object_introspected(ojParser p) {
   set_introspection_values(p);
 }
 
+// We switch introspection off only for object and array keys.
+static void close_object_key_introspected(ojParser p) {
+  IntrospectDelegate d = (IntrospectDelegate)p->ctx;
+  d->delegated_close_object_func(p);
+
+  if(d->introspect) {
+    set_introspection_values(p);
+    switch_introspection(d);
+  }
+}
+
+static void close_array_key_introspected(ojParser p) {
+  IntrospectDelegate d = (IntrospectDelegate)p->ctx;
+  d->delegated_close_array_key_func(p);
+
+  if(d->introspect) switch_introspection(d);
+}
+
 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;
@@ -174,12 +198,7 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   d->delegated_option_func = p->option;
   p->option = option;
 
-  // 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.
-
-  // PCO - do you need the location of sub-objects and arrays or just top
-  // level objects?
+  // Wrap original functions to collect byte offsets
   Funcs f = &p->funcs[TOP_FUN];
   d->delegated_open_object_func = f->open_object;
   d->delegated_close_object_func = f->close_object;
@@ -193,9 +212,12 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   f = &p->funcs[OBJECT_FUN];
   d->delegated_open_array_key_func = f->open_array;
   d->delegated_open_object_key_func = f->open_object;
+  d->delegated_close_array_key_func = f->close_array;
+  d->delegated_close_object_key_func = f->close_object;
   f->open_array = open_array_key_introspected;
   f->open_object  = open_object_key_introspected;
-  f->close_object = close_object_introspected;
+  f->close_array = close_array_key_introspected;
+  f->close_object = close_object_key_introspected;
 
   // Init stack
   d->byte_offsets.current = 0;
@@ -208,18 +230,6 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   oj_parser_set_option(p, ropts);
 }
 
-VALUE oj_get_parser_introspect() {
-  VALUE oj_parser = oj_parser_new();
-  struct _ojParser *p;
-  Data_Get_Struct(oj_parser, struct _ojParser, p);
-
-  init_introspect_parser(p, Qnil);
-
-  rb_gc_register_address(&oj_parser);
-
-  return oj_parser;
-}
-
 static VALUE rb_new_introspect_parser(int argc, VALUE *argv, VALUE self) {
   rb_check_arity(argc, 0, 1);
 
@@ -240,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;
 }
 
@@ -267,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/lib/oj/introspect/version.rb

@@ -1,5 +1,5 @@
 module Oj
   class Introspect
-    VERSION = "0.5.0"
+    VERSION = "0.7.0"
   end
 end

data/oj-introspect.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/oj-introspect/extconf.rb"]
 
-  spec.add_dependency "oj", ">=3.13.22"
+  spec.add_dependency "oj", ">=3.13.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj-introspect
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.22
+        version: 3.13.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.22
+        version: 3.13.23
 description: Embeds start and end byte offsets of JSON objects into generated Ruby
   hashes.
 email: