oj-introspect 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba2633765040e6c57bc0efb529d6a28d955d4b58ec2643ac5957b4677602692
-  data.tar.gz: 208ae9e552fbce05eec0769634f7c45d463c202f621d8b10182afa17e481a021
+  metadata.gz: 0a72b92485dbfef2a4b2fe110e3209d277c1cb98a356648d5c37d65015906b1b
+  data.tar.gz: 9d8047afdd2b9434fd257f05eb3bafef180c57a3b7c8e5a873bdf954dfd2dfab
 SHA512:
-  metadata.gz: b41e516970c5dd6f15ad478e4fd0d179e40bbd361f1577354c8ff3066e06cc8d06e1414561d048257a2b6c3a48b65037573227079691b00bed5bf1f265b31a25
-  data.tar.gz: 2ded4748797fb9f87fec3fa9c7fed0a2b4b2ea38539aee5d085a15fea2631bc3f33a69e21f10950dc7233f631c106172a29eb961f03111221b501776ac44d8b6
+  metadata.gz: 42c8c6afb2256ae41a156892379fa8535f3944f457105db6d6f6b1581008dccc2ba76e413eef725428ea70d384b69ae3d6a8657d745a3eedda7997d1da13910a
+  data.tar.gz: 12446b7a5f18442a2dd7695823b08ebe331a71d707583342f8b9d7034a0acef529df8368cf490b2928da6ae4d31f673783075b3a24d3f302b6dbe8aab34a8db9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oj-introspect (0.3.0)
+    oj-introspect (0.5.0)
       oj (>= 3.13.22)
 
 GEM

data/bin/benchmark

@@ -5,16 +5,21 @@ require "oj/introspect"
 require "json"
 require "benchmark/ips"
 
-TEST_JSON = '{ "foo": "bar" }'
+TEST_JSON = File.read("./spec/fixtures/vulnerabilities.json")
 
 INTROSPECT_PARSER = Oj::Parser.introspect
+FILTERED_INTROSPECT_PARSER = Oj::Introspect.new(filter: "remediations")
 USUAL_PARSER = Oj::Parser.usual
 
 Benchmark.ips do |b|
-  b.report("Introspected") do
+  b.report("Introspect") do
     INTROSPECT_PARSER.parse(TEST_JSON)
   end
 
+  b.report("Filtered introspect") do
+    FILTERED_INTROSPECT_PARSER.parse(TEST_JSON)
+  end
+
   b.report("Oj usual") do
     USUAL_PARSER.parse(TEST_JSON)
   end

data/ext/oj-introspect/extconf.rb

@@ -9,4 +9,4 @@ OJ_HEADERS = oj_version_file_path.join('..', '..', '..', 'ext', 'oj').to_s
 
 dir_config('oj', [OJ_HEADERS], [])
 
-create_makefile("oj-introspect/introspect_ext")
+create_makefile("oj/introspect/introspect_ext")

data/ext/oj-introspect/introspect.c

@@ -16,16 +16,22 @@ typedef struct _introspect_S {
   struct _usual usual; // inherit all the attributes from `_usual` struct
   struct _byte_offsets byte_offsets; // I think it's better to encapsulate common fields under a namespace
 
+  char *filter;
+  bool introspect;
+
   void (*delegated_start_func)(struct _ojParser *p);
   void (*delegated_free_func)(struct _ojParser *p);
+  VALUE (*delegated_option_func)(struct _ojParser *p, const char *key, VALUE value);
   void (*delegated_open_object_func)(struct _ojParser *p);
   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);
-} *IntrospectDelegate;
+} * IntrospectDelegate;
 
 static void dfree(ojParser p) {
   IntrospectDelegate d = (IntrospectDelegate)p->ctx;
 
+  if(d->filter != NULL) xfree(d->filter);
   xfree(d->byte_offsets.stack);
   d->delegated_free_func(p);
 }
@@ -36,6 +42,31 @@ static void start(ojParser p) {
     d->delegated_start_func(p);
     // Reset to zero so the parser and delegate can be reused.
     d->byte_offsets.current = 0;
+
+    /*
+    * If the `filter` is provided we will start introspecting later
+    * once we encounter with the key provided.
+    */
+    d->introspect = (d->filter == NULL);
+}
+
+static void copy_ruby_str(char **target, VALUE source) {
+  size_t len = RSTRING_LEN(source);
+  *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)
+}
+
+static VALUE option(ojParser p, const char *key, VALUE value) {
+  IntrospectDelegate d = (IntrospectDelegate)p->ctx;
+
+  if(strcmp(key, "filter=") == 0) {
+    copy_ruby_str(&d->filter, value); // We need to copy the value as GC can free it later.
+
+    return Qtrue;
+  }
+
+  return d->delegated_option_func(p, key, value);
 }
 
 static void ensure_byte_offsets_stack(IntrospectDelegate d) {
@@ -65,16 +96,56 @@ static void open_object_introspected(ojParser p) {
   d->delegated_open_object_func(p);
 }
 
+static char * previously_inserted_key(IntrospectDelegate d) {
+  Key key = (d->usual.ktail - 1);
+
+  return ((size_t)key->len < sizeof(key->buf)) ? key->buf : key->key;
+}
+
+static bool should_switch_introspection(IntrospectDelegate d) {
+  return strcmp(d->filter, previously_inserted_key(d)) == 0;
+}
+
+/*
+* WHEN there is a filter
+* AND
+*     WHEN the introspection is disabled
+*     AND the last inserted key matches the filter
+*     THEN enable introspection
+*   OR
+*     WHEN the introspection is enabled
+*     AND the last inserted key matches the filter
+*     THEN disable introspection
+*/
+static void switch_introspection(IntrospectDelegate d) {
+  if(d->filter == NULL) return;
+
+  d->introspect = should_switch_introspection(d) != d->introspect; // a XOR b
+}
+
 static void open_object_key_introspected(ojParser p) {
   push(p);
 
   IntrospectDelegate d = (IntrospectDelegate)p->ctx;
   d->delegated_open_object_key_func(p);
+
+  if(!d->introspect) switch_introspection(d);
+}
+
+static void open_array_key_introspected(ojParser p) {
+  IntrospectDelegate d = (IntrospectDelegate)p->ctx;
+  d->delegated_open_array_key_func(p);
+
+  if(!d->introspect) switch_introspection(d);
 }
 
 static void set_introspection_values(ojParser p) {
     IntrospectDelegate d = (IntrospectDelegate)p->ctx;
 
+    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));
@@ -100,6 +171,9 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   d->delegated_start_func = p->start;
   p->start = start;
 
+  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.
@@ -117,7 +191,9 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   f->close_object = close_object_introspected;
 
   f = &p->funcs[OBJECT_FUN];
+  d->delegated_open_array_key_func = f->open_array;
   d->delegated_open_object_key_func = f->open_object;
+  f->open_array = open_array_key_introspected;
   f->open_object  = open_object_key_introspected;
   f->close_object = close_object_introspected;
 
@@ -126,6 +202,8 @@ static void init_introspect_parser(ojParser p, VALUE ropts) {
   d->byte_offsets.stack   = ALLOC_N(long, BYTE_OFFSETS_STACK_INC_SIZE);
   d->byte_offsets.length  = BYTE_OFFSETS_STACK_INC_SIZE;
 
+  d->filter = NULL;
+
   // Process options.
   oj_parser_set_option(p, ropts);
 }

data/lib/oj/introspect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj-introspect
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj