ox 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065c6a76ec5d44344dd607e266b9208f32aead7d
-  data.tar.gz: 242089d4a9ebe913eb825721085d1c6c8c7187f8
+  metadata.gz: 51863f95cc7782f0645385202e4d127994448832
+  data.tar.gz: 651e6890f72ebb7093eb96fdc116faf9885cfc75
 SHA512:
-  metadata.gz: 37a3c5ff01e5e238ae83bde8cb3f722624e17b927a8005586ff5b6bba425c1980ba41a120ea8b0889c3da37fff802f42ed5980beb83290ed3c81ace4184b9050
-  data.tar.gz: 5b830c8b6c8e8cd8f41349c2962a7fd510c6540111e41dcb46619983e1829b47e9ae4e8323c6836e03b04530551c6dd0f5374a4d08e9bc89a6d7c7238b1f8469
+  metadata.gz: 5ba36a153b758ad852bee9fb0cb1c245bcf64934e2a8f3ec84d5e21109d3bf6f90221ec632431d674f522e9eedde106d72f6403ad646f91fa59f58c9f6b225e5
+  data.tar.gz: e6703f7d082b29dc8f786e13abd5bc105d3683187fb654910510d470813775bfce23bef4aa49f9a98253005ccd13a3170f59e0dfb9558e0047fad74d3ff7349e

data/README.md

@@ -34,23 +34,18 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Current Release 2.1.7
+### Current Release 2.1.8
+
+ - Fixed a bug that caused all input to be read before parsing with the sax
+   parser and an IO.pipe.
+
+### Release 2.1.7
 
  - Empty elements such as <foo></foo> are now called back with empty text.
 
  - Fixed GC problem that occurs with the new GC in Ruby 2.2 that garbage
    collects Symbols.
 
-### Release 2.1.6
-
- - Update licenses. No other changes.
-
-### Release 2.1.5
-
- - Fixed symbol intern problem with Ruby 2.2.0. Symbols are not dynamic unless
-   rb_intern(). There does not seem to be a way to force symbols created with
-   encoding to be pinned.
-
 ## Description
 
 Optimized XML (Ox), as the name implies was written to provide speed optimized

data/ext/ox/sax_buf.c

@@ -30,31 +30,23 @@ static int		read_from_str(Buf buf);
 
 void
 ox_sax_buf_init(Buf buf, VALUE io) {
-    if (ox_stringio_class == rb_obj_class(io) && 0 == FIX2INT(rb_funcall2(io, ox_pos_id, 0, 0))) {
+    VALUE	io_class = rb_obj_class(io);
+    VALUE	rfd;
+
+    if (ox_stringio_class == io_class && 0 == FIX2INT(rb_funcall2(io, ox_pos_id, 0, 0))) {
 	VALUE	s = rb_funcall2(io, ox_string_id, 0, 0);
 
 	buf->read_func = read_from_str;
 	buf->in_str = StringValuePtr(s);
+    } else if (rb_cFile == io_class && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
+	buf->read_func = read_from_fd;
+	buf->fd = FIX2INT(rfd);
     } else if (rb_respond_to(io, ox_readpartial_id)) {
-        VALUE   rfd;
-
-        if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
-            buf->read_func = read_from_fd;
-            buf->fd = FIX2INT(rfd);
-        } else {
-            buf->read_func = read_from_io_partial;
-            buf->io = io;
-        }
+	buf->read_func = read_from_io_partial;
+	buf->io = io;
     } else if (rb_respond_to(io, ox_read_id)) {
-        VALUE   rfd;
-
-        if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
-            buf->read_func = read_from_fd;
-            buf->fd = FIX2INT(rfd);
-        } else {
-            buf->read_func = read_from_io;
-            buf->io = io;
-        }
+	buf->read_func = read_from_io;
+	buf->io = io;
     } else {
         rb_raise(ox_arg_error_class, "sax_parser io argument must respond to readpartial() or read().\n");
     }
@@ -123,11 +115,9 @@ ox_sax_buf_read(Buf buf) {
 
 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
+    VALUE	err_class = rb_obj_class(err);
+
+    if (err_class != rb_eTypeError && err_class != rb_eEOFError) {
 	Buf	buf = (Buf)rbuf;
 
         //ox_sax_drive_cleanup(buf->dr); called after exiting protect
@@ -148,7 +138,7 @@ partial_io_cb(VALUE rbuf) {
     rstr = rb_funcall2(buf->io, ox_readpartial_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
-    //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
+    //printf("*** read partial %lu bytes, str: '%s'\n", cnt, str);
     strcpy(buf->tail, str);
     buf->read_end = buf->tail + cnt;
 
@@ -167,7 +157,7 @@ io_cb(VALUE rbuf) {
     rstr = rb_funcall2(buf->io, ox_read_id, 1, args);
     str = StringValuePtr(rstr);
     cnt = strlen(str);
-    /*printf("*** read %lu bytes, str: '%s'\n", cnt, str); */
+    //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(buf->tail, str);
     buf->read_end = buf->tail + cnt;
 

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '2.1.7'
+  VERSION = '2.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed