rotoscope 0.3.0.pre.5 → 0.3.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1820c6d940f6bf81fed89461da5327dea609dc2a
-  data.tar.gz: 137ad7162d730b0749bbe8d1eddb1d79408533b4
+  metadata.gz: 5e1efb6a5e9839ddf8219a7cfe6287195f0efbc5
+  data.tar.gz: 91bb41de1a6c892ccd9bb0f6e9b437c67fe90c68
 SHA512:
-  metadata.gz: 65a8c8f40541881b178b4657a0b0f1784adf49e55be1123cc463a36efdc20fdfdf615f19686bcda68608a28931e2014f2842cce55a331e98d0bce4e30431da12
-  data.tar.gz: 673e6eae938960169f417005f50866fc44eecf89fe227dfbdb70439e9d1efeb9457c23408b7882e76ce1b8d1754d58a01d7443164c687cade8411d7d8b536442
+  metadata.gz: 436314656fd8c5e6ebabfd3b89b3ad2951b7073f530b3ac1381c04ad0a972fe3e434595c8e0a07e0c13e6ef1c5f1177bcc270b5995a15538466a7c2553637a26
+  data.tar.gz: fae7fbf6c7c84b337579b1270f0620860dde11c0f88f8a526d2bfca87cf3eae8b2eee15de56c2ca3aca631538233bb351770f3c30cfda77fd0b4f1c3d73096d8

data/ext/rotoscope/rotoscope.c

@@ -14,7 +14,8 @@
 #include "tracepoint.h"
 
 VALUE cRotoscope, cTracePoint;
