oj 2.18.1 → 2.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4ba43d61f927e22bc0e86fcb053d0593a531f0
-  data.tar.gz: d09686c7ff45e8c6b07fd71c7c31aa5c7920a2f3
+  metadata.gz: e75fe6286b1a83b703bbb5fe4ef67620471ed85c
+  data.tar.gz: 11c1c0a4025e7230882265540158df6ca22c8324
 SHA512:
-  metadata.gz: 1a8f222f85bf299d92f6ea6432d2bae1f541f5ed615e18a052a7328badb430050928a363961fde7148aa66fb56f6507608fe6e17c482f003cb13230073dc58bd
-  data.tar.gz: d65f126ff8de728d8a95048ce7f624bf51c3ea81721fb29ad27855454f8c94ba7e971676c3144330a9e93a973e443ed70698247f2c65ffb1be3fbf58863bd07f
+  metadata.gz: be67841c21694aeea3c687dac1e5e2c76a2069198dfc4e8edc9efc469a97489265e1814b4607740ee38814885868f6b7822cadd2ca5b5c1f3b058d2f318b951f
+  data.tar.gz: 53b40092ab955eed576c31a4c755583ba14ed6d1013363dbb6e8c256298c36bf0e67de9b9472be1ef1f0aa574735ba4ef417308beb283a43a698a9993ecd1d1a

data/ext/oj/dump.c

