ox 2.4.9 → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a56bbf70fe5530b8c2903e35d16657dcc0a6ef1
-  data.tar.gz: bacb6b71b651b78e43ac8b6aee16cf5e9f9dbfbb
+  metadata.gz: 7ef3dbf669a441dbf51b4ada1d623d7ec1415635
+  data.tar.gz: 3506603ae57a7f269f0768ce73fd9ce85d3f05d9
 SHA512:
-  metadata.gz: 153eb27970aff8e5fd2ada7a2e954578bb1596f5ed7d59bd263cc61c77d7fa0b60375a5bdfae71dc54524ca0119c598abdb8120db7b71dc662fe5a953d39a4ec
-  data.tar.gz: e96032e02c813895c23e53642600f3083a4ebd2684dd0511e0b1f44ba7743da3e75516921af84f21f4885e0d0db859daf62818b039253b8500983b475a6b0a17
+  metadata.gz: a94260a278ae05c25fadb1c1d8e318caf54775eb475e58b7377b939f48870156936a0ed18c81d2e9d46f81df7aaeeaa387f06156b31b4a4b5f4cf5fab38d8e07
+  data.tar.gz: 2b674e07e92d615313da5a46a319c8d905447795e3d623b3286a6bff0cccf8997bfdd56b02bd82e42fc0209032d1d6854436f07da6954a0dee3e1218f71c5db8

data/README.md

@@ -34,14 +34,7 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Release 2.4.8
-
- - Tolerant mode now allows case-insensitve matches on elements during
-   parsing. Smart mode in the SAX parser is also case insensitive.
-
-### Release 2.4.7
-
- - After encountering a <> the SAX parser will continue parsing after reporting an error.
+See [CHANGELOG.md](CHANGELOG.md)
 
 ## Description
 

data/ext/ox/builder.c

@@ -39,7 +39,7 @@ static const char	indent_spaces[] = "\n
 
 // The : character is equivalent to 10. Used for replacement characters up to 10
 // characters long such as ''.
-static char	xml_friendly_chars[257] = "\
+static const char	xml_friendly_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
 11611156111111111111111111114141\
 11111111111111111111111111111111\
@@ -49,12 +49,32 @@ static char	xml_friendly_chars[257] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111";
 
+static const char	xml_quote_chars[257] = "\
+:::::::::11::1::::::::::::::::::\
+11611151111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111";
+
+static const char	xml_element_chars[257] = "\
+:::::::::11::1::::::::::::::::::\
+11111151111111111111111111114141\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111";
+
 inline static size_t