-ID id_initialize;
+ID id_initialize, id_gsub;
+VALUE str_quote, str_escaped_quote;
 
 static unsigned long gettid() {
   return NUM2ULONG(rb_obj_id(rb_thread_current()));
@@ -119,8 +120,18 @@ static rs_tracepoint_t extract_full_tracevals(rb_trace_arg_t *trace_arg,
 
 static bool in_fork(Rotoscope *config) { return config->pid != getpid(); }
 
+VALUE escape_csv_string(VALUE string) {
+  if (!memchr(RSTRING_PTR(string), '"', RSTRING_LEN(string))) {
+    return string;
+  }
+  return rb_funcall(string, id_gsub, 2, str_quote, str_escaped_quote);
+}
+
 static void log_trace_event(FILE *stream, rs_tracepoint_t *trace) {
-  fprintf(stream, RS_CSV_FORMAT "\n", RS_CSV_VALUES(trace));
+  VALUE escaped_method_name = escape_csv_string(trace->method_name);
+  fprintf(stream, RS_CSV_FORMAT "\n",
+          RS_CSV_VALUES(trace, escaped_method_name));
+  RB_GC_GUARD(escaped_method_name);
 }
 
 unsigned char output_buffer[LOG_BUFFER_SIZE];
@@ -128,8 +139,15 @@ static void log_trace_event_with_caller(FILE *stream,
                                         rs_stack_frame_t *stack_frame,
                                         rs_stack_frame_t *caller_frame,
                                         rs_strmemo_t **call_memo) {
-  snprintf((char *)output_buffer, LOG_BUFFER_SIZE, RS_FLATTENED_CSV_FORMAT "\n",
-           RS_FLATTENED_CSV_VALUES(&stack_frame->tp, &caller_frame->tp));
+  VALUE escaped_method_name = escape_csv_string(stack_frame->tp.method_name);
+  VALUE escaped_caller_method_name =
+      escape_csv_string(caller_frame->tp.method_name);
+  snprintf(
+      (char *)output_buffer, LOG_BUFFER_SIZE, RS_FLATTENED_CSV_FORMAT "\n",
+      RS_FLATTENED_CSV_VALUES(&stack_frame->tp, &caller_frame->tp,
+                              escaped_method_name, escaped_caller_method_name));
+  RB_GC_GUARD(escaped_method_name);
+  RB_GC_GUARD(escaped_caller_method_name);
 
   if (rs_strmemo_uniq(call_memo, output_buffer)) {
     fputs((char *)output_buffer, stream);
@@ -368,6 +386,12 @@ void Init_rotoscope(void) {
   cTracePoint = rb_const_get(rb_cObject, rb_intern("TracePoint"));
 
   id_initialize = rb_intern("initialize");
+  id_gsub = rb_intern("gsub");
+
+  str_quote = rb_str_new_literal("\"");
+  rb_global_variable(&str_quote);
+  str_escaped_quote = rb_str_new_literal("\"\"");
+  rb_global_variable(&str_escaped_quote);
 
   cRotoscope = rb_define_class("Rotoscope", rb_cObject);
   rb_define_alloc_func(cRotoscope, rs_alloc);

data/ext/rotoscope/rotoscope.h

@@ -15,27 +15,30 @@
 #define LOG_BUFFER_SIZE 1000
 
 // clang-format off
-#define _RS_COMMON_CSV_HEADER "entity,method_name,method_level,filepath,lineno"
-#define _RS_COMMON_CSV_FORMAT "\"%s\",\"%s\",%s,\"%s\",%d"
-#define _RS_COMMON_CSV_VALUES(trace)  \
-  StringValueCStr((trace)->entity),      \
-  StringValueCStr((trace)->method_name), \
-  (trace)->method_level,                 \
-  StringValueCStr((trace)->filepath),    \
-  (trace)->lineno
 
-#define RS_CSV_HEADER "event," _RS_COMMON_CSV_HEADER
-#define RS_CSV_FORMAT "%s," _RS_COMMON_CSV_FORMAT
-#define RS_CSV_VALUES(trace) trace->event, _RS_COMMON_CSV_VALUES(trace)
+#define RS_CSV_HEADER "event,entity,filepath,lineno,method_name,method_level"
+#define RS_CSV_FORMAT "%s,\"%s\",\"%s\",%d,\"%s\",%s"
+#define RS_CSV_VALUES(trace, method_name) \
+  trace->event,                           \
+  StringValueCStr((trace)->entity),       \
+  StringValueCStr((trace)->filepath),     \
+  (trace)->lineno,                        \
+  StringValueCStr(method_name),           \
+  (trace)->method_level
 
 #define RS_FLATTENED_CSV_HEADER \
-  _RS_COMMON_CSV_HEADER ",caller_entity,caller_method_name,caller_method_level"
-#define RS_FLATTENED_CSV_FORMAT _RS_COMMON_CSV_FORMAT ",\"%s\",\"%s\",%s"
-#define RS_FLATTENED_CSV_VALUES(trace, caller_trace) \
-  _RS_COMMON_CSV_VALUES(trace),               \
-  StringValueCStr((caller_trace)->entity),      \
-  StringValueCStr((caller_trace)->method_name), \
+  "entity,caller_entity,filepath,lineno,method_name,method_level,caller_method_name,caller_method_level"
+#define RS_FLATTENED_CSV_FORMAT "\"%s\",\"%s\",\"%s\",%d,\"%s\",%s,\"%s\",%s"
+#define RS_FLATTENED_CSV_VALUES(trace, caller_trace, method_name, caller_method_name) \
+  StringValueCStr((trace)->entity),        \
+  StringValueCStr((caller_trace)->entity), \
+  StringValueCStr((trace)->filepath),      \
+  (trace)->lineno,                         \
+  StringValueCStr(method_name),            \
+  (trace)->method_level,                   \
+  StringValueCStr(caller_method_name),     \
   (caller_trace)->method_level
+
 // clang-format on
 
 typedef enum {

data/lib/rotoscope/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Rotoscope
-  VERSION = "0.3.0.pre.5"
+  VERSION = "0.3.0.pre.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rotoscope
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.5
+  version: 0.3.0.pre.6
 platform: ruby
 authors:
 - Jahfer Husain