oj 3.6.4 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19d294e6f097eaef9b3a336ad95728690cab3875f155f922ffe18857713be8f
-  data.tar.gz: 0d6090bbe88e53d9d33eea3dad09c8f1d3163b925ea39ef8ff927919568ce9b1
+  metadata.gz: 7f4e0a767653f34a793b28037b299f5580e6b24cec56edbc7c01add6067a8a8f
+  data.tar.gz: ec009f0e9ce5bb255dd11325ccfbeef78d9cb35bb0e0bdba9cc718e3f511e85d
 SHA512:
-  metadata.gz: 3b5168386d95712f0b936819d6c8a3409c86d1ef6dda60cf3447adf222edfc4040b8c3e047b5af327064e6598b79d0a48f94724ac0660bf8fcb5e40bea6e6c49
-  data.tar.gz: 3cc4309e5248d9c9e7bcd993cb6cad207de40e0b0d6230e1175cbe9f6fc6cd05f6ce48d2522056bc566e7d8f88500ecb1124a73eda23cc04be4c81b292bb7e92
+  metadata.gz: c457ef279848a3ccaacb4c28e60f6433f5a5735fcec526d29cda2557ebef7edb112d0d9b548027832eff669ccf74a795d3fda77bc59d25babb9637f9f81bc433
+  data.tar.gz: 397a8d2c6666228766180aca8482c9f528fa31c240638708d68c92ccc1d96ac2f3d513ad4a0e838012c04ba536328063b7a7e00e63366fd1f86fc408d3af5f7e

data/ext/oj/dump.c

