ox 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74bd834772f0b2167d7bd55bc7b98269eade4940
-  data.tar.gz: e18e59efd324dc787ceb49cd845383d02ec7924b
+  metadata.gz: 6501b4bbce82df3807ef682abd7900ad0a01c8c4
+  data.tar.gz: ab7dc1b9321f2f023edba54e29104a3962136b5e
 SHA512:
-  metadata.gz: 1712ad586c88a18f1ea5b26ecf182dac52303f9534b8ba2f3882c4df85fbddbb25a6ea53867f42d4a39e3f7aca485cecc1e2d65fb814946536ff2285bef6c811
-  data.tar.gz: 2aa72647db5c0697b91f7c59247d9005e3882ae47d2cf902f675235cb49706682520fb633b649ad119e9e5f9d50fe331934511e839faf8231abf188f01cfbd54
+  metadata.gz: c0192af23950c8fbcbc3ff351a12b17e57198836e34fe1b8662f4089b93389ac6e2b614deb8c1c96f61c5d99d76aa06509e0a049e97011ea708fc09440df3968
+  data.tar.gz: b95bb36a7fbc7695dcb333f13e610d9086e977a538c22e85c1941fb33d076c9b371380a208d4ed5f078556a73bae4c36cd895e2615b254bb987aa4b3837b7483

data/README.md

@@ -34,17 +34,15 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Release 2.2.2
+### Release 2.2.3
 
- - Fixed problem with detecting invalid special character sequences.
+ - The convert_special option now applies to attributes as well as elements in
+   the SAX parser.
 
- - Fixed bug that caused a crash when an <> was encountered with the SAX parser.
+ - The convert_special option now applies to the regualr parser as well as the
+   SAX parser.
 
-### Release 2.2.1
-
- - Added support to handle script elements in html.
-
- - Added support for position from start for the sax parser.
+ - Updated to work correctly with Ruby 2.3.0.
 
 ## Description
 

data/ext/ox/dump.c

@@ -540,10 +540,15 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
     }
     out->obj = obj;
     if (0 == aid) {
-	/*e.attr.str = 0; */
+	e.attr.str = 0;
 	e.attr.len = 0;
     } else {
 	e.attr.str = rb_id2name(aid);
+	// Ruby 2.3 started to return NULL for some IDs so check for
+	// NULL. Ignore is NULL aid.
+	if (NULL == e.attr.str) {
+	    return;
+	}
 	e.attr.len = strlen(e.attr.str);
     }
     e.closed = 0;

data/ext/ox/extconf.rb

@@ -35,6 +35,7 @@ dflags = {
   'HAS_BIGDECIMAL' => ('jruby' != type) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
   'NEEDS_UIO' => (RUBY_PLATFORM =~ /(win|w)32$/) ? 0 : 1,
+  'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
 }
 
 if RUBY_PLATFORM =~ /(win|w)32$/ || RUBY_PLATFORM =~ /solaris2\.10/

data/ext/ox/ox.c

@@ -148,7 +148,7 @@ struct _Options	 ox_default_options = {
     Yes,		/* sym_keys */
     NoSkip,		/* skip */
     No,			/* smart */
-    No,			/* convert_special */
+    1,			/* convert_special */
 #if HAS_PRIVATE_ENCODING
     Qnil		/* rb_enc */
 #else
@@ -249,7 +249,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, xsd_date_sym, (Yes == ox_default_options.xsd_date) ? Qtrue : ((No == ox_default_options.xsd_date) ? Qfalse : Qnil));
     rb_hash_aset(opts, symbolize_keys_sym, (Yes == ox_default_options.sym_keys) ? Qtrue : ((No == ox_default_options.sym_keys) ? Qfalse : Qnil));
     rb_hash_aset(opts, smart_sym, (Yes == ox_default_options.smart) ? Qtrue : ((No == ox_default_options.smart) ? Qfalse : Qnil));
-    rb_hash_aset(opts, convert_special_sym, (Yes == ox_default_options.convert_special) ? Qtrue : ((No == ox_default_options.convert_special) ? Qfalse : Qnil));
+    rb_hash_aset(opts, convert_special_sym, (ox_default_options.convert_special) ? Qtrue : Qfalse);
     switch (ox_default_options.mode) {
     case ObjMode:	rb_hash_aset(opts, mode_sym, object_sym);	break;
     case GenMode:	rb_hash_aset(opts, mode_sym, generic_sym);	break;
@@ -301,7 +301,6 @@ set_def_opts(VALUE self, VALUE opts) {
 	{ circular_sym, &ox_default_options.circular },
 	{ symbolize_keys_sym, &ox_default_options.sym_keys },
 	{ smart_sym, &ox_default_options.smart },
-	{ convert_special_sym, &ox_default_options.convert_special },
 	{ Qnil, 0 }
     };
     YesNoOpt	o;
@@ -374,6 +373,17 @@ set_def_opts(VALUE self, VALUE opts) {
 	rb_raise(ox_parse_error_class, ":skip must be :skip_none, :skip_return, :skip_white, or nil.\n");
     }
 
+    v = rb_hash_lookup(opts, convert_special_sym);
+    if (Qnil == v) {
+	// no change
+    } else if (Qtrue == v) {
+	ox_default_options.convert_special = 1;
+    } else if (Qfalse == v) {
+	ox_default_options.convert_special = 0;
+    } else {
+	rb_raise(ox_parse_error_class, ":convert_special must be true or false.\n");
+    }
+
     for (o = ynos; 0 != o->attr; o++) {
 	v = rb_hash_lookup(opts, o->sym);
 	if (Qnil == v) {
@@ -523,6 +533,9 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 	if (Qnil != (v = rb_hash_lookup(h, symbolize_keys_sym))) {
 	    options.sym_keys = (Qfalse == v) ? No : Yes;
 	}
+	if (Qnil != (v = rb_hash_lookup(h, convert_special_sym))) {
+	    options.convert_special = (Qfalse != v);
+	}
     }
 #if HAS_ENCODING_SUPPORT
     if ('\0' == *options.encoding) {
@@ -706,7 +719,7 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
     struct _SaxOptions	options;
 
     options.symbolize = (No != ox_default_options.sym_keys);
-    options.convert_special = (Yes == ox_default_options.convert_special);
+    options.convert_special = ox_default_options.convert_special;
     options.smart = (Yes == ox_default_options.smart);
     options.skip = ox_default_options.skip;
 

data/ext/ox/ox.h

@@ -132,7 +132,7 @@ typedef struct _Options {
     char	sym_keys;	/* symbolize keys */
     char	skip;		/* skip mode */
     char	smart;		/* YesNo sax smart mode */
-    char	convert_special;/* YesNo sax smart mode */
+    char	convert_special;/* boolean true or false */
 #if HAS_ENCODING_SUPPORT
     rb_encoding	*rb_enc;
 #elif HAS_PRIVATE_ENCODING

data/ext/ox/parse.c

@@ -485,7 +485,7 @@ read_element(PInfo pi) {
 	    if (0 == (attr_value = read_quoted_value(pi))) {
 		return 0;
 	    }
-	    if (0 != strchr(attr_value, '&')) {
+	    if (pi->options->convert_special && 0 != strchr(attr_value, '&')) {
 		if (0 != collapse_special(pi, (char*)attr_value) || err_has(&pi->err)) {
 		    attr_stack_cleanup(&attrs);
 		    return 0;

data/ext/ox/sax.c

@@ -174,7 +174,11 @@ sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, SaxOptions options) {
     dr->buf.dr = dr;
     stack_init(&dr->stack);
     dr->handler = handler;
+#if HAS_DATA_OBJECT_WRAP
+    dr->value_obj = rb_data_object_wrap(ox_sax_value_class, dr, 0, 0);
+#else
     dr->value_obj = rb_data_object_alloc(ox_sax_value_class, dr, 0, 0);
+#endif
     rb_gc_register_address(&dr->value_obj);
     dr->options = *options;
     dr->hints = 0;
@@ -1333,7 +1337,9 @@ read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req)
             VALUE       args[2];
 
             args[0] = name;
-            ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
+	    if (dr->options.convert_special) {
+		ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
+	    }
             args[1] = rb_str_new2(attr_value);
 #if HAS_ENCODING_SUPPORT
             if (0 != dr->encoding) {

data/lib/ox/element.rb

@@ -159,6 +159,7 @@ module Ox
       id_str = id.to_s
       id_sym = id.to_sym
       nodes.each do |n|
+        next if n.is_a?(String)
         return true if n.value == id_str || n.value == id_sym
       end
       if instance_variable_defined?(:@attributes) && !@attributes.nil?

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-12-31 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