ox 2.4.12 → 2.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3e52f21c5d0c93066ee3ef6df56da85ea9a292c
-  data.tar.gz: 4f1172ee0271140ac82efe30b725d59c127f2d51
+  metadata.gz: 654a73d8f85ba9a01dfd09ff524b7dd81ac806a1
+  data.tar.gz: 02c2c54c3a0d7d9b9caaac89d5dd5757f4e9e40f
 SHA512:
-  metadata.gz: 0041f24b54d71b7b3b27b1586268c01e244edc869ba9ada9ab86b16e663b989bc6748c8072e657b40afec4978e26b491774c18d0de5027ec54dd0c7f0ea64fe7
-  data.tar.gz: cf6950e3f7c792ca02e08dbd5d627eb47b9d46fe43c68cc8ceb9c71de761c9d273fd545dea858be17083007a3ee315af0f492bad50dc648f999cc5047a6b94a1
+  metadata.gz: e77e791dbe2cad9dd008a19351026dbf0716f338eee3d28a3849c3f835e5803d2471254e1705490de3c4881747360b32d93c5f869a709df9dfc5ec6a914ea7c2
+  data.tar.gz: 30c11b784d183ec6dc5ab0465f7aa68207a97dfb6a660f7f626fea1a265082b7733d18bc1ac0589a5e7eb8af0e0463f2c34008bf0bd31fd5a011682df2ce298b

data/ext/ox/builder.c

@@ -37,8 +37,9 @@ typedef struct _Builder {
 static VALUE		builder_class = Qundef;
 static const char	indent_spaces[] = "\n                                                                                                                                "; // 128 spaces
 
-// The : character is equivalent to 10. Used for replacement characters up to 10
-// characters long such as ''.
+// The : character is equivalent to 10. Used for replacement characters up to
+// 10 characters long such as ''. From
+// https://www.w3.org/TR/2006/REC-xml11-20060816
 #if 0
 static const char	xml_friendly_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
@@ -49,18 +50,21 @@ static const char	xml_friendly_chars[257] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111";
+#endif
 
-static const char	xml_quote_chars[257] = "\
+// From 2.3 of the XML 1.1 spec. All over 0x20 except <&", > also. Builder
+// uses double quotes for attributes.
+static const char	xml_attr_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
-11611151111111111111111111111111\
+11611151111111111111111111114141\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111";
-#endif
 
+// From 3.1 of the XML 1.1 spec. All over 0x20 except <&, > also.
 static const char	xml_element_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
 11111151111111111111111111114141\
@@ -222,8 +226,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), xml_quote_chars);
-    append_string(b, StringValuePtr(value), (int)RSTRING_LEN(value), xml_element_chars);
+    append_string(b, StringValuePtr(value), (int)RSTRING_LEN(value), xml_attr_chars);
     buf_append(&b->buf, '"');
     b->col++;
     b->pos++;
@@ -854,9 +857,6 @@ builder_close(VALUE self) {
  * An XML builder.
  */
 void ox_init_builder(VALUE ox) {
-#if 0
-    ox = rb_define_module("Ox");
-#endif
     builder_class = rb_define_class_under(ox, "Builder", rb_cObject);
     rb_define_module_function(builder_class, "new", builder_new, -1);
     rb_define_module_function(builder_class, "file", builder_file, -1);

data/ext/ox/cache.c

@@ -9,6 +9,7 @@
 #include <string.h>
 #include <strings.h>
 #include <stdarg.h>
+#include <stdint.h>
 
 #include "cache.h"
 
@@ -27,7 +28,7 @@ static char* form_key(const char *s) {
     size_t	len = strlen(s);
     char	*d = ALLOC_N(char, len + 2);
 
-    *d = (255 <= len) ? 255 : len;
+    *(uint8_t*)d = (255 <= len) ? 255 : len;
     memcpy(d + 1, s, len + 1);
 
     return d;

data/ext/ox/sax.c

@@ -1156,6 +1156,28 @@ read_text(SaxDrive dr) {
 	int	isEnd = ('/' == buf_get(&dr->buf));
 
 	buf_backup(&dr->buf);
+	if (NoSkip == dr->options.skip && dr->has.text && !isEnd) {
+	    args[0] = rb_str_new2(dr->buf.str);
+#if HAS_ENCODING_SUPPORT
+	    if (0 != dr->encoding) {
+		rb_enc_associate(args[0], dr->encoding);
+	    }
+#elif HAS_PRIVATE_ENCODING
+	    if (Qnil != dr->encoding) {
+		rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
+	    }
+#endif
+	    if (dr->has.pos) {
+		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+	    }
+	    if (dr->has.line) {
+		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+	    }
+	    if (dr->has.column) {
+		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    }
+	    rb_funcall2(dr->handler, ox_text_id, 1, args);
+	}
 	if (!isEnd || 0 == parent || 0 < parent->childCnt) {
 	    return c;
 	}

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.4.12
+  version: 2.4.13
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-21 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