ox 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1967ed8377e3a3e7ccdb8b6e14a21e5dbd0c7f435b87474c422cf3572d639a9
-  data.tar.gz: cdb5712d31fd0641c9f444e8ea205fb18c3ccb246ba651d31b8dbd34db7ba579
+  metadata.gz: f6e57cf5b8fbaa41d750b25f77a81d329f58465115db0c628dd97ba4b0bf97b3
+  data.tar.gz: df2f0ba360c0c6f5ea0ac23496ce133a8008c78c5a2a7e3a9078b7138ee957b9
 SHA512:
-  metadata.gz: 52f78021c4525f0c88548c2ce87a2a660d0ce60ea72ffef159611a4b39b883ce497adebf3a13c22f3c744325f4c463c4493ab66b3efbda7c975e99b0d46e7c71
-  data.tar.gz: b505855a76c09de2bb9c07b821b509e1d8d58ee3ce45816db6612086b10bb748dfe1c9ca07da8baab077a5ffdbc33cd3ed773fbd14f9cb7e8c2108b2e935797e
+  metadata.gz: 2dbff602131c14cde1d7b754165fee62867f5b27956c01de1a52a119f651bcaa8457e92c900cc2a121f74cfdcfbadbeec74a9f144e450f1b24805bd0167e3d14
+  data.tar.gz: 40392d27cec2d85d4df7deae4870da0da2fabf3a96b761a4f8e95d0813b99763c5dd7cdb76a4c8a139ccf613868a04d7ded091fa68db1e89fdfa5ee49b118a6e

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## 2.10.1 - May 27, 2019
+
+  - Remove extra space from doctype dump.
+
 ## 2.10.0 - August 26, 2018
 
   - `:element_key_mod` and `:attr_key_mod` options were added to allow keys to

data/README.md

@@ -1,7 +1,7 @@
 # Ox gem
 A fast XML parser and Object marshaller as a Ruby gem.
 
-[![Build Status](https://secure.travis-ci.org/ohler55/ox.png?branch=master)](http://travis-ci.org/ohler55/ox)
+[![Build Status](https://secure.travis-ci.org/ohler55/ox.svg?branch=master)](http://travis-ci.org/ohler55/ox) [![TideLift](https://tidelift.com/badges/github/ohler55/ox)](https://tidelift.com/subscription/pkg/rubygems-ox?utm_source=rubygems-ox&utm_medium=referral&utm_campaign=readme)
 
 ## Installation
     gem install ox
@@ -20,8 +20,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 [Follow @peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Ox gem.
 
-## Build Status
+## Support
 
+[Get supported Ox with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-ox?utm_source=rubygems-ox&utm_medium=referral&utm_campaign=readme)
 
 ## Links of Interest
 

data/ext/ox/attr.h

@@ -3,20 +3,20 @@
  * All rights reserved.
  */
 
-#ifndef __OX_ATTR_H__
-#define __OX_ATTR_H__
+#ifndef OX_ATTR_H
+#define OX_ATTR_H
 
 #include "ox.h"
 
 #define ATTR_STACK_INC	8
 
-typedef struct _Attr {
+typedef struct _attr {
     const char	*name;
     const char	*value;
 } *Attr;
 
-typedef struct _AttrStack {
-    struct _Attr	base[ATTR_STACK_INC];
+typedef struct _attrStack {
+    struct _attr	base[ATTR_STACK_INC];
     Attr		head;	/* current stack */
     Attr		end;	/* stack end */
     Attr		tail;	/* pointer to one past last element name on stack */
@@ -25,7 +25,7 @@ typedef struct _AttrStack {
 inline static void
 attr_stack_init(AttrStack stack) {
     stack->head = stack->base;
-    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Attr);
+    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _attr);
     stack->tail = stack->head;
     stack->head->name = 0;
 }
@@ -50,10 +50,10 @@ attr_stack_push(AttrStack stack, const char *name, const char *value) {
 	size_t	toff = stack->tail - stack->head;
 
 	if (stack->base == stack->head) {
-	    stack->head = ALLOC_N(struct _Attr, len + ATTR_STACK_INC);
-	    memcpy(stack->head, stack->base, sizeof(struct _Attr) * len);
+	    stack->head = ALLOC_N(struct _attr, len + ATTR_STACK_INC);
+	    memcpy(stack->head, stack->base, sizeof(struct _attr) * len);
 	} else {
-	    REALLOC_N(stack->head, struct _Attr, len + ATTR_STACK_INC);
+	    REALLOC_N(stack->head, struct _attr, len + ATTR_STACK_INC);
 	}
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + ATTR_STACK_INC;
@@ -81,4 +81,4 @@ attr_stack_pop(AttrStack stack) {
     return 0;
 }
 
-#endif /* __OX_ATTR_H__ */
+#endif /* OX_ATTR_H */

data/ext/ox/base64.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __BASE64_H__
-#define __BASE64_H__
+#ifndef BASE64_H
+#define BASE64_H
 
 typedef unsigned char	uchar;
 
@@ -15,4 +15,4 @@ extern unsigned long    b64_orig_size(const char *text);
 extern void	        to_base64(const uchar *src, int len, char *b64);
 extern void             from_base64(const char *b64, uchar *str);
 
-#endif /* __BASE64_H__ */
+#endif /* BASE64_H */

data/ext/ox/buf.h

@@ -1,21 +1,21 @@
 /* buf.h
  * Copyright (c) 2014, Peter Ohler
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  *  - Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  *  - Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  *  - Neither the name of Peter Ohler nor the names of its contributors may be
  *    used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,13 +28,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OX_BUF_H__
-#define __OX_BUF_H__
+#ifndef OX_BUF_H
+#define OX_BUF_H
 
 #include <stdbool.h>
 #include <unistd.h>
 
-typedef struct _Buf {
+typedef struct _buf {
     char	*head;
     char	*end;
     char	*tail;
@@ -108,7 +108,7 @@ buf_append_string(Buf buf, const char *s, size_t slen) {
     }
     buf->tail += slen;
 }
-    
+
 inline static void
 buf_append(Buf buf, char c) {
     if (buf->err) {
@@ -157,4 +157,4 @@ buf_finish(Buf buf) {
     }
 }
 
-#endif /* __OX_BUF_H__ */
+#endif /* OX_BUF_H */

data/ext/ox/builder.c

@@ -14,7 +14,7 @@
 
 #define MAX_DEPTH	128
 
-typedef struct _Element {
+typedef struct _element {
     char	*name;
     char	buf[64];
     int		len;
@@ -22,13 +22,13 @@ typedef struct _Element {
     bool	non_text_child;
 } *Element;
 
-typedef struct _Builder {
-    struct _Buf		buf;
+typedef struct _builder {
+    struct _buf		buf;
     int			indent;
     char		encoding[64];
     int			depth;
     FILE		*file;
-    struct _Element	stack[MAX_DEPTH];
+    struct _element	stack[MAX_DEPTH];
     long		line;
     long		col;
     long		pos;
@@ -348,7 +348,7 @@ to_s(Builder b) {
  */
 static VALUE
 builder_new(int argc, VALUE *argv, VALUE self) {
-    Builder	b = ALLOC(struct _Builder);
+    Builder	b = ALLOC(struct _builder);
     int		indent = ox_default_options.indent;
     long	buf_size = 0;
 
@@ -403,7 +403,7 @@ builder_new(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 builder_file(int argc, VALUE *argv, VALUE self) {
-    Builder	b = ALLOC(struct _Builder);
+    Builder	b = ALLOC(struct _builder);
     int		indent = ox_default_options.indent;
     long	buf_size = 0;
     FILE	*f;
@@ -465,7 +465,7 @@ builder_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 builder_io(int argc, VALUE *argv, VALUE self) {
-    Builder		b = ALLOC(struct _Builder);
+    Builder		b = ALLOC(struct _builder);
     int			indent = ox_default_options.indent;
     long		buf_size = 0;
     int			fd;

data/ext/ox/cache.c

@@ -13,13 +13,13 @@
 
 #include "cache.h"
 
-struct _Cache {
+struct _cache {
     /* The key is a length byte followed by the key as a string. If the key is longer than 254 characters then the
        length is 255. The key can be for a premature value and in that case the length byte is greater than the length
        of the key. */
     char                *key;
     VALUE               value;
-    struct _Cache       *slots[16];
+    struct _cache       *slots[16];
 };
 
 static void     slot_print(Cache cache, unsigned int depth);
@@ -36,7 +36,7 @@ static char* form_key(const char *s) {
 
 void
 ox_cache_new(Cache *cache) {
-    *cache = ALLOC(struct _Cache);
+    *cache = ALLOC(struct _cache);
     (*cache)->key = 0;
     (*cache)->value = Qundef;
     memset((*cache)->slots, 0, sizeof((*cache)->slots));
@@ -63,7 +63,7 @@ ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp) {
 	    int	depth = (int)(k - (unsigned char*)key + 1);
 
 	    cache = *cp;
-	    
+
 	    if ('\0' == *(k + 1)) { /* exact match */
 		if (0 == cache->key) { /* nothing in this spot so take it */
 		    cache->key = form_key(key);
@@ -73,7 +73,7 @@ ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp) {
 		} else { /* have to move the current premature key/value deeper */
 		    unsigned char	*ck = (unsigned char*)(cache->key + depth + 1);
                     Cache		orig = *cp;
-		    
+
                     cp = (*cp)->slots + (*ck >> 4);
                     ox_cache_new(cp);
                     cp = (*cp)->slots + (*ck & 0x0F);
@@ -90,7 +90,7 @@ ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp) {
 		    } else {
 			unsigned char	*ck = (unsigned char*)(cache->key + depth + 1);
 			Cache		orig = *cp;
-		    
+
 			cp = (*cp)->slots + (*ck >> 4);
 			ox_cache_new(cp);
 			cp = (*cp)->slots + (*ck & 0x0F);

data/ext/ox/cache.h

@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-#ifndef __OX_CACHE_H__
-#define __OX_CACHE_H__
+#ifndef OX_CACHE_H
+#define OX_CACHE_H
 
 #include "ruby.h"
 
-typedef struct _Cache   *Cache;
+typedef struct _cache   *Cache;
 
 extern void     ox_cache_new(Cache *cache);
 
@@ -16,4 +16,4 @@ extern VALUE    ox_cache_get(Cache cache, const char *key, VALUE **slot, const c
 
 extern void     ox_cache_print(Cache cache);
 
-#endif /* __OX_CACHE_H__ */
+#endif /* OX_CACHE_H */

data/ext/ox/cache8.c

@@ -18,11 +18,11 @@
 #define DEPTH		16
 
 typedef union {
-    struct _Cache8	*child;
+    struct _cache8	*child;
     slot_t		value;
 } Bucket;
 
-struct _Cache8 {
+struct _cache8 {
     Bucket	buckets[SLOT_CNT];
 };
 
@@ -33,8 +33,8 @@ void
 ox_cache8_new(Cache8 *cache) {
     Bucket	*b;
     int		i;
-    
-    *cache = ALLOC(struct _Cache8);
+
+    *cache = ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
 	b->value = 0;
     }
@@ -66,7 +66,7 @@ ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
     int		i;
     sid_t	k8 = (sid_t)key;
     sid_t	k;
-    
+
     for (i = 64 - BITS; 0 < i; i -= BITS) {
 	k = (k8 >> i) & MASK;
 	b = cache->buckets + k;

data/ext/ox/cache8.h

@@ -3,13 +3,13 @@
  * All rights reserved.
  */
 
-#ifndef __OX_CACHE8_H__
-#define __OX_CACHE8_H__
+#ifndef OX_CACHE8_H
+#define OX_CACHE8_H
 
 #include "ruby.h"
 #include "stdint.h"
 
-typedef struct _Cache8	*Cache8;
+typedef struct _cache8	*Cache8;
 typedef uint64_t	slot_t;
 typedef uint64_t	sid_t;
 
@@ -20,4 +20,4 @@ extern slot_t	ox_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
 //extern void	ox_cache8_print(Cache8 cache);
 
-#endif /* __OX_CACHE8_H__ */
+#endif /* OX_CACHE8_H */

data/ext/ox/dump.c

@@ -18,24 +18,24 @@
 
 typedef unsigned long	ulong;
 
-typedef struct _Str {
+typedef struct _str {
     const char	*str;
     size_t	len;
 } *Str;
 
-typedef struct _Element {
-    struct _Str		clas;
-    struct _Str		attr;
+typedef struct _element {
+    struct _str		clas;
+    struct _str		attr;
     unsigned long	id;
     int			indent; /* < 0 indicates no \n */
     int			closed;
     char		type;
 } *Element;
 
-typedef struct _Out {
-    void		(*w_start)(struct _Out *out, Element e);
-    void		(*w_end)(struct _Out *out, Element e);
-    void		(*w_time)(struct _Out *out, VALUE obj);
+typedef struct _out {
+    void		(*w_start)(struct _out *out, Element e);
+    void		(*w_end)(struct _out *out, Element e);
+    void		(*w_time)(struct _out *out, VALUE obj);
     char		*buf;
     char		*end;
     char		*cur;
@@ -235,7 +235,7 @@ check_circular(Out out, VALUE obj, Element e) {
     slot_t	*slot;
     slot_t	id;
     int		result;
-    
+
     if (0 == (id = ox_cache8_get(out->circ_cache, obj, &slot))) {
 	out->circ_cnt++;
 	id = out->circ_cnt;
@@ -256,7 +256,7 @@ static void
 grow(Out out, size_t len) {
     size_t  size = out->end - out->buf;
     long    pos = out->cur - out->buf;
-	
+
     size *= 2;
     if (size <= len * 2 + pos) {
 	size += len;
@@ -297,7 +297,7 @@ dump_start(Out out, Element e) {
 	char		buf[32];
 	char		*end = buf + sizeof(buf) - 1;
 	const char	*s = ulong2str(e->id, end);
-	
+
 	fill_attr(out, 'i', s, end - s);
     }
     if (e->closed) {
@@ -341,7 +341,7 @@ dump_value(Out out, const char *value, size_t size) {
 inline static void
 dump_str_value(Out out, const char *value, size_t size, const char *table) {
     size_t	xsize = xml_str_len((const uchar*)value, size, table);
-    
+
     if (out->end - out->cur <= (long)xsize) {
 	grow(out, xsize);
     }
@@ -591,7 +591,7 @@ dump_first_obj(VALUE obj, Out out) {
 
 static void
 dump_obj(ID aid, VALUE obj, int depth, Out out) {
-    struct _Element	e;
+    struct _element	e;
     VALUE		prev_obj = out->obj;
     char		value_buf[64];
     int			cnt;
@@ -660,7 +660,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 	out->w_start(out, &e);
 	if (0 < cnt) {
 	    unsigned int	od = out->depth;
-	    
+
 	    out->depth = depth + 1;
 	    rb_hash_foreach(obj, dump_hash, (VALUE)out);
 	    out->depth = od;
@@ -938,7 +938,7 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
     case T_BIGNUM:
     {
 	volatile VALUE	rs = rb_big2str(obj, 10);
-	
+
 	e.type = BignumCode;
 	out->w_start(out, &e);
 	dump_value(out, StringValuePtr(rs), RSTRING_LEN(rs));
@@ -1018,7 +1018,7 @@ static int
 dump_hash(VALUE key, VALUE value, Out out) {
     dump_obj(0, key, out->depth, out);
     dump_obj(0, value, out->depth, out);
-    
+
     return ST_CONTINUE;
 }
 
@@ -1069,7 +1069,7 @@ dump_gen_element(VALUE obj, int depth, Out out) {
     long		nlen = RSTRING_LEN(rname);
     size_t		size;
     int			indent;
-    
+
     if (0 > out->indent) {
 	indent = -1;
     } else if (0 == out->indent) {
@@ -1093,7 +1093,7 @@ dump_gen_element(VALUE obj, int depth, Out out) {
     }
     if (Qnil != nodes && 0 < RARRAY_LEN(nodes)) {
 	int	do_indent;
-	
+
 	*out->cur++ = '>';
 	do_indent = dump_gen_nodes(nodes, depth, out);
 	if (out->end - out->cur <= (long)size) {
@@ -1122,7 +1122,7 @@ dump_gen_instruct(VALUE obj, int depth, Out out) {
     long		nlen = RSTRING_LEN(rname);
     long		clen = 0;
     size_t		size;
-    
+
     if (T_STRING == rb_type(rcontent)) {
 	content = StringValuePtr(rcontent);
 	clen = RSTRING_LEN(rcontent);
@@ -1150,7 +1150,7 @@ static int
 dump_gen_nodes(VALUE obj, int depth, Out out) {
     long	cnt = RARRAY_LEN(obj);
     int		indent_needed = 1;
-    
+
     if (0 < cnt) {
 	const VALUE	*np = RARRAY_PTR(obj);
 	VALUE		clas;
@@ -1176,7 +1176,7 @@ dump_gen_nodes(VALUE obj, int depth, Out out) {
 	    } else if (ox_cdata_clas == clas) {
 		dump_gen_val_node(*np, d2, "<![CDATA[", 9, "]]>", 3, out);
 	    } else if (ox_doctype_clas == clas) {
-		dump_gen_val_node(*np, d2, "<!DOCTYPE ", 10, " >", 2, out);
+		dump_gen_val_node(*np, d2, "<!DOCTYPE ", 10, ">", 1, out);
 	    } else {
 		rb_raise(rb_eTypeError, "Unexpected class, %s, while dumping generic XML\n", rb_class2name(clas));
 	    }
@@ -1295,17 +1295,17 @@ dump_obj_to_xml(VALUE obj, Options copts, Out out) {
 
 char*
 ox_write_obj_to_str(VALUE obj, Options copts) {
-    struct _Out out;
-    
+    struct _out out;
+
     dump_obj_to_xml(obj, copts, &out);
     return out.buf;
 }
 
 void
 ox_write_obj_to_file(VALUE obj, const char *path, Options copts) {
-    struct _Out out;
+    struct _out out;
     size_t	size;
-    FILE	*f;    
+    FILE	*f;
 
     dump_obj_to_xml(obj, copts, &out);
     size = out.cur - out.buf;