ox 2.4.13 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654a73d8f85ba9a01dfd09ff524b7dd81ac806a1
-  data.tar.gz: 02c2c54c3a0d7d9b9caaac89d5dd5757f4e9e40f
+  metadata.gz: a240f481e8317d54737d2fcf65fa2f261430637f
+  data.tar.gz: 24a418d12d8d84e7a12babc7ca2343d3a082fe72
 SHA512:
-  metadata.gz: e77e791dbe2cad9dd008a19351026dbf0716f338eee3d28a3849c3f835e5803d2471254e1705490de3c4881747360b32d93c5f869a709df9dfc5ec6a914ea7c2
-  data.tar.gz: 30c11b784d183ec6dc5ab0465f7aa68207a97dfb6a660f7f626fea1a265082b7733d18bc1ac0589a5e7eb8af0e0463f2c34008bf0bd31fd5a011682df2ce298b
+  metadata.gz: 101806359fe3900f9282358a20f86a3337e5682f0f10b5145b5f2244017f4a162decc38c822cd74eb943de3b9b6c76457067484a405bb5cd95dbf88350aad376
+  data.tar.gz: 273adc992eb8cf8093d49dafb25c9af875d99b363c5290a0dec14bf4c3cf4b1fdb1c681893fecb7a062b3cf55f3e8406a359e437f5e79b27b8694a652fac98e4

data/README.md

@@ -6,7 +6,7 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Documentation
 
-*Documentation*: http://www.ohler.com/ox
+*Documentation*: http://www.ohler.com/ox/doc
 
 ## Source
 

data/ext/ox/ox.c

@@ -120,6 +120,7 @@ static VALUE	invalid_replace_sym;
 static VALUE	limited_sym;
 static VALUE	margin_sym;
 static VALUE	mode_sym;
+static VALUE	nest_ok_sym;
 static VALUE	object_sym;
 static VALUE	off_sym;
 static VALUE	opt_format_sym;