@@ -830,9 +830,10 @@ static int
 hash_cb_strict(VALUE key, VALUE value, Out out) {
     int		depth = out->depth;
     long	size;
-
-    if (rb_type(key) != T_STRING) {
-	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings, not %s.\n", rb_class2name(rb_obj_class(key)));
+    int		rtype = rb_type(key);
+    
+    if (rtype != T_STRING && rtype != T_SYMBOL) {
+	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
@@ -843,7 +844,11 @@ hash_cb_strict(VALUE key, VALUE value, Out out) {
 	    grow(out, size);
 	}
 	fill_indent(out, depth);
-	dump_str_comp(key, out);
+	if (rtype == T_STRING) {
+	    dump_str_comp(key, out);
+	} else {
+	    dump_sym_comp(key, out);
+	}
 	*out->cur++ = ':';
     } else {
 	size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
@@ -861,7 +866,11 @@ hash_cb_strict(VALUE key, VALUE value, Out out) {
 		out->cur += out->opts->dump_opts.indent_size;
 	    }
 	}
-	dump_str_comp(key, out);
+	if (rtype == T_STRING) {
+	    dump_str_comp(key, out);
+	} else {
+	    dump_sym_comp(key, out);
+	}
 	size = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
 	if (out->end - out->cur <= size) {
 	    grow(out, size);
@@ -2307,8 +2316,8 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
-    oj_dump_obj_to_json(obj, copts, &out);
     out.omit_nil = copts->dump_opts.omit_nil;
+    oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
     if (oj_stringio_class == clas) {
 	rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
@@ -2536,8 +2545,8 @@ oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
-    oj_dump_leaf_to_json(leaf, copts, &out);
     out.omit_nil = copts->dump_opts.omit_nil;
+    oj_dump_leaf_to_json(leaf, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
 	rb_raise(rb_eIOError, "%s\n", strerror(errno));

data/ext/oj/val_stack.c

@@ -49,6 +49,9 @@ mark(void *ptr) {
 	if (Qnil != v->val && Qundef != v->val) {
 	    rb_gc_mark(v->val);
 	}
+	if (Qnil != v->key_val && Qundef != v->key_val) {
+	    rb_gc_mark(v->key_val);
+	}
     }
 #if USE_PTHREAD_MUTEX
     pthread_mutex_unlock(&stack->mutex);

data/ext/oj/val_stack.h

@@ -92,6 +92,7 @@ inline static void
 stack_cleanup(ValStack stack) {
     if (stack->base != stack->head) {
         xfree(stack->head);
+	stack->head = NULL;
     }
 }
 

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -4,16 +4,25 @@
 $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
+require 'stringio'
 require 'oj'
+require 'jsonlint'
 
-class A < BasicObject
-  def initialize(data)
-    @data = data
-  end
-end
+json = %|{
+  "id": "babrams",
+  "ssh_keys": [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMCKMvMJ2yb13pHLsIPqi2xHOBKFZKa8+FM1FUqNbIxKeq3LLw+4WiXLK60DxxS6hmOnXD+FcWNaykkGLyGQeYHxsHynsXo9BPaG/ewaAp5SDU/zAIAaex15s/zvo5l+5Pq9OwXYtFRmfezk3ImCx7SZ8sMmHiFHYD8d38XBlGX53kLSFm5HLEopEvSCRTUyTj+tPIspgYR6IvCTdXnamO9FT8Rkeqw+mqjX9sVTaLuuqwQZlRFRMslrrJbSfv+7XvyKsjOsmAlkEYRlpHbUCxUh2Hc5q2Wfm+acOHPkkUPX8kLeT2vW+Bd/9LlPi9BN0dbmazGPbf5kv02MRNQNeUrdRfdzRIOG4tUEv154msF7QdEuy9W4pv9p0z2rNOqOQEw9HPhMiAkftIVGnvvGRj9+jIARIVzV5gAfVm2DQbPJClr0tGNCfzHmndt6FddawubXFPvFNrKgdC38Ts0Jzl1F3aWGHT8UyURDbezrTGpxg+Cqq4YUXIZfrrqB8nzF8qK3eMW2Tcxdy2m+fFBzQeHlozBSP55dcdjekdQrcVcwkYux4jecJ9BU++DjWtMtY93LgVL5BnHixS4ybo7loCndYkpsI6ZZm9oLVxHsjeoaM9D9iYoN28LIlALBm/dnfCh92G/H40v/X25DMIvRqcfnE31gsOCJ85A29twSC+Cw== babrams@system76.servalws",
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy3cbPekJYHAIa8J1fOr2iIqpx/7pl4giJYAG7HCfsunRRUq3dY1KhVw1BlmMGIDzNwcuNVIfBS5HS/wREqbHMXxbwAjWrMwUofWd09CTuKJZiyTLUC5pSQWKDXZrefH/Fwd7s+YKk1s78b49zkyDcHSnKxjN+5veinzeU+vaUF9duFAJ9OsL7kTDEzOUU0zJdSdUV0hH1lnljnvk8kXHLFl9sKS3iM2LRqW4B6wOc2RbXUnx+jwNaBsq1zd73F2q3Ta7GXdtW/q4oDYl3s72oW4ySL6TZfpLCiv/7txHicZiY1eqc591CON0k/Rh7eR7XsphwkUstoUPQcBuLqQPA529zBigD7A8PBmeHISxL2qirWjR2+PrEGn1b0yu8IHHz9ZgliX83Q4WpjXvJ3REj2jfM8hiFRV3lA/ovjQrmLLV8WUAZ8updcLE5mbhZzIsC4U/HKIJS02zoggHGHZauClwwcdBtIJnJqtP803yKNPO2sDudTpvEi8GZ8n6jSXo/N8nBVId2LZa5YY/g/v5kH0akn+/E3jXhw4CICNW8yICpeJO8dGYMOp3Bs9/cRK8QYomXqgpoFlvkgzT2h4Ie6lyRgNv5QnUyAnW43O5FdBnPk/XZ3LA462VU3uOfr0AQtEJzPccpFC6OCFYWdGwZQA/r1EZQES0yRfJLpx+uZQ== babrams@babrams-Serval-WS"
+  ],
+  "htpasswd": "$1$i2xUX9a4$6LwYbCk4K6JErTDdaiZy50",
+  "groups": [
+    "devops"
+  ],
+  "shell": "\/bin\/bash",
+  "comment": "Ben Abrams"
+}|
 
-a = A.new("xyz")
-
-json = Oj.dump(a, mode: :compat, use_to_json: true)
-#=> NoMethodError: undefined method `to_hash' for #<A:0x007fae03de1dc8>
+linter = JsonLint::Linter.new
+linter.check_stream(StringIO.new(json))
 
+puts "errors: #{linter.errors}"

data/test/mem.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+h = {
+  'a' => 1,
+  'b' => 2,
+  'c' => 3,
+  'd' => 4,
+  'e' => 5,
+}
+
+10000.times do
+  GC.start
+  Oj.dump(h)
+end

data/test/omit.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+require 'stringio'
+require 'parallel'
+
+h = { a: 1, b: nil, c: 3 }
+outputs = Parallel.map((0...30).to_a, in_process: 30) do |i|
+  io = StringIO.new('wb+')
+  Oj.to_stream(io, h, omit_nil: false)
+  io.string
+end
+
+outputs.each do |output|
+  puts output
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.18.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -128,7 +128,9 @@ files:
 - test/isolated/test_mimic_rails_before.rb
 - test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
+- test/mem.rb
 - test/mod.rb
+- test/omit.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -202,6 +204,7 @@ test_files:
 - test/write_timebars.rb
 - test/test_writer.rb
 - test/russian.rb
+- test/omit.rb
 - test/test_gc.rb
 - test/_test_active_mimic.rb
 - test/test_serializer.rb
@@ -252,6 +255,7 @@ test_files:
 - test/_test_mimic_rails.rb
 - test/test_file.rb
 - test/bug.rb
+- test/mem.rb
 - test/sample_json.rb
 - test/test_debian.rb
 - test/test_fast.rb