oj 3.7.6 → 3.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7289437b014edb9bb095abd9827815e3bea0efb62b4e5486d0034158c4811c1c
-  data.tar.gz: 5d341b6a90bb002d7324f55277010a78236b6338710b58f490e416001167e5fa
+  metadata.gz: 389ece68dade91713fa132445f6b5d7cefdef5b6e7787a8b66f530c13173271c
+  data.tar.gz: 49d899629ebbb41cb5b545400262f1644b93140c62b57f7f8c7ef98200ad2bb9
 SHA512:
-  metadata.gz: 8f68b2fb4f0762ce86cdc9a1a56ecd42d377f485fc32d0f36cf1c0ef689eee14f73b76a3b77dd7ecd7c0d6cc3837064cb62ea201e705145af40a18aaa93cdfe8
-  data.tar.gz: 6406b48f3439c1340d23e1aea04fc6d781bbd0195012cdff94fbf81e409fd43978606d5fe0b61eca1c7ea635a8af16b1de876df92c3729d4ac96fb4d9951b239
+  metadata.gz: 15c6bd0b3324687ef248e2f67270bab76b1c70da8e92b54dc474082ae717d601142a745a7e365b3ffdf82c1b6fbb12d72cdb7db3cdefb34a50b3eaf28c941786
+  data.tar.gz: 28fa1bb71e89c195ccb840d6c4b639ffc5c2244eba48aa69aab07cc76757b954ddffbe83801eb6624745ab21c73e5493c4858cbcbfa630f6a3df2a5a2d3899b8

data/ext/oj/encode.h

@@ -34,6 +34,8 @@
 #include "ruby.h"
 #include "ruby/encoding.h"
 
+#include "oj.h"
+
 static inline VALUE
 oj_encode(VALUE rstr) {
     rb_enc_associate(rstr, oj_utf8_encoding);

data/ext/oj/fast.c

@@ -839,7 +839,7 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
     {
 	struct rlimit	lim;
 
-	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	if (0 == getrlimit(RLIMIT_STACK, &lim) && RLIM_INFINITY != lim.rlim_cur) {
 	    pi.stack_min = (void*)((char*)&lim - (lim.rlim_cur / 4 * 3)); // let 3/4ths of the stack be used only
 	} else {
 	    pi.stack_min = 0; // indicates not to check stack limit

data/ext/oj/object.c

@@ -403,23 +403,6 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
     return 0;
 }
 
-static void
-copy_ivars(VALUE target, VALUE src) {
-    volatile VALUE	vars = rb_funcall(src, oj_instance_variables_id, 0);
-    volatile VALUE	*np = RARRAY_PTR(vars);
-    ID			vid;
-    int			i, cnt = (int)RARRAY_LEN(vars);
-    const char		*attr;
-
-    for (i = cnt; 0 < i; i--, np++) {
-	vid = rb_to_id(*np);
-	attr = rb_id2name(vid);
-	if ('@' == *attr) {
-	    rb_ivar_set(target, vid, rb_ivar_get(src, vid));
-	}
-    }
-}
-
 void
 oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
     const char	*key = kval->key;
@@ -427,18 +410,6 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
     ID		var_id;
     ID		*slot;
 
-    if ('~' == *key && Qtrue == rb_obj_is_kind_of(parent->val, rb_eException)) {
-	if (5 == klen && 0 == strncmp("~mesg", key, klen)) {
-	    VALUE		args[1];
-	    volatile VALUE	prev = parent->val;
-
-	    args[0] = value;
-	    parent->val = rb_class_new_instance(1, args, rb_class_of(parent->val));
-	    copy_ivars(parent->val, prev);
-	} else if (3 == klen && 0 == strncmp("~bt", key, klen)) {
-	    rb_funcall(parent->val, rb_intern("set_backtrace"), 1, value);
-	}
-    }
 #if HAVE_LIBPTHREAD
     pthread_mutex_lock(&oj_cache_mutex);
 #else

data/ext/oj/oj.c

@@ -1322,22 +1322,6 @@ extern VALUE	oj_compat_parse(int argc, VALUE *argv, VALUE self);
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
  *
- * Note: Oj is not able to automatically deserialize all classes that are a
- * subclass of a Ruby Exception. Only exception that take one required string
- * argument in the initialize() method are supported. This is an example of how
- * to write an Exception subclass that supports both a single string intializer
- * and an Exception as an argument. Additional optional arguments can be added
- * as well.
- *
- * The reason for this restriction has to do with a design decision on the part
- * of the Ruby developers. Exceptions are special Objects. They do not follow the
- * rules of other Objects. Exceptions have 'mesg' and a 'bt' attribute. Note that
- * these are not '@mesg' and '@bt'. They can not be set using the normal C or
- * Ruby calls. The only way I have found to set the 'mesg' attribute is through
- * the initializer. Unfortunately that means any subclass that provides a
- * different initializer can not be automatically decoded. A way around this is
- * to use a create function but this example shows an alternative.
- *
  * A block can be provided with a single argument. That argument will be the
  * parsed JSON document. This is useful when parsing a string that includes
  * multiple JSON documents. The block can take up to 3 arguments, the parsed

data/ext/oj/saj.c

@@ -626,7 +626,7 @@ saj_parse(VALUE handler, char *json) {
     {
 	struct rlimit	lim;
 
-	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	if (0 == getrlimit(RLIMIT_STACK, &lim) && RLIM_INFINITY != lim.rlim_cur) {
 	    pi.stack_min = (void*)((char*)&obj - (lim.rlim_cur / 4 * 3)); /* let 3/4ths of the stack be used only */
 	} else {
 	    pi.stack_min = 0; /* indicates not to check stack limit */

data/ext/oj/stream_writer.c

@@ -7,7 +7,7 @@
 
 #include <ruby.h>
 
-#include "oj.h"
+#include "encode.h"
 
 extern VALUE	Oj;
 
@@ -36,11 +36,17 @@ stream_writer_write(StreamWriter sw) {
 
     switch (sw->type) {
     case STRING_IO:
-	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
-	break;
-    case STREAM_IO:
-	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
+    case STREAM_IO: {
+	volatile VALUE	rs = rb_str_new(sw->sw.out.buf, size);
+
+	// Oddly enough, when pushing ASCII characters with UTF-8 encoding or
+	// even ASCII-8BIT does not change the output encoding. Pushing any
+	// non-ASCII no matter what the encoding changes the output encoding
+	// to ASCII-8BIT if it the string is not forced to UTF-8 here.
+	rs = oj_encode(rs);
+	rb_funcall(sw->stream, oj_write_id, 1, rs);
 	break;
+    }
     case FILE_IO:
 	if (size != write(sw->fd, sw->sw.out.buf, size)) {
 	    rb_raise(rb_eIOError, "Write failed. [_%d_:%s]\n", errno, strerror(errno));

data/lib/oj/version.rb

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

data/test/bar.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'oj'
+
+#Oj.load_file(ARGV[0], mode: :strict) { |obj|
+#  puts Oj.dump(obj, indent: 2)
+#}
+
+data = open('invalid_unicode.data').read
+
+puts data
+
+puts Oj.dump(data)
+
+Oj.mimic_JSON
+puts Oj.dump(data, escape_mode: :json)
+
+puts Oj.default_options

data/test/foo.rb

@@ -2,6 +2,82 @@
 # encoding: UTF-8
 
 $: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
 
-require 'test_strict'
-require 'test_compat'
+require 'oj'
+require 'tracer'
+
+#Tracer.on
+
+class MyParser
+  attr_accessor :enum
+
+  def initialize
+    @io = StringIO.new
+    @writer = Oj::StreamWriter.new(@io)
+
+    json_string = Oj.dump({ records: 1.upto(2).map{|i| { id: i, name: "record_#{i}" }} }, mode: :strict)
+    @test_json = StringIO.new(json_string)
+
+    @enum = Enumerator.new do |yielder|
+      @yielder = yielder
+      Oj.sc_parse(self, @test_json)
+    end
+  end
+
+  # Stream parsing methods
+  def hash_start
+    @writer.push_object
+  end
+
+  def hash_end
+    @writer.pop unless @io.eof
+  end
+
+  def hash_key(key)
+    @writer.push_key(key)
+  end
+
+  def hash_set(h, key, value)
+    @writer.push_value(value)
+  end
+
+  def array_start
+    @writer.push_array
+  end
+
+  def array_end
+    @writer.pop
+  end
+
+  def array_append(a, value)
+    yield_data
+  end
+
+  def add_value(value);end
+
+  def yield_data
+    @writer.pop_all
+    @yielder << @io.string
+    @io.reopen("")
+    array_start
+  end
+end
+
+#puts MyParser.new.enum.to_a
+
+puts "------------"
+
+MyError = Class.new(StandardError)
+
+MyParser.new.enum.each.with_index do |r, i|
+  puts "========="
+  raise MyError.new('hello')
+  #raise StopIteration if i == 0
+  #break if i >= 4
+end
+
+#{"records":[{"id":1,"name":"record_1"},{"id":2,"name":"record_2"},{"id":3,"name":"record_3"},{"id":4,"name":"record_4"},{"id":5,"name":"record_5"},{"id":6,"name":"record_6"},{"id":7,"name":"record_7"},{"id":8,"name":"record_8"},{"id":9,"name":"record_9"},{"id":10,"name":"record_10"},{"id":11,"name":"record_11"},{"id":12,"name":"record_12"},{"id":13,"name":"record_13"},{"id":14,"name":"record_14"},{"id":15,"name":"record_15"},{"id":16,"name":"record_16"},{"id":17,"name":"record_17"},{"id":18,"name":"record_18"},{"id":19,"name":"record_19"},{"id":20,"name":"record_20"},{"id":21,"name":"record_21"},{"id":22,"name":"record_22"},{"id":23,"name":"record_23"},{"id":24,"name":"record_24"},{"id":25,"name":"record_25"}]}

data/test/test_object.rb

@@ -793,6 +793,30 @@ class ObjectJuice < Minitest::Test
     end
   end
 
+  class SubX < Exception
+    def initialize
+      super("sub")
+      @xyz = 123
+    end
+  end
+  
+  def test_exception_subclass
+    err = nil
+    begin
+      raise SubX.new
+    rescue Exception => e
+      err = e
+    end
+    json = Oj.dump(err, :mode => :object, :indent => 2)
+    #puts "*** #{json}"
+    e2 = Oj.load(json, :mode => :strict)
+    assert_equal(err.class.to_s, e2['^o'])
+    assert_equal(err.message, e2['~mesg'])
+    assert_equal(err.backtrace, e2['~bt'])
+    e2 = Oj.load(json, :mode => :object)
+    assert_equal(e, e2);
+  end
+
   def test_range_object
     Oj.default_options = { :mode => :object }
     json = Oj.dump(1..7, :mode => :object, :indent => 0)

data/test/test_writer.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -227,6 +227,22 @@ class OjWriter < Minitest::Test
 
   # Stream Writer
 
+  class SString < ::String
+    alias :write :concat
+  end
+  
+  def test_stream_writer_encoding
+    output = SString.new.force_encoding(::Encoding::UTF_8)
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    # Oddly enough, when pushing ASCII characters with UTF-8 encoding or even
+    # ASCII-8BIT does not change the output encoding. Pushing any non-ASCII no
+    # matter what the encoding changes the output encoding to ASCII-8BIT.
+    x = "香港" # Hong Kong
+    x = x.force_encoding('ASCII-8BIT')
+    w.push_value(x)
+    assert_equal(::Encoding::UTF_8, output.encoding)
+  end
+
   def test_stream_writer_empty_array
     output = StringIO.open("", "w+")
     w = Oj::StreamWriter.new(output, :indent => 0)
@@ -251,7 +267,8 @@ class OjWriter < Minitest::Test
     w.push_object("a3")
     w.pop()
     w.pop()
-    assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, output.string())
+    result = output.string()
+    assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, result)
   end
 
   def test_stream_writer_mixed_file

data/test/zoo.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#require 'json'
+
+$: << File.dirname(__FILE__)
+require 'helper'
+require 'oj'
+
+Oj.mimic_JSON
+puts "\u3074"
+
+puts JSON.dump(["\u3074"])
+puts JSON.generate(["\u3074"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.6
+  version: 3.7.7
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Custom.md
-- pages/WAB.md
-- pages/Advanced.md
 - pages/Rails.md
+- pages/JsonGem.md
 - pages/Encoding.md
-- pages/Security.md
+- pages/WAB.md
+- pages/Custom.md
+- pages/Advanced.md
 - pages/Options.md
 - pages/Compatibility.md
 - pages/Modes.md
-- pages/JsonGem.md
+- pages/Security.md
 files:
 - LICENSE
 - README.md
@@ -175,17 +175,10 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
-- test/bug2.rb
-- test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
-- test/crash.rb
-- test/example.rb
+- test/bar.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
-- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -194,7 +187,6 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
 - test/json_gem/json_addition_test.rb
 - test/json_gem/json_common_interface_test.rb
@@ -206,9 +198,6 @@ files:
 - test/json_gem/json_parser_test.rb
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
-- test/mem.rb
-- test/mod.rb
-- test/omit.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -219,9 +208,6 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
-- test/rails.rb
-- test/rails_datetime_test.rb
-- test/russian.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -236,7 +222,6 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
-- test/struct.rb
 - test/test_compat.rb
 - test/test_custom.rb
 - test/test_debian.rb
@@ -249,7 +234,6 @@ files:
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_wab.rb
@@ -257,8 +241,7 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
-- test/write_timebars.rb
-- test/x_test.rb
+- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -294,99 +277,82 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bug3.rb
-- test/json_gem/json_generator_test.rb
+- test/foo.rb
+- test/test_integer_range.rb
+- test/test_strict.rb
+- test/perf_strict.rb
+- test/tests.rb
+- test/perf_saj.rb
+- test/test_compat.rb
+- test/helper.rb
+- test/perf_file.rb
+- test/test_scp.rb
+- test/perf_compat.rb
+- test/json_gem/json_common_interface_test.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
 - test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/test_helper.rb
 - test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/write_timebars.rb
-- test/test_writer.rb
-- test/russian.rb
-- test/rails_datetime_test.rb
-- test/omit.rb
-- test/test_gc.rb
-- test/_test_active_mimic.rb
-- test/test_serializer.rb
-- test/sample/file.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/test_helper.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_parser_test.rb
+- test/perf_wab.rb
+- test/test_file.rb
+- test/test_object.rb
+- test/sample.rb
+- test/perf_object.rb
+- test/test_hash.rb
+- test/test_custom.rb
+- test/bar.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport4/decoding_test.rb
+- test/sample_json.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/decoding_test.rb
+- test/test_saj.rb
+- test/perf_scp.rb
+- test/test_wab.rb
+- test/test_null.rb
+- test/_test_active.rb
+- test/_test_mimic_rails.rb
+- test/test_fast.rb
+- test/perf_fast.rb
+- test/sample/change.rb
+- test/sample/text.rb
+- test/sample/doc.rb
+- test/sample/shape.rb
+- test/sample/layer.rb
 - test/sample/group.rb
-- test/sample/oval.rb
+- test/sample/file.rb
 - test/sample/rect.rb
 - test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/text.rb
-- test/sample/doc.rb
 - test/sample/line.rb
 - test/sample/dir.rb
-- test/sample/shape.rb
-- test/sample/change.rb
+- test/sample/oval.rb
+- test/tests_mimic.rb
+- test/perf_simple.rb
+- test/zoo.rb
 - test/activerecord/result_test.rb
-- test/crash.rb
-- test/io.rb
-- test/test_object.rb
-- test/struct.rb
-- test/mod.rb
-- test/sample.rb
-- test/perf_scp.rb
-- test/bug2.rb
+- test/_test_active_mimic.rb
 - test/tests_mimic_addition.rb
-- test/test_saj.rb
-- test/test_strict.rb
-- test/perf_saj.rb
-- test/perf_simple.rb
-- test/perf_fast.rb
-- test/test_wab.rb
-- test/tests.rb
-- test/example.rb
-- test/_test_active.rb
-- test/perf_compat.rb
-- test/test_various.rb
-- test/test_null.rb
-- test/test_integer_range.rb
-- test/test_scp.rb
-- test/bug_load.rb
-- test/files.rb
-- test/x_test.rb
-- test/foo.rb
+- test/test_writer.rb
+- test/perf.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
 - test/isolated/test_mimic_redefine.rb
-- test/isolated/test_mimic_as_json.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_define.rb
-- test/_test_mimic_rails.rb
-- test/test_file.rb
-- test/perf_wab.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/decoding_test.rb
-- test/bug.rb
-- test/mem.rb
-- test/sample_json.rb
+- test/isolated/test_mimic_as_json.rb
 - test/test_debian.rb
-- test/test_fast.rb
-- test/rails.rb
-- test/perf_file.rb
-- test/test_compat.rb
-- test/helper.rb
-- test/tests_mimic.rb
-- test/perf.rb
-- test/bug_fast.rb
-- test/perf_strict.rb
+- test/test_gc.rb
+- test/files.rb
+- test/test_various.rb