-xml_str_len(const unsigned char *str, size_t len) {
+xml_str_len(const unsigned char *str, size_t len, const char *table) {
     size_t	size = 0;
 
     for (; 0 < len; str++, len--) {
-	size += xml_friendly_chars[*str];
+	size += table[*str];
     }
     return size - len * (size_t)'0';
 }
@@ -78,8 +98,8 @@ append_indent(Builder b) {
 }
 
 static void
-append_string(Builder b, const char *str, size_t size) {
-    size_t	xsize = xml_str_len((const unsigned char*)str, size);
+append_string(Builder b, const char *str, size_t size, const char *table) {
+    size_t	xsize = xml_str_len((const unsigned char*)str, size, table);
 
     if (size == xsize) {
 	const char	*s = str;
@@ -102,7 +122,7 @@ append_string(Builder b, const char *str, size_t size) {
 	int	fcnt;
 	
 	for (; '\0' != *str && 0 < i; i--, str++) {
-	    if ('1' == (fcnt = xml_friendly_chars[(unsigned char)*str])) {
+	    if ('1' == (fcnt = table[(unsigned char)*str])) {
 		if (end <= bp) {
 		    buf_append_string(&b->buf, buf, bp - buf);
 		    bp = buf;
@@ -170,7 +190,7 @@ append_sym_str(Builder b, VALUE v) {
 	rb_raise(ox_arg_error_class, "expected a Symbol or String");
 	break;
     }
-    append_string(b, s, len);
+    append_string(b, s, len, xml_element_chars);
 }
 
 static void
@@ -200,7 +220,7 @@ append_attr(VALUE key, VALUE value, Builder b) {
     b->col += 2;
     b->pos += 2;
     Check_Type(value, T_STRING);
-    append_string(b, StringValuePtr(value), (int)RSTRING_LEN(value));
+    append_string(b, StringValuePtr(value), (int)RSTRING_LEN(value), xml_quote_chars);
     buf_append(&b->buf, '"');
     b->col++;
     b->pos++;
@@ -243,7 +263,7 @@ pop(Builder b) {
     Element	e;
 
     if (0 > b->depth) {
-	rb_raise(ox_arg_error_class, "closed to many element");
+	rb_raise(ox_arg_error_class, "closed too many elements");
     }
     e = &b->stack[b->depth];
     b->depth--;
@@ -611,7 +631,7 @@ builder_element(int argc, VALUE *argv, VALUE self) {
     buf_append(&b->buf, '<');
     b->col++;
     b->pos++;
-    append_string(b, e->name, len);
+    append_string(b, e->name, len, xml_element_chars);
     if (1 < argc) {
 	rb_hash_foreach(argv[1], append_attr, (VALUE)b);
     }
@@ -638,7 +658,7 @@ builder_comment(VALUE self, VALUE text) {
     buf_append_string(&b->buf, "<!-- ", 5);
     b->col += 5;
     b->pos += 5;
-    append_string(b, StringValuePtr(text), RSTRING_LEN(text));
+    append_string(b, StringValuePtr(text), RSTRING_LEN(text), xml_element_chars);
     buf_append_string(&b->buf, " --/> ", 5);
     b->col += 5;
     b->pos += 5;
@@ -661,7 +681,7 @@ builder_doctype(VALUE self, VALUE text) {
     buf_append_string(&b->buf, "<!DOCTYPE ", 10);
     b->col += 10;
     b->pos += 10;
-    append_string(b, StringValuePtr(text), RSTRING_LEN(text));
+    append_string(b, StringValuePtr(text), RSTRING_LEN(text), xml_element_chars);
     buf_append(&b->buf, '>');
     b->col++;
     b->pos++;
@@ -683,7 +703,7 @@ builder_text(VALUE self, VALUE text) {
 	v = rb_funcall(v, ox_to_s_id, 0);
     }
     i_am_a_child(b, true);
-    append_string(b, StringValuePtr(v), RSTRING_LEN(v));
+    append_string(b, StringValuePtr(v), RSTRING_LEN(v), xml_element_chars);
 
     return Qnil;
 }

data/ext/ox/dump.c

@@ -66,7 +66,7 @@ static void	dump_end(Out out, Element e);
 static void	grow(Out out, size_t len);
 
 static void	dump_value(Out out, const char *value, size_t size);
-static void	dump_str_value(Out out, const char *value, size_t size);
+static void	dump_str_value(Out out, const char *value, size_t size, const char *table);
 static int	dump_var(ID key, VALUE value, Out out);
 static void	dump_num(Out out, VALUE obj);
 static void	dump_date(Out out, VALUE obj);
@@ -74,13 +74,13 @@ static void	dump_time_thin(Out out, VALUE obj);
 static void	dump_time_xsd(Out out, VALUE obj);
 static int	dump_hash(VALUE key, VALUE value, Out out);
 
-static int	is_xml_friendly(const uchar *str, int len);
+static int	is_xml_friendly(const uchar *str, int len, const char *table);
 
 static const char	hex_chars[17] = "0123456789abcdef";
 
 // The : character is equivalent to 10. Used for replacement characters up to 10
 // characters long such as ''.
-static char	xml_friendly_chars[257] = "\
+static const char	xml_friendly_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
 11611156111111111111111111114141\
 11111111111111111111111111111111\
@@ -90,10 +90,30 @@ static char	xml_friendly_chars[257] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111";
 
+static const char	xml_quote_chars[257] = "\
+:::::::::11::1::::::::::::::::::\
+11611151111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111";
+
+static const char	xml_element_chars[257] = "\
+:::::::::11::1::::::::::::::::::\
+11111151111111111111111111114141\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111\
+11111111111111111111111111111111";
+
 inline static int
-is_xml_friendly(const uchar *str, int len) {
+is_xml_friendly(const uchar *str, int len, const char *table) {
     for (; 0 < len; str++, len--) {
-	if ('1' != xml_friendly_chars[*str]) {
+	if ('1' != table[*str]) {
 	    return 0;
 	}
     }
@@ -101,7 +121,7 @@ is_xml_friendly(const uchar *str, int len) {
 }
 
 inline static size_t
-xml_str_len(const uchar *str, size_t len) {
+xml_str_len(const uchar *str, size_t len, const char *table) {
     size_t	size = 0;
 
     for (; 0 < len; str++, len--) {
@@ -131,12 +151,12 @@ obj_class_code(VALUE obj) {
     case T_FALSE:	   return FalseClassCode;
     case T_FIXNUM:	   return FixnumCode;
     case T_FLOAT:	   return FloatCode;
-    case T_STRING:	   return (is_xml_friendly((uchar*)StringValuePtr(obj), (int)RSTRING_LEN(obj))) ? StringCode : String64Code;
+    case T_STRING:	   return (is_xml_friendly((uchar*)StringValuePtr(obj), (int)RSTRING_LEN(obj), xml_element_chars)) ? StringCode : String64Code;
     case T_SYMBOL:
     {
 	const char	*sym = rb_id2name(SYM2ID(obj));
 
-	return (is_xml_friendly((uchar*)sym, (int)strlen(sym))) ? SymbolCode : Symbol64Code;
+	return (is_xml_friendly((uchar*)sym, (int)strlen(sym), xml_element_chars)) ? SymbolCode : Symbol64Code;
     }
     case T_DATA:	   return (rb_cTime == clas) ? TimeCode : ((ox_date_class == clas) ? DateCode : 0);
     case T_STRUCT:	   return (rb_cRange == clas) ? RangeCode : StructCode;
@@ -319,14 +339,14 @@ dump_value(Out out, const char *value, size_t size) {
 }
 
 inline static void
-dump_str_value(Out out, const char *value, size_t size) {
-    size_t	xsize = xml_str_len((const uchar*)value, size);
+dump_str_value(Out out, const char *value, size_t size, const char *table) {
+    size_t	xsize = xml_str_len((const uchar*)value, size, table);
     
     if (out->end - out->cur <= (long)xsize) {
 	grow(out, xsize);
     }
     for (; '\0' != *value; value++) {
-	if ('1' == xml_friendly_chars[(uchar)*value]) {
+	if ('1' == table[(uchar)*value]) {
 	    *out->cur++ = *value;
 	} else {
 	    switch (*value) {
@@ -685,7 +705,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	if (is_xml_friendly((uchar*)str, cnt)) {
 	    e.type = StringCode;
 	    out->w_start(out, &e);
-	    dump_str_value(out, str, cnt);
+	    dump_str_value(out, str, cnt, '<');
 	    e.indent = -1;
 	    out->w_end(out, &e);
 	} else {
@@ -702,7 +722,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 #else
 	e.type = StringCode;
 	out->w_start(out, &e);
-	dump_str_value(out, str, cnt);
+	dump_str_value(out, str, cnt, xml_element_chars);
 	e.indent = -1;
 	out->w_end(out, &e);
 #endif
@@ -717,7 +737,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	if (is_xml_friendly((uchar*)sym, cnt)) {
 	    e.type = SymbolCode;
 	    out->w_start(out, &e);
-	    dump_str_value(out, sym, cnt);
+	    dump_str_value(out, sym, cnt, '<');
 	    e.indent = -1;
 	    out->w_end(out, &e);
 	} else {
@@ -734,7 +754,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 #else
 	e.type = SymbolCode;
 	out->w_start(out, &e);
-	dump_str_value(out, sym, cnt);
+	dump_str_value(out, sym, cnt, xml_element_chars);
 	e.indent = -1;
 	out->w_end(out, &e);
 #endif
@@ -901,7 +921,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 #if USE_B64
 	if (is_xml_friendly((uchar*)s, cnt)) {
 	    /*dump_value(out, "/", 1); */
-	    dump_str_value(out, s, cnt);
+	    dump_str_value(out, s, cnt, '<');
 	} else {
 	    ulong	size = b64_size(cnt);
 	    char	*b64 = ALLOCA_N(char, size + 1);
@@ -910,7 +930,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	    dump_value(out, b64, size);
 	}
 #else
-	dump_str_value(out, s, cnt);
+	dump_str_value(out, s, cnt, xml_element_chars);
 #endif
 	e.indent = -1;
 	out->w_end(out, &e);
@@ -1148,7 +1168,7 @@ dump_gen_nodes(VALUE obj, int depth, Out out) {
 		dump_gen_instruct(*np, d2, out);
 		indent_needed = (1 == cnt) ? 0 : 1;
 	    } else if (rb_cString == clas) {
-		dump_str_value(out, StringValuePtr(*(VALUE*)np), RSTRING_LEN(*np));
+		dump_str_value(out, StringValuePtr(*(VALUE*)np), RSTRING_LEN(*np), xml_element_chars);
 		indent_needed = (1 == cnt) ? 0 : 1;
 	    } else if (ox_comment_clas == clas) {
 		dump_gen_val_node(*np, d2, "<!-- ", 5, " -->", 4, out);
@@ -1200,7 +1220,7 @@ dump_gen_attr(VALUE key, VALUE value, Out out) {
     fill_value(out, ks, klen);
     *out->cur++ = '=';
     *out->cur++ = '"';
-    dump_str_value(out, StringValuePtr(value), RSTRING_LEN(value));
+    dump_str_value(out, StringValuePtr(value), RSTRING_LEN(value), xml_quote_chars);
     *out->cur++ = '"';
 
     return ST_CONTINUE;

data/ext/ox/sax.c

@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
@@ -985,7 +986,7 @@ read_element_start(SaxDrive dr) {
 	end_element_cb(dr, name, pos, line, col, h);
     } else if (stackless) {
 	end_element_cb(dr, name, pos, line, col, h);
-    } else if (0 != h && h->jump) {
+    } else if (NULL != h && h->jump) {
 	stack_push(&dr->stack, ename, name, h);
 	if ('>' != c) {
 	    ox_sax_drive_error(dr, WRONG_CHAR "element not closed");
@@ -1224,11 +1225,11 @@ read_jump_term(Buf buf, const char *pat) {
     if ('/' != buf_next_non_white(buf)) {
 	return 0;
     }
-    if (*pat != buf_next_non_white(buf)) {
+    if (*pat != tolower(buf_next_non_white(buf))) {
 	return 0;
     }
     for (pat++; '\0' != *pat; pat++) {
-	if (*pat != buf_get(buf)) {
+	if (*pat != tolower(buf_get(buf))) {
 	    return 0;
 	}
     }

data/lib/ox/version.rb

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

metadata

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