ox 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bcb6ef82dae8496dd4b43e309f60db51695febb
-  data.tar.gz: 9e9702e70f40e436b7c0d30158efb6db3c72e3e0
+  metadata.gz: f0fbd4706902b82c9a1fcc1924f68b6a5b9b805f
+  data.tar.gz: aeef28c3236af992af9dff8cde459e59ead7b4b7
 SHA512:
-  metadata.gz: e880c3f9fae7093ad1420430982fffb5a952bf199299597be02fb81ff981ac67fa80a297c0ae6fda739e50d81eae7d45fcfc34549ca587d6abea427839628214
-  data.tar.gz: 81de95b11c2cd54d9aaf1dc00d6ddb4b3199c8635d94cc676b0561e62a82f30da37f5880d8bc40b1c19f75eee6726f233019aac4df27abf779bb30b9450cf2eb
+  metadata.gz: 3be6d1b77ea5a0426bd7ab5f2d127632af4586ae48f67a415ba2526465934ca66f685c16d195eeabe3047d06a43e59886731c1a3e1f0e37a9c5ceb2fdc2913ec
+  data.tar.gz: d29da0a404709c726fc296d7b929783400706135bbc32d13aec1ec5e2edc716996b9ce3c4816329dd4546fa73f234d407307ed14f56b3ba94d880c7f3f51e110

data/README.md

@@ -34,15 +34,14 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Release 2.4.7
-
- - After encountering a <> the SAX parser will continue parsing after reporting an error.
+### Release 2.4.8
 
-### Release 2.4.6
+ - Tolerant mode now allows case-insensitve matches on elements during
+   parsing. Smart mode in the SAX parser is also case insensitive.
 
- - Ready for Ruby 2.4 thanks to SHIBATA Hiroshi, hsbt.
+### Release 2.4.7
 
- - Added margin option to dump.
+ - After encountering a <> the SAX parser will continue parsing after reporting an error.
 
 ## Description
 

data/ext/ox/parse.c

@@ -556,7 +556,7 @@ read_element(PInfo pi) {
 		    next_non_white(pi);
 		    c = *pi->s;
 		    *end = '\0';
-		    if (0 != strcmp(name, ename)) {
+		    if (0 != ((TolerantEffort == pi->options->effort) ? strcasecmp(name, ename) : strcmp(name, ename))) {
 			attr_stack_cleanup(&attrs);
 			if (TolerantEffort == pi->options->effort) {
 			    pi->pcb->end_element(pi, ename);
@@ -617,7 +617,8 @@ read_element(PInfo pi) {
 		    // Child closed with mismatched name.
 		    if (0 != (name = read_element(pi))) {
 			attr_stack_cleanup(&attrs);
-			if (0 == strcmp(name, ename)) {
+
+			if (0 == ((TolerantEffort == pi->options->effort) ? strcasecmp(name, ename) : strcmp(name, ename))) {
 			    pi->s++;
 			    pi->pcb->end_element(pi, ename);
 			    return 0;
@@ -638,8 +639,9 @@ read_element(PInfo pi) {
 
 		/* to exit read_text with no errors the next character must be < */
 		if ('/' == *(pi->s + 1) &&
-		    0 == strncmp(ename, pi->s + 2, elen) &&
+		    0 == ((TolerantEffort == pi->options->effort) ? strncasecmp(ename, pi->s + 2, elen) : strncmp(ename, pi->s + 2, elen)) &&
 		    '>' == *(pi->s + elen + 2)) {
+
 		    /* close tag after text so treat as a value */
 		    pi->s += elen + 3;
 		    pi->pcb->end_element(pi, ename);

data/ext/ox/sax.c

@@ -327,7 +327,9 @@ parse(SaxDrive dr) {
 			}
 			c = read_doctype(dr);
 		    } else if (0 == strncasecmp("DOCTYPE", dr->buf.str, 7)) {
-			ox_sax_drive_error(dr, CASE_ERROR "expected DOCTYPE all in caps");
+			if (!dr->options.smart) {
+			    ox_sax_drive_error(dr, CASE_ERROR "expected DOCTYPE all in caps");
+			}
 			if (START_STATE != state) {
 			    ox_sax_drive_error(dr, OUT_OF_ORDER "DOCTYPE can not come after an element");
 			}
@@ -338,7 +340,9 @@ parse(SaxDrive dr) {
 			}
 			c = read_cdata(dr);
 		    } else if (0 == strncasecmp("[CDATA[", dr->buf.str, 7)) {
-			ox_sax_drive_error(dr, CASE_ERROR "expected CDATA all in caps");
+			if (!dr->options.smart) {
+			    ox_sax_drive_error(dr, CASE_ERROR "expected CDATA all in caps");
+			}
 			c = read_cdata(dr);
 		    } else {
 			Nv	parent = stack_peek(&dr->stack);
@@ -484,7 +488,7 @@ read_instruction(SaxDrive dr) {
     if ('\0' == (c = read_name_token(dr))) {
         return c;
     }
-    is_xml = (0 == strcmp("xml", dr->buf.str));
+    is_xml = (0 == (dr->options.smart ? strcasecmp("xml", dr->buf.str) : strcmp("xml", dr->buf.str)));
     if (dr->has.instruct || dr->has.end_instruct) {
 	target = rb_str_new2(dr->buf.str);
     }
@@ -1000,11 +1004,11 @@ read_element_start(SaxDrive dr) {
 }
 
 static Nv
-stack_rev_find(NStack stack, const char *name) {
+stack_rev_find(SaxDrive dr, const char *name) {
     Nv	nv;
 
-    for (nv = stack->tail - 1; stack->head <= nv; nv--) {
-	if (0 == strcmp(name, nv->name)) {
+    for (nv = dr->stack.tail - 1; dr->stack.head <= nv; nv--) {
+	if (0 == (dr->options.smart ? strcasecmp(name, nv->name) : strcmp(name, nv->name))) {
 	    return nv;
 	}
     }
@@ -1030,14 +1034,15 @@ read_element_end(SaxDrive dr) {
     // c should be > and current is one past so read another char
     c = buf_get(&dr->buf);
     nv = stack_peek(&dr->stack);
-    if (0 != nv && 0 == strcmp(dr->buf.str, nv->name)) {
+    if (0 != nv &&
+	0 == (dr->options.smart ? strcasecmp(dr->buf.str, nv->name) : strcmp(dr->buf.str, nv->name))) {
 	name = nv->val;
 	h = nv->hint;
 	stack_pop(&dr->stack);
     } else {
 	// Mismatched start and end
 	char	msg[256];
-	Nv	match = stack_rev_find(&dr->stack, dr->buf.str);
+	Nv	match = stack_rev_find(dr, dr->buf.str);
 
 	if (0 == match) {
 	    // Not found so open and close element.
@@ -1447,6 +1452,8 @@ read_name_token(SaxDrive dr) {
 		break;
 	    } else if ('*' == *dr->options.strip_ns && '\0' == dr->options.strip_ns[1]) {
 		dr->buf.str = dr->buf.tail;
+	    } else if (dr->options.smart && 0 == strncasecmp(dr->options.strip_ns, dr->buf.str, dr->buf.tail - dr->buf.str - 1)) {
+		dr->buf.str = dr->buf.tail;
 	    } else if (0 == strncmp(dr->options.strip_ns, dr->buf.str, dr->buf.tail - dr->buf.str - 1)) {
 		dr->buf.str = dr->buf.tail;
 	    }

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2017-01-15 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
@@ -102,3 +102,4 @@ signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
+has_rdoc: true