ox 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bec620893f1af26eaf853fec54ac033da9516689
-  data.tar.gz: 26fd103eb9d31e42ce45bf5371b51740d91d7b21
+  metadata.gz: 74bd834772f0b2167d7bd55bc7b98269eade4940
+  data.tar.gz: e18e59efd324dc787ceb49cd845383d02ec7924b
 SHA512:
-  metadata.gz: 64abf65cab8bd13621831043039a8e4e8ccf7e1bf839bf061a443fb5e9cd7e5d7d6a1334cc36ab5caa9bb71034c03ddcd0f40b0f1d9630920a73be8828230b7c
-  data.tar.gz: 78332e2f9ef6892242bb8ed4a84a4353a122e8980f660575c719520a83aca5be0d8c6f376b1dd9628b168c7ddc347403c59afd783a175d7fbed6f76be407a2b5
+  metadata.gz: 1712ad586c88a18f1ea5b26ecf182dac52303f9534b8ba2f3882c4df85fbddbb25a6ea53867f42d4a39e3f7aca485cecc1e2d65fb814946536ff2285bef6c811
+  data.tar.gz: 2aa72647db5c0697b91f7c59247d9005e3882ae47d2cf902f675235cb49706682520fb633b649ad119e9e5f9d50fe331934511e839faf8231abf188f01cfbd54

data/README.md

@@ -34,19 +34,17 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Current Release 2.2.1
+### Release 2.2.2
 
- - Added support to handle script elements in html.
-
- - Added support for position from start for the sax parser.
+ - Fixed problem with detecting invalid special character sequences.
 
-### Release 2.2.0
+ - Fixed bug that caused a crash when an <> was encountered with the SAX parser.
 
- - Added the SAX convert_special option to the default options.
+### Release 2.2.1
 
- - Added the SAX smart option to the default options.
+ - Added support to handle script elements in html.
 
- - Other SAX options are now taken from the defaults if not specified.
+ - Added support for position from start for the sax parser.
 
 ## Description
 

data/ext/ox/cache.c

