oj 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b407855f298c79a1a5aa4533773acb82bfbf8506
-  data.tar.gz: 7f4c484232b2fd3af6c124e7e773b8a11ce91ea5
+  metadata.gz: 48a00c99e1a81e8db2d4d074dd75c207d35dba89
+  data.tar.gz: a7945af118f56ce1b883ee8df51fac93c692714b
 SHA512:
-  metadata.gz: 939e9faafb18e2012621e4aad5fda45c2f2e832139c150d7d01f87fc2d891c0cc7df362d9b9aa1f9cf746efa4db7524aeea8626f91b6379eab0c07a374b27ff6
-  data.tar.gz: 68da1860ac19fc5304f0c4fd9ef3e9afe8677c3715765a3039f82d36c9678e02c41701bf2f27302e847cf9bff6adbdb64901318cbfa78bd7fd3132a5ef3a8ef3
+  metadata.gz: 7a31a3c396f291fd4c9c851b2a3d2d6ad85582abd30046251757e44f73e3146319daa543d23f707226d32507bbe55695274a08706c8a2d2546f3c1b328a69a7a
+  data.tar.gz: 1f8979189385a752ec69bde1611728bc9d382608c251d3e59252268e6622f2dd9b6d3f37335663d041790e036802fb8871739275d247d3ba41873f3d3db378f2

data/README.md

@@ -26,21 +26,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.9.2
+### Current Release 2.9.3
 
- - Fixed link error with Windows.
-
-### Current Release 2.9.1
-
- - Fixed mimic load when given a block to evalate. It conflicted with the new
-   load option.
-
- - Added a true stream that is used when the input argument to load is an IO
-   object such as a stream or file. This is slightly slower for smaller files
-   but allows reading of huge files that will not fit in memory and is more
-   efficient on even larger files that would fit into memory. The load_file()
-   method uses the new stream parser so multiple GB files can be processed
-   without used execessive memory.
+ - Fixed IO read error that showed up in IO objects that return nil instead of
+   raising an EOF error when read is done.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/reader.c

@@ -163,11 +163,7 @@ oj_reader_read(Reader reader) {
 
 static VALUE
 rescue_cb(VALUE rbuf, VALUE err) {
-#if (defined(RUBINIUS_RUBY) || (1 == RUBY_VERSION_MAJOR && 8 == RUBY_VERSION_MINOR))
-    if (rb_obj_class(err) != rb_eTypeError) {
-#else
-    if (rb_obj_class(err) != rb_eEOFError) {
-#endif
+    if (rb_eTypeError != rb_obj_class(err)) {
 	Reader	reader = (Reader)rbuf;
 
 	rb_raise(err, "at line %d, column %d\n", reader->line, reader->col);
@@ -185,8 +181,11 @@ partial_io_cb(VALUE rbuf) {
 
     args[0] = ULONG2NUM(reader->end - reader->tail);
     rstr = rb_funcall2(reader->io, oj_readpartial_id, 1, args);
+    if (Qnil == rstr) {
+	return Qfalse;
+    }
     str = StringValuePtr(rstr);
-    cnt = strlen(str);
+    cnt = RSTRING_LEN(rstr);
     //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;
@@ -204,8 +203,11 @@ io_cb(VALUE rbuf) {
 
     args[0] = ULONG2NUM(reader->end - reader->tail);
     rstr = rb_funcall2(reader->io, oj_read_id, 1, args);
+    if (Qnil == rstr) {
+	return Qfalse;
+    }
     str = StringValuePtr(rstr);
-    cnt = strlen(str);
+    cnt = RSTRING_LEN(rstr);
     //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -136,4 +136,3 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true