oj 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b24a6a60285c820a9e10671a976043a9163c2e98a3c07ba16af43ad88b8e6f
-  data.tar.gz: 90fc1a46d76296f2e226434a26b6acc0cbe16fa378173ea98700b2250ecf45ca
+  metadata.gz: '09deb70b3ba1d0eeac19e27fd57ef92437f44aff2bf1bcdc8d6c46f523da195e'
+  data.tar.gz: 0154fb4466a7f286428685e851029bb48e6d82ffb2b25cf34cf82541fd8b5c38
 SHA512:
-  metadata.gz: 71d7f8f0c32e3183a9f228764ffacdbd94cac6497e4af07e3ede247a676b2abd3815b3c51228992429a400a0ef879b8f54a8767cfa8b3a573a9931b46ec785e0
-  data.tar.gz: ce7fb5fa634fd8122173712faed5435bee5ec3477445d969f3a16f62ac6703dae9fee0f0476cbbfdc8852ba4a7243753d543e44f61eb286489b7a700e0e0dde5
+  metadata.gz: e6fe3ca939fae01ee40793c523a366bbb307db771ef26d4157c597e517610d6c627ab96ea9daa68cccd9c2c3054cc2cc46992f295e511cfb5388e664e3a3fa62
+  data.tar.gz: 6f013fa5478f633ee16c6f557ca565b25fa605d05d9d59ae373b78a7bd8dc216d2af938f98b249abc8df20729a33df1c5b8be85a18a50046235800007a44989d

data/ext/oj/custom.c

@@ -464,6 +464,9 @@ dump_common(VALUE obj, int depth, Out out) {
 	const char	*s;
 	int		len;
 
+	if (Yes == out->opts->trace) {
+	    oj_trace("to_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
+	}
 #if HAS_METHOD_ARITY
 	if (0 == rb_obj_method_arity(obj, oj_to_json_id)) {
 	    rs = rb_funcall(obj, oj_to_json_id, 0);
@@ -473,6 +476,9 @@ dump_common(VALUE obj, int depth, Out out) {
 #else
 	rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
 #endif
+	if (Yes == out->opts->trace) {
+	    oj_trace("to_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
+	}
 	s = rb_string_value_ptr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 
@@ -483,6 +489,9 @@ dump_common(VALUE obj, int depth, Out out) {
     } else if (Yes == out->opts->as_json && rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj;
 
+	if (Yes == out->opts->trace) {
+	    oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
+	}
 	// Some classes elect to not take an options argument so check the arity
 	// of as_json.
 #if HAS_METHOD_ARITY
@@ -494,6 +503,9 @@ dump_common(VALUE obj, int depth, Out out) {
 #else
 	aj = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
 #endif
+	if (Yes == out->opts->trace) {
+	    oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
+	}
 	// Catch the obvious brain damaged recursive dumping.
 	if (aj == obj) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);

data/ext/oj/dump_compat.c

@@ -120,6 +120,9 @@ dump_to_json(VALUE obj, Out out) {
     const char		*s;
     int			len;
 
+    if (Yes == out->opts->trace) {
+	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyIn);
+    }
 #if HAS_METHOD_ARITY
     if (0 == rb_obj_method_arity(obj, oj_to_json_id)) {
 	rs = rb_funcall(obj, oj_to_json_id, 0);
@@ -129,6 +132,9 @@ dump_to_json(VALUE obj, Out out) {
 #else
     rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
 #endif
+    if (Yes == out->opts->trace) {
+	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyOut);
+    }
 
     s = rb_string_value_ptr((VALUE*)&rs);
     len = (int)RSTRING_LEN(rs);

data/ext/oj/parse.c

@@ -286,8 +286,10 @@ read_escaped_str(ParseInfo pi, const char *start) {
 	case NEXT_HASH_NEW:
 	case NEXT_HASH_KEY:
 	    if (Qundef == (parent->key_val = pi->hash_key(pi, buf.head, buf_len(&buf)))) {
-		parent->key = strdup(buf.head);
 		parent->klen = buf_len(&buf);
+		parent->key = malloc(parent->klen + 1);
+		memcpy((char*)parent->key, buf.head, parent->klen);
+		*(char*)(parent->key + parent->klen) = '\0';
 	    } else {
 		parent->key = "";
 		parent->klen = 0;

data/ext/oj/rails.c

@@ -968,6 +968,9 @@ static void
 dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
     volatile VALUE	ja;
 
+    if (Yes == out->opts->trace) {
+	oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
+    }
     // Some classes elect to not take an options argument so check the arity
     // of as_json.
 #if HAS_METHOD_ARITY
@@ -979,6 +982,9 @@ dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
 #else
     ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
 #endif
+    if (Yes == out->opts->trace) {
+	oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
+    }
 
     out->argc = 0;
     if (ja == obj || !as_ok) {

data/ext/oj/sparse.c

@@ -296,8 +296,10 @@ read_escaped_str(ParseInfo pi) {
 	case NEXT_HASH_NEW:
 	case NEXT_HASH_KEY:
 	    if (Qundef == (parent->key_val = pi->hash_key(pi, buf.head, buf_len(&buf)))) {
-		parent->key = strdup(buf.head);
 		parent->klen = buf_len(&buf);
+		parent->key = malloc(parent->klen + 1);
+		memcpy((char*)parent->key, buf.head, parent->klen);
+		*(char*)(parent->key + parent->klen) = '\0';
 	    } else {
 		parent->key = "";
 		parent->klen = 0;

data/ext/oj/trace.c

@@ -15,7 +15,9 @@ fill_indent(char *indent, int depth) {
     } else if (depth < 0) {
 	depth = 0;
     }
-    memset(indent, ' ', depth);
+    if (0 < depth) {
+	memset(indent, ' ', depth);
+    }
     indent[depth] = '\0';
 }
 

data/ext/oj/trace.h

@@ -10,9 +10,11 @@
 #include <ruby.h>
 
 typedef enum {
-    TraceIn	= '{',
-    TraceOut	= '}',
-    TraceCall	= '-',
+    TraceIn		= '}',
+    TraceOut		= '{',
+    TraceCall		= '-',
+    TraceRubyIn		= '>',
+    TraceRubyOut	= '<',
 } TraceWhere;
 
 struct _ParseInfo;

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -4,29 +4,33 @@ $: << '.'
 $: << '../lib'
 $: << '../ext'
 
+require 'tracer'
 require 'oj'
 require 'sample'
 
-#obj = sample_doc(1)
-
 class Foo
   def initialize()
     @x = 'abc'
     @y = 123
     @a = [{}]
   end
+
+  def to_json()
+    '{"x":33}'
+  end
+
+  def as_json(options={})
+    { z: @a, y: @y, x: @x }
+  end
 end
 
+Tracer.display_c_call = true
+Tracer.on
+
 obj = Foo.new
-obj = {
-  x: 'abc',
-  y: 123,
-  a: [{}]
-}
 
-j = Oj.dump(obj, mode: :rails, trace: true)
-#j = Oj.dump(obj, mode: :compat)
+j = Oj.dump(obj, mode: :custom, trace: true, use_as_json: true)
 
-puts j
+#puts j
 
-Oj.load(j, mode: :rails, trace: true)
+#Oj.load(j, mode: :rails, trace: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler