ox 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a5698b62e72673ff1938107b1a54c34b290529
-  data.tar.gz: 33eddef77be0a84be7e41f205d2d03b61e17f43e
+  metadata.gz: e4d1bc0caa1f30250ac41bb09bf0e74146823e9a
+  data.tar.gz: 7b82a1d2ff0c9d3e3cbd386d6111dcc5df70fdd3
 SHA512:
-  metadata.gz: 013bcd5da423407fd1d4553594da0cda3d6f8f852bded2d4df28a4df8408488e19108accf1cc51ae41af3e69d834a4bc0b4ee89386594fd07ad75179f0a2b57e
-  data.tar.gz: 52bde8d7c5e22794718fe978af3c6eec2b02c013209cc1523df4265980a9afd546876556542d60f0ccc1f963e94a52116dfa7572c42c27686edebf69651bb5a4
+  metadata.gz: e483cedd63acafe9b3e4f2aa9cc197dc24f7120374c3be8c5966a4cb74d8e7bf0030101f0377130707caf08dc668d88f94e768a751e1efc216d5d8a137076c00
+  data.tar.gz: 9ee127f630abaae2f03377ce87cc54ca27e87e030165f5dd196c6566601e60ef7b07921c647857ea89bd8c8f694d77d6f625b0d908086deb82a23657708a8cc2

data/README.md

@@ -34,24 +34,14 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Release 2.1.3
-
- - Added check for @attributes being nil. Reported by and proposed fix by Elana.
-
-### Release 2.1.2
-
- - Added skip option to parsing. This allows white space to be collapsed in two
-   different ways.
+### Current Release 2.1.4
 
- - Added respond_to? method for easy access method checking. 
+ - Fixed bug where the parser always started at the first position in a stringio
+   instead of the current position.
 
-### Release 2.1.1
-
- - Worked around a module reset and clear that occurs on some Rubies.
-
-### Release 2.1.0
+### Release 2.1.3
 
- - Thanks to jfontan Ox now includes support for XMLRPC.
+ - Added check for @attributes being nil. Reported by and proposed fix by Elana.
 
 ## Description
 
@@ -93,7 +83,7 @@ callbacks. Unlike Nokogiri and LibXML, Ox can be tuned to use only the SAX
 callbacks that are of interest to the caller. (See the perf_sax.rb file for an
 example.)
 
-Ox is compatible with Ruby 1.8.7, 1.9.2, 2.0.0, JRuby, and RBX.
+Ox is compatible with Ruby 1.8.7, 1.9.3, 2.1.2, and RBX.
 
 ### Object Dump Sample:
 

data/ext/ox/ox.c

@@ -79,10 +79,11 @@ ID	ox_keys_id;
 ID	ox_local_id;
 ID	ox_mesg_id;
 ID	ox_message_id;
-ID	ox_nodes_id;
 ID	ox_new_id;
+ID	ox_nodes_id;
 ID	ox_num_id;
 ID	ox_parse_id;
+ID	ox_pos_id;
 ID	ox_read_id;
 ID	ox_readpartial_id;
 ID	ox_start_element_id;
@@ -954,6 +955,7 @@ void Init_ox() {
     ox_new_id = rb_intern("new");
     ox_num_id = rb_intern("@num");
     ox_parse_id = rb_intern("parse");
+    ox_pos_id = rb_intern("pos");
     ox_read_id = rb_intern("read");
     ox_readpartial_id = rb_intern("readpartial");
     ox_start_element_id = rb_intern("start_element");

data/ext/ox/ox.h

@@ -220,10 +220,11 @@ extern ID	ox_keys_id;
 extern ID	ox_local_id;
 extern ID	ox_mesg_id;
 extern ID	ox_message_id;
-extern ID	ox_nodes_id;
 extern ID	ox_new_id;
+extern ID	ox_nodes_id;
 extern ID	ox_num_id;
 extern ID	ox_parse_id;
+extern ID	ox_pos_id;
 extern ID	ox_read_id;
 extern ID	ox_readpartial_id;
 extern ID	ox_start_element_id;

data/ext/ox/sax_buf.c

@@ -49,24 +49,18 @@ static VALUE		rescue_cb(VALUE rdr, VALUE err);
 static VALUE		io_cb(VALUE rdr);
 static VALUE		partial_io_cb(VALUE rdr);
 static int		read_from_io(Buf buf);
-#ifndef JRUBY_RUBY
 static int		read_from_fd(Buf buf);
-#endif
 static int		read_from_io_partial(Buf buf);
 static int		read_from_str(Buf buf);
 
 void
 ox_sax_buf_init(Buf buf, VALUE io) {
-    if (ox_stringio_class == rb_obj_class(io)) {
+    if (ox_stringio_class == rb_obj_class(io) && 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_respond_to(io, ox_readpartial_id)) {
-#ifdef JRUBY_RUBY
-	buf->read_func = read_from_io_partial;
-	buf->io = io;
-#else
         VALUE   rfd;
 
         if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
@@ -76,12 +70,7 @@ ox_sax_buf_init(Buf buf, VALUE io) {
             buf->read_func = read_from_io_partial;
             buf->io = io;
         }
-#endif
     } else if (rb_respond_to(io, ox_read_id)) {
-#ifdef JRUBY_RUBY
-	buf->read_func = read_from_io;
-	buf->io = io;
-#else
         VALUE   rfd;
 
         if (rb_respond_to(io, ox_fileno_id) && Qnil != (rfd = rb_funcall(io, ox_fileno_id, 0))) {
@@ -91,7 +80,6 @@ ox_sax_buf_init(Buf buf, VALUE io) {
             buf->read_func = read_from_io;
             buf->io = io;
         }
-#endif
     } else {
         rb_raise(ox_arg_error_class, "sax_parser io argument must respond to readpartial() or read().\n");
     }
@@ -160,10 +148,6 @@ ox_sax_buf_read(Buf buf) {
 
 static VALUE
 rescue_cb(VALUE rbuf, VALUE err) {
-#ifndef JRUBY_RUBY
-    /* JRuby seems to play by a different set if rules. It passes in an Fixnum
-     * instead of an error like other Rubies. For now assume all errors are
-     * EOF and deal with the results further down the line. */
 #if (defined(RUBINIUS_RUBY) || (1 == RUBY_VERSION_MAJOR && 8 == RUBY_VERSION_MINOR))
     if (rb_obj_class(err) != rb_eTypeError) {
 #else
@@ -174,7 +158,6 @@ rescue_cb(VALUE rbuf, VALUE err) {
         //ox_sax_drive_cleanup(buf->dr); called after exiting protect
         rb_raise(err, "at line %d, column %d\n", buf->line, buf->col);
     }
-#endif
     return Qfalse;
 }
 
@@ -226,7 +209,6 @@ read_from_io(Buf buf) {
     return (Qfalse == rb_rescue(io_cb, (VALUE)buf, rescue_cb, (VALUE)buf));
 }
 
-#ifndef JRUBY_RUBY
 static int
 read_from_fd(Buf buf) {
     ssize_t     cnt;
@@ -241,7 +223,6 @@ read_from_fd(Buf buf) {
     }
     return 0;
 }
-#endif
 
 static char*
 ox_stpncpy(char *dest, const char *src, size_t n) {

data/ext/ox/sax_has.h

@@ -51,18 +51,7 @@ typedef struct _Has {
 
 inline static int
 respond_to(VALUE obj, ID method) {
-#ifdef JRUBY_RUBY
-    /* There is a bug in JRuby where rb_respond_to() returns true (1) even if
-     * a method is private. */
-    {
-	VALUE	args[1];
-
-	*args = ID2SYM(method);
-	return (Qtrue == rb_funcall2(obj, rb_intern("respond_to?"), 1, args));
-    }
-#else
     return rb_respond_to(obj, method);
-#endif
 }
 
 inline static void

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-12-05 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