ox 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb02e4bfe5c3553796c87488d1a973e5d0c7774391352c85558776b462a722ed
-  data.tar.gz: 860e2ce73ed2f755140241bf211ce26425e8bb49ce1d3d1263b72a2f3e48dc44
+  metadata.gz: 2ed84d3d4fbc1ce7e736c41db72f0be81b54e647916ec7904d3ed8bde7a9f3c0
+  data.tar.gz: d8b315fcbadfa83b886cf99ef1273da41511ce2633a2fae01ed9fb5f1a8ac872
 SHA512:
-  metadata.gz: 7bbbd7e22da84b169665e1633f8ad0f533ea500e01d5712282dbe1921d346bdcfd3dc51b918d6cbe241fa54d2b45b35a42553f44a0308f0d54e186e58d363fc2
-  data.tar.gz: f45f9c90c1875965a4c0900334861d9416c888fe420b8343139abf09c2daaf51a4e56f2fd2abcb1229f33864c5ee3f2f37bc5a7caa42bd3d22685c942976de49
+  metadata.gz: b86eb6d808f3a3f0dd373082060c838cf829ca15f2d41d64df7a15f6014d4401019e45d39b564f1dade27f328c165792776692f361f4d95f955da1160c1db016
+  data.tar.gz: a8262ff6dc805641118dd60691d80da5ac8bd23efd69274c1807feb94f3ddde1da1bfecbc538a2a62e06f02a242384629393fb42216875e57f5aebabd3e902b9

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+## 2.9.3 - June 12, 2018
+
+  - Handle `\0` in dumped strings better.
+
+  - No `\n` added on dumped if indent is less than zero.
+
 ## 2.9.2 - April 16, 2018
 
   - `locate` fixed to cover a missing condition with named child thanks to mberlanda.

data/README.md

@@ -246,7 +246,7 @@ necessary.
 The type indicator map is:
 
 - **a** => `Array`
-- **b** => `Base64`
+- **b** => `Base64` - only for legacy loads
 - **c** => `Class`
 - **f** => `Float`
 - **g** => `Regexp`
@@ -300,8 +300,6 @@ Hash. An example is of { 1 => 'one', 2 => 'two' } encoding is:
   <s>two</s>
 </h>
 ```
-Strings with characters not allowed in XML are base64 encoded amd will be
-converted back into a String when loaded.
 
 Ox supports circular references where attributes of one Object can refer to
 an Object that refers back to the first Object. When this option is used an

data/ext/ox/dump.c

@@ -194,7 +194,7 @@ fill_value(Out out, const char *value, size_t len) {
 	memcpy(out->cur, value, len);
 	out->cur += len;
     } else {
-	for (; '\0' != *value; value++) {
+	for (; 0 < len; len--, value++) {
 	    *out->cur++ = *value;
 	}
     }
@@ -210,7 +210,7 @@ fill_attr(Out out, char name, const char *value, size_t len) {
 	memcpy(out->cur, value, len);
 	out->cur += len;
     } else {
-	for (; '\0' != *value; value++) {
+	for (; 0 < len; len--, value++) {
 	    *out->cur++ = *value;
 	}
     }
@@ -331,7 +331,7 @@ dump_value(Out out, const char *value, size_t size) {
 	memcpy(out->cur, value, size);
 	out->cur += size;
     } else {
-	for (; '\0' != *value; value++) {
+	for (; 0 < size; size--, value++) {
 	    *out->cur++ = *value;
 	}
     }
@@ -345,7 +345,7 @@ dump_str_value(Out out, const char *value, size_t size, const char *table) {
     if (out->end - out->cur <= (long)xsize) {
 	grow(out, xsize);
     }
-    for (; '\0' != *value; value++) {
+    for (; 0 < size; size--, value++) {
 	if ('1' == table[(uchar)*value]) {
 	    *out->cur++ = *value;
 	} else {
@@ -1284,7 +1284,9 @@ dump_obj_to_xml(VALUE obj, Options copts, Out out) {
 	out->w_end = dump_end;
 	dump_first_obj(obj, out);
     }
-    dump_value(out, "\n", 1);
+    if (0 <= out->indent) {
+	dump_value(out, "\n", 1);
+    }
     if (Yes == copts->circular) {
 	ox_cache8_delete(out->circ_cache);
     }

data/ext/ox/encode.h

@@ -0,0 +1,26 @@
+/* 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__ */

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-06-12 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
@@ -35,6 +35,7 @@ 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