@@ -166,7 +167,7 @@ struct _Options	 ox_default_options = {
     NoMode,		/* mode */
     StrictEffort,	/* effort */
     Yes,		/* sym_keys */
-    NoSkip,		/* skip */
+    SpcSkip,		/* skip */
     No,			/* smart */
     1,			/* convert_special */
     No,			/* allow_invalid */
@@ -249,6 +250,7 @@ hints_to_overlay(Hints hints) {
 	case BlockOverlay:	ov = block_sym;		break;
 	case OffOverlay:	ov = off_sym;		break;
 	case AbortOverlay:	ov = abort_sym;		break;
+	case NestOverlay:	ov = nest_ok_sym;	break;
 	case ActiveOverlay:
 	default:		ov = active_sym;	break;
 	}
@@ -279,6 +281,7 @@ hints_to_overlay(Hints hints) {
  * - _:strip_namespace_ [String|true|false] false or "" results in no namespace stripping. A string of "*" or true will strip all namespaces. Any other non-empty string indicates that matching namespaces will be stripped.
  * - _:overlay_ [Hash] a Hash of keys that match html element names and values that are one of
  *   - _:active_ - make the normal callback for the element
+ *   - _:nest_ok_ - active but the nesting check is ignored
  *   - _:inactive_ - do not make the element start, end, or attribute callbacks for this element only
  *   - _:block_ - block this and all children callbacks
  *   - _:off_ - block this element and it's children unless the child element is active
@@ -359,6 +362,8 @@ set_overlay(VALUE key, VALUE value, VALUE ctx) {
 	    hint->overlay = InactiveOverlay;
 	} else if (block_sym == value) {
 	    hint->overlay = BlockOverlay;
+	} else if (nest_ok_sym == value) {
+	    hint->overlay = NestOverlay;
 	} else if (off_sym == value) {
 	    hint->overlay = OffOverlay;
 	} else if (abort_sym == value) {
@@ -373,6 +378,7 @@ set_overlay(VALUE key, VALUE value, VALUE ctx) {
  * Returns an overlay hash that can be modified and used as an overlay in the
  * default options or in the sax_html() function call. Values for the keys are:
  *   - _:active_ - make the normal callback for the element
+ *   - _:nest_ok_ - active but ignore nest check
  *   - _:inactive_ - do not make the element start, end, or attribute callbacks for this element only
  *   - _:block_ - block this and all children callbacks
  *   - _:off_ - block this element and it's children unless the child element is active
@@ -407,6 +413,7 @@ sax_html_overlay(VALUE self) {
  *   - _:strip_namespace_ [nil|String|true|false] "" or false result in no namespace stripping. A string of "*" or true will strip all namespaces. Any other non-empty string indicates that matching namespaces will be stripped.
  * - _:overlay_ [Hash] a Hash of keys that match html element names and values that are one of
  *   - _:active_ - make the normal callback for the element
+ *   - _:nest_ok_ - active but ignore nest check
  *   - _:inactive_ - do not make the element start, end, or attribute callbacks for this element only
  *   - _:block_ - block this and all children callbacks
  *   - _:off_ - block this element and it's children unless the child element is active
@@ -965,7 +972,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
  *   - *:convert_special* [true|false] flag indicating special characters like < are converted
  *   - *:symbolize* [true|false] flag indicating the parser symbolize element and attribute names
  *   - *:smart* [true|false] flag indicating the parser uses hints if available (use with html)
- *   - *:skip* [:skip_return|:skip_white] flag indicating the parser skips \r or collpase white space into a single space. Default (skip nothing)
+ *   - *:skip* [:skip_return|:skip_white] flag indicating the parser skips \r or collpase white space into a single space. Default (skip space)
  *   - *:strip_namespace* [nil|String|true|false] "" or false result in no namespace stripping. A string of "*" or true will strip all namespaces. Any other non-empty string indicates that matching namespaces will be stripped.
  */
 static VALUE
@@ -1038,9 +1045,10 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
  * - +options+ [Hash] options parse options
  *   - *:convert_special* [true|false] flag indicating special characters like < are converted
  *   - *:symbolize* [true|false] flag indicating the parser symbolize element and attribute names
- *   - *:skip* [:skip_return|:skip_white] flag indicating the parser skips \r or collapse white space into a single space. Default (skip nothing)
+ *   - *:skip* [:skip_return|:skip_white] flag indicating the parser skips \r or collapse white space into a single space. Default (skip space)
  *   - *:overlay* [Hash] a Hash of keys that match html element names and values that are one of
  *     - _:active_ - make the normal callback for the element
+ *     - _:nest_ok_ - active but ignore nest check
  *     - _:inactive_ - do not make the element start, end, or attribute callbacks for this element only
  *     - _:block_ - block this and all children callbacks
  *     - _:off_ - block this element and it's children unless the child element is active
@@ -1408,6 +1416,7 @@ void Init_ox() {
     invalid_replace_sym = ID2SYM(rb_intern("invalid_replace"));	rb_gc_register_address(&invalid_replace_sym);
     limited_sym = ID2SYM(rb_intern("limited"));			rb_gc_register_address(&limited_sym);
     mode_sym = ID2SYM(rb_intern("mode"));			rb_gc_register_address(&mode_sym);
+    nest_ok_sym = ID2SYM(rb_intern("nest_ok"));			rb_gc_register_address(&nest_ok_sym);
     object_sym = ID2SYM(rb_intern("object"));			rb_gc_register_address(&object_sym);
     off_sym = ID2SYM(rb_intern("off"));				rb_gc_register_address(&off_sym);
     opt_format_sym = ID2SYM(rb_intern("opt_format"));		rb_gc_register_address(&opt_format_sym);

data/ext/ox/sax.c

@@ -432,7 +432,8 @@ parse(SaxDrive dr) {
 	for (sp = dr->stack.tail - 1; dr->stack.head <= sp; sp--) {
 	    snprintf(msg, sizeof(msg) - 1, "%selement '%s' not closed", EL_MISMATCH, sp->name);
 	    ox_sax_drive_error_at(dr, msg, dr->buf.pos, dr->buf.line, dr->buf.col);
-	    if (dr->has.end_element && 0 >= dr->blocked && (NULL == sp->hint || ActiveOverlay == sp->hint->overlay)) {
+	    if (dr->has.end_element && 0 >= dr->blocked &&
+		(NULL == sp->hint || ActiveOverlay == sp->hint->overlay || NestOverlay == sp->hint->overlay)) {
 		VALUE       args[1];
 
 		args[0] = sp->val;
@@ -825,7 +826,7 @@ read_comment(SaxDrive dr) {
 	Hint	h = ox_hint_find(dr->options.hints, "!--");
 	
 	if (NULL == parent || NULL == parent->hint || OffOverlay != parent->hint->overlay ||
-	    (NULL != h && ActiveOverlay == h->overlay)) {
+	    (NULL != h && (ActiveOverlay == h->overlay || ActiveOverlay == h->overlay))) {
 
 	    args[0] = rb_str_new2(dr->buf.str);
 #if HAS_ENCODING_SUPPORT
@@ -919,8 +920,8 @@ read_element_start(SaxDrive dr) {
 	    }
 	    if (0 != top_nv) {
 		char	msg[256];
-	
-		if (!h->nest && 0 == strcasecmp(top_nv->name, h->name)) {
+
+		if (!h->nest && NestOverlay != h->overlay && 0 == strcasecmp(top_nv->name, h->name)) {
 		    snprintf(msg, sizeof(msg) - 1, "%s%s can not be nested in a %s document, closing previous.",
 			     INV_ELEMENT, dr->buf.str, dr->options.hints->name);
 		    ox_sax_drive_error(dr, msg);
@@ -928,7 +929,7 @@ read_element_start(SaxDrive dr) {
 		    end_element_cb(dr, top_nv->val, pos, line, col, top_nv->hint);
 		    top_nv = stack_peek(&dr->stack);
 		}
-		if (0 != h->parents) {
+		if (0 != h->parents && NestOverlay != h->overlay) {
 		    const char	**p;
 		    int		ok = 0;
 
@@ -948,7 +949,7 @@ read_element_start(SaxDrive dr) {
 	}
     }
     name = str2sym(dr, dr->buf.str, &ename);
-    if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+    if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
         VALUE       args[1];
 
 	if (dr->has.pos) {
@@ -975,7 +976,7 @@ read_element_start(SaxDrive dr) {
 	}
 	closed = ('/' == c);
     }
-    if (dr->has.attrs_done && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+    if (dr->has.attrs_done && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
 	rb_funcall(dr->handler, ox_attrs_done_id, 0);
     }
     if (closed) {
@@ -1060,7 +1061,7 @@ read_element_end(SaxDrive dr) {
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' closed but not opened", EL_MISMATCH, dr->buf.str);
 		ox_sax_drive_error_at(dr, msg, pos, line, col);
 		name = str2sym(dr, dr->buf.str, 0);
-		if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+		if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
 		    VALUE       args[1];
 
 		    if (dr->has.pos) {
@@ -1099,7 +1100,7 @@ read_element_end(SaxDrive dr) {
 		    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
 		}
 		for (nv = stack_pop(&dr->stack); match < nv; nv = stack_pop(&dr->stack)) {
-		    if (dr->has.end_element && 0 >= dr->blocked && (NULL == nv->hint || ActiveOverlay == nv->hint->overlay)) {
+		    if (dr->has.end_element && 0 >= dr->blocked && (NULL == nv->hint || ActiveOverlay == nv->hint->overlay || NestOverlay == h->overlay)) {
 			rb_funcall(dr->handler, ox_end_element_id, 1, nv->val);
 		    }
 		    if (NULL != nv->hint && BlockOverlay == nv->hint->overlay && 0 < dr->blocked) {
@@ -1387,7 +1388,7 @@ read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req,
 		is_encoding = 0;
 	    }
 	}
-	if (0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+	if (0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
 	    if (dr->has.attr_value) {
 		VALUE       args[2];
 
@@ -1732,7 +1733,7 @@ hint_try_close(SaxDrive dr, const char *name) {
 
 static void
 end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col, Hint h) {
-    if (dr->has.end_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+    if (dr->has.end_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
 	if (dr->has.pos) {
 	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
 	}

data/ext/ox/sax_hint.h

@@ -14,6 +14,7 @@ typedef enum {
     BlockOverlay	= 'b',
     OffOverlay		= 'o',
     AbortOverlay	= 'a',
+    NestOverlay		= 'n', // nest flag is ignored
 } Overlay;
 
 typedef struct _Hint {

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.4.13
+  version: 2.5.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-04 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
@@ -33,7 +33,6 @@ files:
 - ext/ox/cache8.c
 - ext/ox/cache8.h
 - ext/ox/dump.c
-- ext/ox/encode.h
 - ext/ox/err.c
 - ext/ox/err.h
 - ext/ox/extconf.rb
@@ -97,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ox
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.

data/ext/ox/encode.h

@@ -1,26 +0,0 @@
-/* encode.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
-
-#ifndef __OX_ENCODE_H__
-#define __OX_ENCODE_H__
-
-#include "ruby.h"
-#if HAS_ENCODING_SUPPORT
-#include "ruby/encoding.h"
-#endif
-
-static inline VALUE
-ox_encode(VALUE rstr) {
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, ox_utf8_encoding);
-#else
-    if (Qnil != ox_utf8_encoding) {
-	rstr = rb_funcall(ox_utf8_encoding, ox_iconv_id, 1, rstr);
-    }
-#endif
-    return rstr;
-}
-
-#endif /* __OX_ENCODE_H__ */