ox 1.5.3 → 1.5.4

data/README.md

@@ -30,9 +30,11 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.5.3
+### Release 1.5.4
 
- - Backed off on using the stack for allocation as very large XML files are too large for many stacks.
+ - Worked around bug in rb_protect in ruby 1.9.x and OS X 10.6.8 that caused ignored exceptions to be raised on program exit.
+
+ - Fixed a parse bug that did not accept &nn; sequences.
 
 ## <a name="description">Description</a>
 

data/ext/ox/ox.c

@@ -272,7 +272,7 @@ set_def_opts(VALUE self, VALUE opts) {
         } else if (Qfalse == v) {
             *o->attr = No;
         } else {
-            rb_raise(rb_eArgError, "%s must be true, false, or nil.\n", StringValuePtr(o->sym));
+	    rb_raise(rb_eArgError, "%s must be true or false.\n", rb_id2name(SYM2ID(o->sym)));
         }
     }
     return Qnil;
@@ -569,7 +569,7 @@ parse_dump_options(VALUE ropts, Options copts) {
                 } else if (rb_cFalseClass == c) {
                     *o->attr = No;
                 } else {
-                    rb_raise(rb_eArgError, "%s must be true or false.\n", StringValuePtr(o->sym));
+                    rb_raise(rb_eArgError, "%s must be true or false.\n", rb_id2name(SYM2ID(o->sym)));
                 }
             }
         }

data/ext/ox/parse.c

@@ -717,7 +717,13 @@ collapse_special(char *str) {
 	    
 	    s++;
 	    if ('#' == *s) {
-		c = (int)strtol(s, &end, 10);
+		s++;
+		if ('x' == *s || 'X' == *s) {
+		    s++;
+		    c = (int)strtol(s, &end, 16);
+		} else {
+		    c = (int)strtol(s, &end, 10);
+		}
 		if (';' != *end) {
 		    return EDOM;
 		}

data/ext/ox/sax.c

@@ -87,6 +87,7 @@ static char     read_name_token(SaxDrive dr);
 static int      read_quoted_value(SaxDrive dr);
 static int      collapse_special(char *str);
 
+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(SaxDrive dr);
@@ -778,14 +779,15 @@ read_quoted_value(SaxDrive dr) {
     return 0;
 }
 
-static int
-read_from_io_partial(SaxDrive dr) {
-    int ex = 0;
+static VALUE
+rescue_cb(VALUE rdr, VALUE err) {
+    if (rb_obj_class(err) != rb_eEOFError) {
+	SaxDrive	dr = (SaxDrive)rdr;
 
-    rb_protect(partial_io_cb, (VALUE)dr, &ex);
-    // printf("*** io_cb exception = %d\n", ex);
-    // An error code of 6 is always returned not matter what kind of Exception is raised.
-    return ex;
+        sax_drive_cleanup(dr);
+        rb_raise(err, "at line %d, column %d\n", dr->line, dr->col);
+    }
+    return Qfalse;
 }
 
 static VALUE
@@ -804,17 +806,7 @@ partial_io_cb(VALUE rdr) {
     strcpy(dr->cur, str);
     dr->read_end = dr->cur + cnt;
 
-    return Qnil;
-}
-
-static int
-read_from_io(SaxDrive dr) {
-    int ex = 0;
-
-    rb_protect(io_cb, (VALUE)dr, &ex);
-    // printf("*** io_cb exception = %d\n", ex);
-    // An error code of 6 is always returned not matter what kind of Exception is raised.
-    return ex;
+    return Qtrue;
 }
 
 static VALUE
@@ -834,7 +826,17 @@ io_cb(VALUE rdr) {
     strcpy(dr->cur, str);
     dr->read_end = dr->cur + cnt;
 
-    return Qnil;
+    return Qtrue;
+}
+
+static int
+read_from_io_partial(SaxDrive dr) {
+    return (Qfalse == rb_rescue(partial_io_cb, (VALUE)dr, rescue_cb, (VALUE)dr));
+}
+
+static int
+read_from_io(SaxDrive dr) {
+    return (Qfalse == rb_rescue(io_cb, (VALUE)dr, rescue_cb, (VALUE)dr));
 }
 
 static int
@@ -866,7 +868,12 @@ collapse_special(char *str) {
             s++;
             if ('#' == *s) {
                 s++;
-                c = (int)strtol(s, &end, 10);
+		if ('x' == *s || 'X' == *s) {
+		    s++;
+		    c = (int)strtol(s, &end, 16);
+		} else {
+		    c = (int)strtol(s, &end, 10);
+		}
                 if (';' != *end) {
                     return EDOM;
                 }

data/lib/ox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-29 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