@@ -106,7 +106,7 @@ ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp) {
     *slot = &cache->value;
     if (0 != keyp) {
 	if (0 == cache->key) {
-	    printf("*** Error: failed to set the key for %s\n", key);
+	    printf("*** Error: failed to set the key for '%s'\n", key);
 	    *keyp = 0;
 	} else {
 	    *keyp = cache->key + 1;

data/ext/ox/dump.c

@@ -1091,6 +1091,8 @@ dump_gen_nodes(VALUE obj, int depth, Out out) {
 		indent_needed = (1 == cnt) ? 0 : 1;
 	    } else if (ox_comment_clas == clas) {
 		dump_gen_val_node(*np, d2, "<!-- ", 5, " -->", 4, out);
+	    } else if (ox_raw_clas == clas) {
+		dump_gen_val_node(*np, d2, "", 0, "", 0, out);
 	    } else if (ox_cdata_clas == clas) {
 		dump_gen_val_node(*np, d2, "<![CDATA[", 9, "]]>", 3, out);
 	    } else if (ox_doctype_clas == clas) {

data/ext/ox/ox.c

@@ -84,6 +84,7 @@ VALUE	ox_bag_clas;
 VALUE	ox_bigdecimal_class;
 VALUE	ox_cdata_clas;
 VALUE	ox_comment_clas;
+VALUE	ox_raw_clas;
 VALUE	ox_date_class;
 VALUE	ox_doctype_clas;
 VALUE	ox_document_clas;
@@ -1012,6 +1013,7 @@ void Init_ox() {
     ox_element_clas = rb_const_get_at(Ox, rb_intern("Element"));
     ox_instruct_clas = rb_const_get_at(Ox, rb_intern("Instruct"));
     ox_comment_clas = rb_const_get_at(Ox, rb_intern("Comment"));
+    ox_raw_clas = rb_const_get_at(Ox, rb_intern("Raw"));
     ox_doctype_clas = rb_const_get_at(Ox, rb_intern("DocType"));
     ox_cdata_clas = rb_const_get_at(Ox, rb_intern("CData"));
     ox_bag_clas = rb_const_get_at(Ox, rb_intern("Bag"));

data/ext/ox/ox.h

@@ -239,6 +239,7 @@ extern VALUE	ox_element_clas;
 extern VALUE	ox_instruct_clas;
 extern VALUE	ox_bag_clas;
 extern VALUE	ox_comment_clas;
+extern VALUE	ox_raw_clas;
 extern VALUE	ox_doctype_clas;
 extern VALUE	ox_cdata_clas;
 

data/ext/ox/parse.c

@@ -486,9 +486,8 @@ read_element(PInfo pi) {
 		return 0;
 	    }
 	    if (0 != strchr(attr_value, '&')) {
-		if (0 != collapse_special(pi, (char*)attr_value)) {
+		if (0 != collapse_special(pi, (char*)attr_value) || err_has(&pi->err)) {
 		    attr_stack_cleanup(&attrs);
-		    set_error(&pi->err, "invalid format, special character does not end with a semicolon", pi->str, pi->s);
 		    return 0;
 		}
 	    }
@@ -1079,10 +1078,13 @@ collapse_special(PInfo pi, char *str) {
 		    c = '?';
 		    while (';' != *s++) {
 			if ('\0' == *s) {
+			    set_error(&pi->err, "Invalid format, special character does not end with a semicolon", pi->str, pi->s);
 			    return EDOM;
 			}
 		    }
 		    s++;
+		    set_error(&pi->err, "Invalid format, invalid special character sequence", pi->str, pi->s);
+		    return 0;
 		}
 		*b++ = (char)c;
 	    }

data/ext/ox/sax.c

@@ -288,6 +288,7 @@ parse(SaxDrive dr) {
 		c = buf_get(&dr->buf);
 		if ('\0' == c) {
 		    ox_sax_drive_error(dr, NO_TERM "DOCTYPE or comment not terminated");
+
 		    goto DONE;
 		} else if ('-' == c) {
 		    c = buf_get(&dr->buf); /* skip first - and get next character */
@@ -850,6 +851,14 @@ read_element_start(SaxDrive dr) {
     if ('\0' == (c = read_name_token(dr))) {
         return '\0';
     }
+    if ('\0' == *dr->buf.str) {
+	char	msg[256];
+
+	snprintf(msg, sizeof(msg) - 1, "%sempty element", INVALID_FORMAT);
+	ox_sax_drive_error_at(dr, msg, pos, line, col);
+
+	return '\0';
+    }
     if (0 != parent) {
 	parent->childCnt++;
     }
@@ -1571,7 +1580,7 @@ ox_sax_collapse_special(SaxDrive dr, char *str, int pos, int line, int col) {
                 c = '\'';
                 s += 5;
             } else {
-		ox_sax_drive_error_at(dr, NO_TERM "special character does not end with a semicolon", pos, line, col);
+		ox_sax_drive_error_at(dr, INVALID_FORMAT "Invalid special character sequence", pos, line, col);
 		c = '&';
             }
             *b++ = (char)c;

data/lib/ox.rb

@@ -66,6 +66,7 @@ require 'ox/error'
 require 'ox/hasattrs'
 require 'ox/node'
 require 'ox/comment'
+require 'ox/raw'
 require 'ox/instruct'
 require 'ox/cdata'
 require 'ox/doctype'

data/lib/ox/comment.rb

@@ -1,6 +1,6 @@
 
 module Ox
-  # Coments represent XML comments in an XML document. A comment as value
+  # Comments represent XML comments in an XML document. A comment has a value
   # attribute only.
   class Comment < Node
     # Creates a new Comment with the specified value.

data/lib/ox/raw.rb

@@ -0,0 +1,14 @@
+
+module Ox
+  # Raw elements are used to inject existing XML strings into a document
+  # WARNING: Use of this feature can result in invalid XML, since `value` is
+  # injected as-is.
+  class Raw < Node
+    # Creates a new Raw element with the specified value.
+    # @param value [String] string value for the comment
+    def initialize(value)
+      super
+    end
+
+  end # Raw
+end # Ox

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-10-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
@@ -66,6 +66,7 @@ files:
 - lib/ox/hasattrs.rb
 - lib/ox/instruct.rb
 - lib/ox/node.rb
+- lib/ox/raw.rb
 - lib/ox/sax.rb
 - lib/ox/version.rb
 - lib/ox/xmlrpc_adapter.rb
@@ -97,3 +98,4 @@ signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
+has_rdoc: true