ox 2.8.4 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2692a3ee9c693345cc57103c76621a299bfeab9cab5900f88c5b5f132b04fb1e
-  data.tar.gz: 17152570c95b478910eb791d85a68c70919a877a2ec84fc0c3a4d27ef02ada43
+  metadata.gz: 693a38e51ce73f6ba1d09252209e4591cad455a42cf60a1f883fd7bd20bf06bc
+  data.tar.gz: 97f767135d353480b0c56273c6f1b5829dd9960c8d0930739643a2a0b8182dc2
 SHA512:
-  metadata.gz: a52d48cf7884d97343ed5fb1a2be404b430b530dca159237acd410b58bd13bf55d5d7fe57032103d2dcd573a15d523874d57235002f6a26ebad0f68393c05e57
-  data.tar.gz: ae87c98eff8381aecd6dcf5d98a8c548b16495df184e38fef2d6683cd1f2d09fe09babce7f2806fea490670984c4c362796b7bd07dfeb311c2af791418b0416d
+  metadata.gz: a5cefe49cf18bc5bd7eaf3a921417f916b2cd5b900189a844e2a31788b97c625f5e2f704096225445622042b1bc157856fd3a2b51db6f868d3de49e16537cb4b
+  data.tar.gz: 9ca097653ef960651953d3b6c8926f30a3769ee9615ecc6fcbf1721b0097604524ed2ed3cce6656eb40eda9518a64247fdadb455b0d5388fd349a49cab812718

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+## 2.9.0 - March 13, 2018
+
+  - New builder methods for building HTML.
+
+  - Examples added.
+
 ## 2.8.4 - March 4, 2018
 
   - Commented out debuf statement.

data/ext/ox/builder.c

@@ -590,7 +590,7 @@ builder_instruct(int argc, VALUE *argv, VALUE self) {
 /* call-seq: element(name,attributes)
  *
  * Adds an element with the name and attributes provided. If a block is given
- * then on closing of the block a pop() done at the close of the block.
+ * then on closing of the block a pop() is called.
  *
  * - +name+ - (String) name of the element
  * - +attributes+ - (Hash) of the element
@@ -640,7 +640,7 @@ builder_element(int argc, VALUE *argv, VALUE self) {
     b->col++;
     b->pos++;
     append_string(b, e->name, len, xml_element_chars, false);
-    if (1 < argc) {
+    if (1 < argc && T_HASH == rb_type(argv[1])) {
 	rb_hash_foreach(argv[1], append_attr, (VALUE)b);
     }
     // Do not close with > or /> yet. That is done with i_am_a_child() or pop().
@@ -651,6 +651,51 @@ builder_element(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
+/* call-seq: void_element(name,attributes)
+ *
+ * Adds an void element with the name and attributes provided.
+ *
+ * - +name+ - (String) name of the element
+ * - +attributes+ - (Hash) of the element
+ */
+static VALUE
+builder_void_element(int argc, VALUE *argv, VALUE self) {
+    Builder	b = (Builder)DATA_PTR(self);
+    const char	*name;
+    int		len;
+
+    if (1 > argc) {
+	rb_raise(ox_arg_error_class, "missing element name");
+    }
+    i_am_a_child(b, false);
+    append_indent(b);
+    switch (rb_type(*argv)) {
+    case T_STRING:
+	name = StringValuePtr(*argv);
+	len = RSTRING_LEN(*argv);
+	break;
+    case T_SYMBOL:
+	name = rb_id2name(SYM2ID(*argv));
+	len = strlen(name);
+	break;
+    default:
+	rb_raise(ox_arg_error_class, "expected a Symbol or String for an element name");
+	break;
+    }
+    buf_append(&b->buf, '<');
+    b->col++;
+    b->pos++;
+    append_string(b, name, len, xml_element_chars, false);
+    if (1 < argc && T_HASH == rb_type(argv[1])) {
+	rb_hash_foreach(argv[1], append_attr, (VALUE)b);
+    }
+    buf_append_string(&b->buf, ">", 1);
+    b->col++;;
+    b->pos++;
+
+    return Qnil;
+}
+
 /* call-seq: comment(text)
  *
  * Adds a comment element to the XML string being formed.
@@ -663,11 +708,11 @@ builder_comment(VALUE self, VALUE text) {
     rb_check_type(text, T_STRING);
     i_am_a_child(b, false);
     append_indent(b);
-    buf_append_string(&b->buf, "<!-- ", 5);
+    buf_append_string(&b->buf, "<!--", 4);
     b->col += 5;
     b->pos += 5;
     append_string(b, StringValuePtr(text), RSTRING_LEN(text), xml_element_chars, false);
-    buf_append_string(&b->buf, " --/> ", 5);
+    buf_append_string(&b->buf, "-->", 3);
     b->col += 5;
     b->pos += 5;
 
@@ -879,6 +924,7 @@ void ox_init_builder(VALUE ox) {
     rb_define_method(builder_class, "comment", builder_comment, 1);
     rb_define_method(builder_class, "doctype", builder_doctype, 1);
     rb_define_method(builder_class, "element", builder_element, -1);
+    rb_define_method(builder_class, "void_element", builder_void_element, -1);
     rb_define_method(builder_class, "text", builder_text, -1);
     rb_define_method(builder_class, "cdata", builder_cdata, 1);
     rb_define_method(builder_class, "raw", builder_raw, 1);

data/lib/ox/version.rb

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

metadata

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

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__ */