@@ -341,25 +341,30 @@ oj_check_circular(VALUE obj, Out out) {
 
 void
 oj_dump_time(VALUE obj, Out out, int withZone) {
-    char		buf[64];
-    char		*b = buf + sizeof(buf) - 1;
-    long		size;
-    char		*dot;
-    int			neg = 0;
-    long		one = 1000000000;
+    char	buf[64];
+    char	*b = buf + sizeof(buf) - 1;
+    long	size;
+    char	*dot;
+    int		neg = 0;
+    long	one = 1000000000;
+    time_t	sec;
+    long long	nsec;
+
 #if HAS_RB_TIME_TIMESPEC
-    struct timespec	ts = rb_time_timespec(obj);
-    time_t		sec = ts.tv_sec;
-    long		nsec = ts.tv_nsec;
+    {
+	struct timespec	ts = rb_time_timespec(obj);
+	sec = ts.tv_sec;
+	nsec = ts.tv_nsec;
+    }
 #else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
-    
+
     *b-- = '\0';
     if (withZone) {
 	long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
@@ -438,24 +443,29 @@ oj_dump_ruby_time(VALUE obj, Out out) {
 
 void
 oj_dump_xml_time(VALUE obj, Out out) {
-    char		buf[64];
-    struct tm		*tm;
-    long		one = 1000000000;
+    char	buf[64];
+    struct tm	*tm;
+    long	one = 1000000000;
+    time_t	sec;
+    long long	nsec;
+    long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
+    int		tzhour, tzmin;
+    char	tzsign = '+';
+
 #if HAS_RB_TIME_TIMESPEC
-    struct timespec	ts = rb_time_timespec(obj);
-    time_t		sec = ts.tv_sec;
-    long		nsec = ts.tv_nsec;
+    {
+	struct timespec	ts = rb_time_timespec(obj);
+	sec = ts.tv_sec;
+	nsec = ts.tv_nsec;
+    }
 #else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
-    long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
-    int			tzhour, tzmin;
-    char		tzsign = '+';
 
     assure_size(out, 36);
     if (9 > out->opts->sec_prec) {
@@ -524,7 +534,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
 	}
 	sprintf(buf, format,
 		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec, nsec);
+		tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec);
 	oj_dump_cstr(buf, len, 0, 0, out);
     } else {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
@@ -536,7 +546,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
 	}
 	sprintf(buf, format,
 		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec, nsec,
+		tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec,
 		tzsign, tzhour, tzmin);
 	oj_dump_cstr(buf, len, 0, 0, out);
     }

data/ext/oj/dump.h

@@ -51,6 +51,7 @@ extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
 extern int	oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
 
 extern bool	oj_dump_ignore(Options opts, VALUE obj);
+extern time_t	oj_sec_from_time_hard_way(VALUE obj);
 
 inline static void
 assure_size(Out out, size_t len) {

data/ext/oj/dump_compat.c

@@ -189,7 +189,6 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	    } else {
 		fill_indent(out, d2);
 	    }
-	    // TBD for child as_ok check the type, time is to_s while others are to_json
 	    oj_dump_compat_val(rb_ary_entry(a, i), d2, out, true);
 	    if (i < cnt) {
 		*out->cur++ = ',';
@@ -472,16 +471,21 @@ time_alt(VALUE obj, int depth, Out out) {
 	{ "n", 1, Qundef, 0, Qundef },
 	{ NULL, 0, Qnil },
     };
+    time_t	sec;
+    long long	nsec;
+
 #if HAS_RB_TIME_TIMESPEC
-    struct timespec	ts = rb_time_timespec(obj);
-    time_t		sec = ts.tv_sec;
-    long		nsec = ts.tv_nsec;
+    {
+	struct timespec	ts = rb_time_timespec(obj);
+	sec = ts.tv_sec;
+	nsec = ts.tv_nsec;
+    }
 #else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
 

data/ext/oj/fast.c

@@ -115,7 +115,7 @@ static VALUE	doc_each_value(int argc, VALUE *argv, VALUE self);
 static VALUE	doc_dump(int argc, VALUE *argv, VALUE self);
 static VALUE	doc_size(VALUE self);
 
-VALUE	oj_doc_class = 0;
+VALUE	oj_doc_class = Qundef;
 
 // This is only for CentOS 5.4 with Ruby 1.9.3-p0.
 #ifdef NEEDS_STPCPY
@@ -358,7 +358,7 @@ leaf_float_value(Leaf leaf) {
 
 static VALUE
 leaf_array_value(Doc doc, Leaf leaf) {
-    VALUE	a = rb_ary_new();
+    volatile VALUE	a = rb_ary_new();
 
     if (0 != leaf->elements) {
 	Leaf	first = leaf->elements->next;
@@ -374,12 +374,12 @@ leaf_array_value(Doc doc, Leaf leaf) {
 
 static VALUE
 leaf_hash_value(Doc doc, Leaf leaf) {
-    VALUE	h = rb_hash_new();
+    volatile VALUE	h = rb_hash_new();
 
     if (0 != leaf->elements) {
-	Leaf	first = leaf->elements->next;
-	Leaf	e = first;
-	VALUE	key;
+	Leaf		first = leaf->elements->next;
+	Leaf		e = first;
+	volatile VALUE	key;
 
 	do {
 	    key = rb_str_new2(e->key);
@@ -778,17 +778,51 @@ free_doc_cb(void *x) {
     }
 }
 
+static void
+mark_leaf(Leaf leaf) {
+    switch (leaf->value_type) {
+    case COL_VAL:
+	if (NULL != leaf->elements) {
+	    Leaf	first = leaf->elements->next;
+	    Leaf	e = first;
+
+	    do {
+		mark_leaf(e);
+		e = e->next;
+	    } while (e != first);
+	}
+	break;
+    case RUBY_VAL:
+	rb_gc_mark(leaf->value);
+	break;
+
+    default:
+	break;
+    }
+}
+
+static void
+mark_doc(void *ptr) {
+    if (NULL != ptr) {
+	Doc	doc = (Doc)ptr;
+	
+	rb_gc_mark(doc->self);
+	mark_leaf(doc->data);
+    }
+}
+
 static VALUE
 parse_json(VALUE clas, char *json, bool given, bool allocated) {
     struct _ParseInfo	pi;
-    VALUE		result = Qnil;
+    volatile VALUE	result = Qnil;
     Doc			doc;
     int			ex = 0;
+    volatile VALUE	self;
 
     if (given) {
 	doc = ALLOCA_N(struct _Doc, 1);
     } else {
-	doc = ALLOC_N(struct _Doc, 1);
+	doc = ALLOC(struct _Doc);
     }
     /* skip UTF-8 BOM if present */
     if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
@@ -814,17 +848,16 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
 #endif
     // last arg is free func void* func(void*)
 #if HAS_DATA_OBJECT_WRAP
-    doc->self = rb_data_object_wrap(clas, doc, 0, free_doc_cb);
+    self = rb_data_object_wrap(clas, doc, mark_doc, free_doc_cb);
 #else
-    doc->self = rb_data_object_alloc(clas, doc, 0, free_doc_cb);
+    self = rb_data_object_alloc(clas, doc, mark_doc, free_doc_cb);
 #endif
-    rb_gc_register_address(&doc->self);
+    doc->self = self;
     doc->json = json;
     DATA_PTR(doc->self) = doc;
     result = rb_protect(protect_open_proc, (VALUE)&pi, &ex);
     if (given || 0 != ex) {
-	rb_gc_unregister_address(&doc->self);
-	DATA_PTR(doc->self) = 0;
+	DATA_PTR(doc->self) = NULL;
 	doc_free(pi.doc);
 	if (allocated && 0 != ex) { // will jump so caller will not free
 	    xfree(json);
@@ -1118,11 +1151,11 @@ each_value(Doc doc, Leaf leaf) {
  */
 static VALUE
 doc_open(VALUE clas, VALUE str) {
-    char	*json;
-    size_t	len;
-    VALUE	obj;
-    int		given = rb_block_given_p();
-    int		allocate;
+    char		*json;
+    size_t		len;
+    volatile VALUE	obj;
+    int			given = rb_block_given_p();
+    int			allocate;
 
     Check_Type(str, T_STRING);
     len = RSTRING_LEN(str) + 1;
@@ -1160,13 +1193,13 @@ doc_open(VALUE clas, VALUE str) {
  */
 static VALUE
 doc_open_file(VALUE clas, VALUE filename) {
-    char	*path;
-    char	*json;
-    FILE	*f;
-    size_t	len;
-    VALUE	obj;
-    int		given = rb_block_given_p();
-    int		allocate;
+    char		*path;
+    char		*json;
+    FILE		*f;
+    size_t		len;
+    volatile VALUE	obj;
+    int			given = rb_block_given_p();
+    int			allocate;
 
     Check_Type(filename, T_STRING);
     path = StringValuePtr(filename);
@@ -1261,6 +1294,7 @@ doc_where(VALUE self) {
 	    *p++ = '/';
 	}
 	*--p = '\0';
+
 	return rb_str_new(path, p - path);
     }
 }
@@ -1275,9 +1309,9 @@ doc_where(VALUE self) {
  */
 static VALUE
 doc_local_key(VALUE self) {
-    Doc		doc = self_doc(self);
-    Leaf	leaf = *doc->where;
-    VALUE	key = Qnil;
+    Doc			doc = self_doc(self);
+    Leaf		leaf = *doc->where;
+    volatile VALUE	key = Qnil;
 
     if (T_HASH == leaf->parent_type) {
 	key = rb_str_new2(leaf->key);
@@ -1361,10 +1395,10 @@ doc_type(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 doc_fetch(int argc, VALUE *argv, VALUE self) {
-    Doc		doc;
-    Leaf	leaf;
-    VALUE	val = Qnil;
-    const char	*path = 0;
+    Doc			doc;
+    Leaf		leaf;
+    volatile VALUE	val = Qnil;
+    const char		*path = 0;
 
     doc = self_doc(self);
     if (1 <= argc) {
@@ -1586,7 +1620,7 @@ doc_dump(int argc, VALUE *argv, VALUE self) {
 	}
     }
     if (0 != (leaf = get_doc_leaf(doc, path))) {
-	VALUE	rjson;
+	volatile VALUE	rjson;
 
 	if (0 == filename) {
 	    char	buf[4096];

data/ext/oj/rails.c

@@ -301,16 +301,21 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 
 static void
 dump_time(VALUE obj, int depth, Out out, bool as_ok) {
+    time_t	sec;
+    long long	nsec;
+
 #if HAS_RB_TIME_TIMESPEC
-    struct timespec	ts = rb_time_timespec(obj);
-    time_t		sec = ts.tv_sec;
-    long		nsec = ts.tv_nsec;
+    {
+	struct timespec	ts = rb_time_timespec(obj);
+	sec = ts.tv_sec;
+	nsec = ts.tv_nsec;
+    }
 #else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
     dump_sec_nano(obj, sec, nsec, out);

data/ext/oj/wab.c

@@ -193,21 +193,26 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_time(VALUE obj, Out out) {
-    char		buf[64];
-    struct tm		*tm;
+    char	buf[64];
+    struct tm	*tm;
+    int		len;
+    time_t	sec;
+    long long	nsec;
+
 #if HAS_RB_TIME_TIMESPEC
-    struct timespec	ts = rb_time_timespec(obj);
-    time_t		sec = ts.tv_sec;
-    long		nsec = ts.tv_nsec;
+    {
+	struct timespec	ts = rb_time_timespec(obj);
+	sec = ts.tv_sec;
+	nsec = ts.tv_nsec;
+    }
 #else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
-    int			len;
 
     assure_size(out, 36);
     // 2012-01-05T23:58:07.123456000Z

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -4,64 +4,55 @@ $: << '.'
 $: << '../lib'
 $: << '../ext'
 
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/json/encoding.rb'
-require 'json'
+require 'oj'
 
-class Foo
-  def to_json(*)
-    '{"foo":"bar"}'
-  end
+Oj.default_options = {mode: :strict}
+json = Oj.dump({ aggregations: { hashtags: { buckets: Array.new(100) { { key: 'foo', count: 100 } } } } }, mode: :strict)
+
+def expect(a,b)
+  puts "*** #{a} != #{b}" unless a == b
 end
 
-class Dub
-  def initialize(a,b)
-    @a = a
-    @b = b
+def dig(obj, *path)
+  return obj if path.empty?
+  
+  if obj.is_a?(Array)
+    obj.each { |v|
+      r = dig(v, *path)
+      return r unless r.nil?
+    }
   end
+  return nil unless obj.is_a?(Hash)
+  
+  dig(obj[path[0]], *path[1..-1])
 end
 
-puts "*** time respond to: #{Time.now.utc.respond_to?(:to_json)}"
-
-hash_with_time = { foo: Time.now.utc }
-boo = { boo: Time.now.utc, foo: Foo.new, dub: Dub.new(1,2) }
-aaa = [Time.now.utc, Foo.new, Dub.new(1,2)]
-
-puts "*** boo #{JSON.generate(boo)}"
-puts "*** aaa #{JSON.generate(aaa)}"
-
-puts "*** time: #{Time.now.utc.to_json}"
-
-puts hash_with_time.to_json
-# => {"foo":"2018-06-28T09:07:40.464Z"}
-puts JSON.generate(hash_with_time)
-# => {"foo":"2018-06-28 09:07:40 UTC"}
-
-
-puts JSON.generate({ foo: Foo.new }.with_indifferent_access)
-puts JSON.generate({ foo: Foo.new })
-# => {"foo":{"foo":"bar"}}
-puts({ foo: Foo.new }.to_json)
-# => {"foo":{}}
-
-puts "-------------------"
-require 'oj'
-
-#Oj.optimize_rails
-Oj.mimic_JSON
-
-puts "*** boo #{JSON.generate(boo)}"
-
-Oj.default_options = {trace: true}
-puts hash_with_time.to_json
-# => {"foo":"2018-06-28T09:07:40.464Z"}
-puts JSON.generate(hash_with_time)
-# => {"foo":"2018-06-28T09:07:40.464Z"}
-puts hash_with_time.to_json
-
-puts JSON.generate({ foo: Foo.new }.with_indifferent_access)
-puts JSON.generate({ foo: Foo.new })
-# => {"foo":{}}
-puts({ foo: Foo.new }.to_json)
-# => {"foo":{}}
+1000.times do |i|
+  Oj::Doc.open(json) do |doc|
+    # this always passes
+    doc.each_child('/aggregations/hashtags/buckets') do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+
+    # load any other json using Oj.load
+    # this will pass
+    other = Oj.load(json)
+    dig(other, 'aggregations', 'hashtags', 'buckets').each do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+    GC.start
+    doc.each_child('/aggregations/hashtags/buckets') do |bucket|
+      # This is where it fails!!!! It will be some other object (even an rspec matcher in some cases)
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+
+    # this always passes if it gets this far
+    dig(other, 'aggregations', 'hashtags', 'buckets').each do |bucket|
+      expect(bucket.fetch('key'), 'foo')
+      expect(bucket.fetch('count'), 100)
+    end
+  end
+end

data/test/test_various.rb

@@ -407,6 +407,12 @@ class Juice < Minitest::Test
     assert_equal('null', json)
   end
 
+  def test_time_neg
+    t = Time.parse("1900-01-01 00:18:59 UTC")
+    json = Oj.dump(t, :mode => :custom, :time_format => :unix)
+    assert_equal('-2208987661.000000000', json)
+  end
+
   # Class
   def test_class_null
     json = Oj.dump(Juice, :mode => :null)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler