oj 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a944529c2d9fc9f12e3be88cb7edd568e3c32de9
-  data.tar.gz: d40180c12d6ae9ee8e50fa13bbe49374674e5eb3
+  metadata.gz: 12393f7e80f652ce9474b8ef98704a943a3dbb7e
+  data.tar.gz: 97f4f982b38b117b27736018df3050ea40da2388
 SHA512:
-  metadata.gz: a46eb91148fd3200c0226d38a7ad9bff977a037a0ebd93ddcda9b082f515e2561e815c01694c58ec17af7d9be9f83075a4f630c35b077c862b1de048173f1627
-  data.tar.gz: af1bfff262e48d2f46282b5314247a98ea919fbb17f8b653fca03736f93944f61e1fba25b00df894020372ae0f3b1e3bddd2732c3be65dfe2c17bec6140d77e2
+  metadata.gz: 981d90bd2dd8bf6e6f1d5893d0bb25ba1429fe4399c9ea1b3574a6b2d137dc0be411c4a645fc387381e305e6e5b4daad9ae4e73b4aa896090ab79ceb790b9fd9
+  data.tar.gz: 4db2afa9967ce0a6ff2bd35392b377f156d06d5f4faea907ec750265f6f9ddb3336c8caf47165cfb3954290cea6629c890d58c5276149fb946b359f79987ceca

data/ext/oj/dump.c

@@ -775,8 +775,8 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 		    if (0x80 == (uint8_t)str[1] && (0xa8 == (uint8_t)str[2] || 0xa9 == (uint8_t)str[2])) {
 			str = dump_unicode(str, end, out);
 		    } else {
+			check_start = check_unicode(str, end);
 			*out->cur++ = *str;
-			check_start = str + 3;
 		    }
 		    break;
 		}

data/ext/oj/dump_compat.c

@@ -619,7 +619,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
-	cnt = RSTRING_LEN(rstr);
+	cnt = (int)RSTRING_LEN(rstr);
     }
     assure_size(out, cnt);
     for (b = buf; '\0' != *b; b++) {

data/ext/oj/mimic_json.c

@@ -489,6 +489,7 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options.create_ok = No;
     pi.options.allow_nan = (bang ? Yes : No);
     pi.options.nilnil = No;
+    pi.options.mode = CompatMode;
     pi.max_depth = 100;
 
     if (2 <= argc) {
@@ -550,7 +551,11 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     }
     *args = *argv;
 
-    return oj_pi_parse(1, args, &pi, 0, 0, 0);
+    if (T_STRING == rb_type(*args)) {
+	return oj_pi_parse(1, args, &pi, 0, 0, false);
+    } else {
+	return oj_pi_sparse(1, args, &pi, 0);
+    }
 }
 
 /* Document-method: parse

data/ext/oj/rails.c

@@ -943,7 +943,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
-	    cnt = RSTRING_LEN(rstr);
+	    cnt = (int)RSTRING_LEN(rstr);
 	}
     }
     assure_size(out, cnt);

data/ext/oj/reader.c

@@ -29,7 +29,7 @@ static int		read_from_io_partial(Reader reader);
 //static int		read_from_str(Reader reader);
 
 void
-oj_reader_init(Reader reader, VALUE io, int fd) {
+oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
     VALUE	io_class = rb_obj_class(io);
     VALUE	stat;
     VALUE	ftype;
@@ -76,7 +76,15 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
     } else if (rb_respond_to(io, oj_read_id)) {
 	reader->read_func = read_from_io;
 	reader->io = io;
-    } else {
+    } else if (to_s) {
+	volatile VALUE	rstr = rb_funcall(io, oj_to_s_id, 0);
+	
+	reader->read_func = 0;
+	reader->in_str = StringValuePtr(rstr);
+	reader->head = (char*)reader->in_str;
+	reader->tail = reader->head;
+	reader->read_end = reader->head + RSTRING_LEN(rstr);
+    } else {	
 	rb_raise(rb_eArgError, "parser io argument must be a String or respond to readpartial() or read().\n");
     }
 }

data/ext/oj/reader.h

@@ -26,7 +26,7 @@ typedef struct _Reader {
     };
 } *Reader;
 
-extern void	oj_reader_init(Reader reader, VALUE io, int fd);
+extern void	oj_reader_init(Reader reader, VALUE io, int fd, bool to_s);
 extern int	oj_reader_read(Reader reader);
 
 static inline char

data/ext/oj/sparse.c

@@ -832,7 +832,7 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
     } else {
 	pi->proc = Qundef;
     }
-    oj_reader_init(&pi->rd, input, fd);
+    oj_reader_init(&pi->rd, input, fd, CompatMode == pi->options.mode);
     pi->json = 0; // indicates reader is in use
 
     if (Yes == pi->options.circular) {

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -39,7 +39,7 @@ if a non-native type is encountered instead of raising an Exception.
 The `:compat` mode mimics the json gem. The json gem is built around the use
 of the `to_json(*)` method defined for a class. Oj attempts to provide the
 same functionality by being a drop in replacement with a few
-exceptions. [{file:JsonGem.md}](pages/JsonGem.md) includes more details on
+exceptions. [{file:JsonGem.md}](JsonGem.md) includes more details on
 compatibility and use.
 
 ## :rails Mode
@@ -47,7 +47,7 @@ compatibility and use.
 The `:rails` mode mimics the ActiveSupport version 5 encoder. Rails and
 ActiveSupport are built around the use of the `as_json(*)` method defined for
 a class. Oj attempts to provide the same functionality by being a drop in
-replacement with a few exceptions. [{file:Rails.md}](pages/Rails.md) includes
+replacement with a few exceptions. [{file:Rails.md}](Rails.md) includes
 more details on compatibility and use.
 
 ## :object Mode
@@ -58,7 +58,7 @@ default mode unless changed in the Oj default options. In :object mode Oj
 generates JSON that follows conventions which allow Class and other
 information such as Object IDs for circular reference detection to be encoded
 in a JSON document. The formatting follows the rules describe on the
-[{file:Encoding.md}](pages/Encoding.md) page.
+[{file:Encoding.md}](Encoding.md) page.
 
 ## :custom Mode
 
@@ -68,7 +68,7 @@ some special aspect that makes it unique. For example, the `:object` mode has
 it's own unique format for object dumping and loading. The `:compat` mode
 mimic the json gem including methods called for encoding and inconsistencies
 between `JSON.dump()`, `JSON.generate()`, and `JSON()`. More details on the
-[{file:Custom.md}](pages/Custom.md) page.
+[{file:Custom.md}](Custom.md) page.
 
 ## Options Matrix
 

data/test/test_compat.rb

@@ -47,6 +47,15 @@ class CompatJuice < Minitest::Test
     end
   end # Argy
 
+  class Stringy
+    def initialize()
+    end
+
+    def to_s()
+      %|[1,2]|
+    end
+  end # Stringy
+
   module One
     module Two
       module Three
@@ -275,12 +284,7 @@ class CompatJuice < Minitest::Test
   end
 
   def test_infinity
-    begin
-      Oj.load('Infinity', :mode => :strict)
-      fail()
-    rescue Oj::ParseError
-      assert(true)
-    end
+    assert_raises(Oj::ParseError) { Oj.load('Infinity', :mode => :strict) }
     x = Oj.load('Infinity', :mode => :compat)
     assert_equal('Infinity', x.to_s)
   end
@@ -461,21 +465,20 @@ class CompatJuice < Minitest::Test
   end
 
   def test_bad_unicode
-    begin
-      Oj.to_json("\xE4xy")
-      fail()
-    rescue Exception
-      assert(true)
-    end
+    assert_raises() { Oj.to_json("\xE4xy") }
+  end
+
+  def test_bad_unicode_e2
+    assert_raises() { Oj.to_json("L\xE2m ") }
   end
 
   def test_bad_unicode_start
-    begin
-      Oj.to_json("\x8abc")
-      fail()
-    rescue Exception
-      assert(true)
-    end
+    assert_raises() { Oj.to_json("\x8abc") }
+  end
+
+  def test_parse_to_s
+    s = Stringy.new
+    assert_equal([1,2], Oj.load(s, :mode => :compat))
   end
 
   def dump_and_load(obj, trace=false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler