ox 1.9.3 → 1.9.4

data/README.md

@@ -34,6 +34,10 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.9.4
+
+ - SAX tolerant mode handle multiple elements in a document better.
+
 ### Release 1.9.3
 
  - mcarpenter fixed a compile problem with Cygwin.

data/ext/ox/sax.c

@@ -548,7 +548,11 @@ read_children(SaxDrive dr, int first) {
             err = ('\0' == read_name_token(dr));
 	    dr->line = line;
 	    dr->col = col;
-	    return err;
+	    if (first && dr->tolerant) {
+		sax_drive_error(dr, "invalid format, unmatched element end", 0);
+	    } else {
+		return err;
+	    }
             break;
 	case '\0':
             sax_drive_error(dr, "invalid format, document not terminated", 1);
@@ -560,6 +564,10 @@ read_children(SaxDrive dr, int first) {
                 sax_drive_error(dr, "invalid format, multiple top level elements", 0);
             }
 	    err = read_element(dr);
+	    if (NAME_MISMATCH == err && dr->tolerant && first) {
+		// must have been a end element with no matching start
+		err = 0;
+	    }		
             element_read = 1;
 	    break;
 	}
@@ -926,6 +934,7 @@ read_element(SaxDrive dr) {
 	    if (dr->has_column) {
 		rb_ivar_set(dr->handler, ox_at_column_id, INT2FIX(col));
 	    }
+	    sax_drive_error(dr, "invalid format, element start and end names do not match", 1);
 	    //printf("*** ename: %s  close: %s\n", ename, dr->str);
 	    if (dr->tolerant) {
 		if (0 != dr->has_end_element) {
@@ -942,7 +951,6 @@ read_element(SaxDrive dr) {
 		}
 		return NAME_MISMATCH; // dr->str is still the name
 	    } else {
-		sax_drive_error(dr, "invalid format, element start and end names do not match", 1);
 		return -1;
 	    }
 	}

data/lib/ox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-24 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