libxml-ruby 2.7.0 → 2.9.0

data/ext/libxml/ruby_xml_writer.c

@@ -34,6 +34,7 @@ typedef struct {
     xmlBufferPtr buffer;
     xmlTextWriterPtr writer;
     rxmlw_output_type output_type;
+    int closed;
 } rxml_writer_object;
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -72,6 +73,8 @@ static void rxml_writer_free(rxml_writer_object *rwo)
         xmlBufferFree(rwo->buffer);
     }
 #endif
+
+    rwo->closed = 1;
     xmlFreeTextWriter(rwo->writer);
     xfree(rwo);
 }
@@ -97,6 +100,17 @@ static rxml_writer_object *rxml_textwriter_get(VALUE obj)
     return rwo;
 }
 
+int rxml_writer_write_callback(void *context, const char *buffer, int len)
+{
+  rxml_writer_object *rwo = context;
+
+  if(rwo->closed){
+    return 0;
+  }else{
+    return rxml_write_callback((void *)rwo->output, buffer, len);
+  }
+}
+
 /* ===== public class methods ===== */
 
 /* call-seq:
@@ -122,11 +136,12 @@ xmlCharEncodingHandlerPtr xmlFindCharEncodingHandler(const char * name);
     rwo = ALLOC(rxml_writer_object);
     rwo->output = io;
     rwo->buffer = NULL;
+    rwo->closed = 0;
 #ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
 #endif /* HAVE_RUBY_ENCODING_H */
     rwo->output_type = RXMLW_OUTPUT_IO;
-    if (NULL == (out = xmlOutputBufferCreateIO(rxml_write_callback, NULL, (void *) io, NULL))) {
+    if (NULL == (out = xmlOutputBufferCreateIO(rxml_writer_write_callback, NULL, (void *) rwo, NULL))) {
         rxml_raise(&xmlLastError);
     }
     if (NULL == (rwo->writer = xmlNewTextWriter(out))) {
@@ -150,6 +165,7 @@ static VALUE rxml_writer_file(VALUE klass, VALUE filename)
     rwo = ALLOC(rxml_writer_object);
     rwo->output = Qnil;
     rwo->buffer = NULL;
+    rwo->closed = 0;
 #ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
 #endif /* HAVE_RUBY_ENCODING_H */
@@ -172,6 +188,7 @@ static VALUE rxml_writer_string(VALUE klass)
 
     rwo = ALLOC(rxml_writer_object);
     rwo->output = Qnil;
+    rwo->closed = 0;
 #ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
 #endif /* HAVE_RUBY_ENCODING_H */
@@ -200,6 +217,7 @@ static VALUE rxml_writer_doc(VALUE klass)
     rwo = ALLOC(rxml_writer_object);
     rwo->buffer = NULL;
     rwo->output = Qnil;
+    rwo->closed = 0;
 #ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = NULL;
 #endif /* HAVE_RUBY_ENCODING_H */
@@ -234,11 +252,12 @@ static VALUE rxml_writer_flush(int argc, VALUE *argv, VALUE self)
     if (-1 == (ret = xmlTextWriterFlush(rwo->writer))) {
         rxml_raise(&xmlLastError);
     }
+
     if (NULL != rwo->buffer) {
         VALUE content;
 
 #ifdef HAVE_RUBY_ENCODING_H
-        content = rb_external_str_new_with_enc(rwo->buffer->content, rwo->buffer->use, rwo->encoding);
+        content = rb_external_str_new_with_enc((const char*)rwo->buffer->content, rwo->buffer->use, rwo->encoding);
 #else
         content = rb_str_new(rwo->buffer->content, rwo->buffer->use);
 #endif /* HAVE_RUBY_ENCODING_H */
@@ -261,20 +280,20 @@ static VALUE rxml_writer_flush(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rxml_writer_result(VALUE self)
 {
-    VALUE ret;
-    rxml_writer_object *rwo;
+    VALUE ret = Qnil;
+    rxml_writer_object *rwo = rxml_textwriter_get(self);
+    int bytesWritten = xmlTextWriterFlush(rwo->writer);
 
-    ret = Qnil;
-    rwo = rxml_textwriter_get(self);
-    if (-1 == (ret = xmlTextWriterFlush(rwo->writer))) {
+    if (bytesWritten == -1) {
         rxml_raise(&xmlLastError);
     }
+
     switch (rwo->output_type) {
         case RXMLW_OUTPUT_DOC:
             ret = rwo->output;
             break;
         case RXMLW_OUTPUT_STRING:
-            ret = rxml_writer_c_to_ruby_string(rwo->buffer->content, rwo->buffer->use);
+            ret = rxml_writer_c_to_ruby_string((const char*)rwo->buffer->content, rwo->buffer->use);
             break;
         case RXMLW_OUTPUT_IO:
         case RXMLW_OUTPUT_NONE:
@@ -315,7 +334,8 @@ static VALUE numeric_rxml_writer_void(VALUE obj, int (*fn)(xmlTextWriterPtr))
 static VALUE numeric_rxml_writer_va_strings(VALUE obj, VALUE pe, size_t strings_count, int (*fn)(ANYARGS), ...)
 {
     va_list ap;
-    int argc, ret;
+    size_t argc;
+	int ret = -1;
     rxml_writer_object *rwo;
     const xmlChar *argv[XMLWRITER_MAX_STRING_ARGS];
     VALUE utf8[XMLWRITER_MAX_STRING_ARGS], orig[XMLWRITER_MAX_STRING_ARGS];
@@ -323,7 +343,6 @@ static VALUE numeric_rxml_writer_va_strings(VALUE obj, VALUE pe, size_t strings_
     if (strings_count > XMLWRITER_MAX_STRING_ARGS) {
         rb_bug("more arguments than expected");
     }
-    ret = -1;
     va_start(ap, fn);
     rwo = rxml_textwriter_get(obj);
     for (argc = 0; argc < strings_count; argc++) {
@@ -746,12 +765,11 @@ static VALUE rxml_writer_end_cdata(VALUE self)
 static VALUE rxml_writer_start_document(int argc, VALUE *argv, VALUE self)
 {
     int ret;
-    VALUE options;
+    VALUE options = Qnil;
     rxml_writer_object *rwo;
-    const char *xencoding, *xstandalone;
+    const xmlChar *xencoding = NULL;
+    const char *xstandalone = NULL;
 
-    options = Qnil;
-    xstandalone = xencoding = NULL;
     rb_scan_args(argc, argv, "01", &options);
     if (!NIL_P(options)) {
         VALUE encoding, standalone;
@@ -759,7 +777,7 @@ static VALUE rxml_writer_start_document(int argc, VALUE *argv, VALUE self)
         encoding = standalone = Qnil;
         Check_Type(options, T_HASH);
         encoding = rb_hash_aref(options, sEncoding);
-        xencoding = NIL_P(encoding) ? NULL : xmlGetCharEncodingName(NUM2INT(encoding));
+        xencoding = NIL_P(encoding) ? NULL : (const xmlChar*)xmlGetCharEncodingName(NUM2INT(encoding));
         standalone = rb_hash_aref(options, sStandalone);
         if (NIL_P(standalone)) {
             xstandalone = NULL;
@@ -771,7 +789,7 @@ static VALUE rxml_writer_start_document(int argc, VALUE *argv, VALUE self)
 #ifdef HAVE_RUBY_ENCODING_H
     rwo->encoding = rxml_figure_encoding(xencoding);
 #endif /* !HAVE_RUBY_ENCODING_H */
-    ret = xmlTextWriterStartDocument(rwo->writer, NULL, xencoding, xstandalone);
+    ret = xmlTextWriterStartDocument(rwo->writer, NULL, (const char*)xencoding, xstandalone);
 
     return (-1 == ret ? Qfalse : Qtrue);
 }

data/ext/libxml/ruby_xml_xpath.c

@@ -1,187 +1,188 @@
-/*
- * Document-class: LibXML::XML::XPath
- *
- * The XML::XPath module is used to query XML documents. It is
- * usually accessed via the XML::Document#find or
- * XML::Node#find methods.  For example:
- *
- *  document.find('/foo', namespaces) -> XML::XPath::Object
- *
- * The optional namespaces parameter can be a string, array or
- * hash table.
- *
- *   document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
- *   document.find('/foo', ['xlink:http://www.w3.org/1999/xlink',
- *                          'xi:http://www.w3.org/2001/XInclude')
- *   document.find('/foo', 'xlink' => 'http://www.w3.org/1999/xlink',
- *                             'xi' => 'http://www.w3.org/2001/XInclude')
- *
- *
- * === Working With Default Namespaces
- *
- * Finding namespaced elements and attributes can be tricky.
- * Lets work through an example of a document with a default
- * namespace:
- *
- *  <?xml version="1.0" encoding="utf-8"?>
- *  <feed xmlns="http://www.w3.org/2005/Atom">
- *    <title type="text">Phil Bogle's Contacts</title>
- *  </feed>
- *
- * To find nodes you must define the atom namespace for
- * libxml.  One way to do this is:
- *
- *   node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
- *
- * Alternatively, you can register the default namespace like this:
- *
- *   doc.root.namespaces.default_prefix = 'atom'
- *   node = doc.find('atom:title')
- *
- * === More Complex Namespace Examples
- *
- * Lets work through some more complex examples using the
- * following xml document:
- *
- *  <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- *    <soap:Body>
- *      <getManufacturerNamesResponse xmlns="http://services.somewhere.com">
- *        <IDAndNameList xmlns="http://services.somewhere.com">
- *          <ns1:IdAndName xmlns:ns1="http://domain.somewhere.com"/>
- *        </IDAndNameList>
- *      </getManufacturerNamesResponse>
- *  </soap:Envelope>
- *
- *  # Since the soap namespace is defined on the root
- *  # node we can directly use it.
- *  doc.find('/soap:Envelope')
- *
- *  # Since the ns1 namespace is not defined on the root node
- *  # we have to first register it with the xpath engine.
- *  doc.find('//ns1:IdAndName',
- *           'ns1:http://domain.somewhere.com')
- *
- *  # Since the getManufacturerNamesResponse element uses a default
- *  # namespace we first have to give it a prefix and register
- *  # it with the xpath engine.
- *  doc.find('//ns:getManufacturerNamesResponse',
- *            'ns:http://services.somewhere.com')
- *
- *  # Here is an example showing a complex namespace aware
- *  # xpath expression.
- *  doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName',
- *  ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
-*/
-
-
-#include "ruby_libxml.h"
-
-VALUE mXPath;
-
-VALUE
-rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject) {
-  VALUE result;
-  int type;
-
-  if (xobject == NULL) {
-    /* xmlLastError is different than xctxt->lastError.  Use
-     xmlLastError since it has the message set while xctxt->lastError
-     does not. */
-    xmlErrorPtr xerror = xmlGetLastError();
-    rxml_raise(xerror);
-  }
-
-  switch (type = xobject->type) {
-    case XPATH_NODESET:
-      result = rxml_xpath_object_wrap(xctxt->doc, xobject);
-      break;
-    case XPATH_BOOLEAN:
-      result = (xobject->boolval != 0) ? Qtrue : Qfalse;
-      xmlXPathFreeObject(xobject);
-      break;
-    case XPATH_NUMBER:
-      result = rb_float_new(xobject->floatval);
-      xmlXPathFreeObject(xobject);
-      break;
-    case XPATH_STRING:
-      result = rxml_new_cstr((const char*)xobject->stringval, xctxt->doc->encoding);
-      xmlXPathFreeObject(xobject);
-      break;
-    default:
-      xmlXPathFreeObject(xobject);
-      rb_raise(rb_eTypeError,
-        "can't convert XPath object of type %d to Ruby value", type
-      );
-  }
-
-  return result;
-}
-
-xmlXPathObjectPtr
-rxml_xpath_from_value(VALUE value) {
-  xmlXPathObjectPtr result = NULL;
-
-  switch (TYPE(value)) {
-    case T_TRUE:
-    case T_FALSE:
-      result = xmlXPathNewBoolean(RTEST(value));
-      break;
-    case T_FIXNUM:
-    case T_FLOAT:
-      result = xmlXPathNewFloat(NUM2DBL(value));
-      break;
-    case T_STRING:
-      result = xmlXPathWrapString(xmlStrdup((const xmlChar *)StringValuePtr(value)));
-      break;
-    case T_NIL:
-      result = xmlXPathNewNodeSet(NULL);
-      break;
-    case T_ARRAY: {
-      int i, j;
-      result = xmlXPathNewNodeSet(NULL);
-
-      for (i = RARRAY_LEN(value); i > 0; i--) {
-        xmlXPathObjectPtr obj = rxml_xpath_from_value(rb_ary_shift(value));
-
-        if ((obj->nodesetval != NULL) && (obj->nodesetval->nodeNr != 0)) {
-          for (j = 0; j < obj->nodesetval->nodeNr; j++) {
-            xmlXPathNodeSetAdd(result->nodesetval, obj->nodesetval->nodeTab[j]);
-          }
-        }
-      }
-      break;
-    }
-    default:
-      rb_raise(rb_eTypeError,
-        "can't convert object of type %s to XPath object", rb_obj_classname(value)
-      );
-  }
-
-  return result;
-}
-
-void rxml_init_xpath(void)
-{
-  mXPath = rb_define_module_under(mXML, "XPath");
-
-  /* 0: Undefined value. */
-  rb_define_const(mXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
-  /* 1: A nodeset, will be wrapped by XPath Object. */
-  rb_define_const(mXPath, "NODESET", INT2NUM(XPATH_NODESET));
-  /* 2: A boolean value. */
-  rb_define_const(mXPath, "BOOLEAN", INT2NUM(XPATH_BOOLEAN));
-  /* 3: A numeric value. */
-  rb_define_const(mXPath, "NUMBER", INT2NUM(XPATH_NUMBER));
-  /* 4: A string value. */
-  rb_define_const(mXPath, "STRING", INT2NUM(XPATH_STRING));
-  /* 5: An xpointer point */
-  rb_define_const(mXPath, "POINT", INT2NUM(XPATH_POINT));
-  /* 6: An xpointer range */
-  rb_define_const(mXPath, "RANGE", INT2NUM(XPATH_RANGE));
-  /* 7: An xpointer location set */
-  rb_define_const(mXPath, "LOCATIONSET", INT2NUM(XPATH_LOCATIONSET));
-  /* 8: XPath user type */
-  rb_define_const(mXPath, "USERS", INT2NUM(XPATH_USERS));
-  /* 9: An XSLT value tree, non modifiable */
-  rb_define_const(mXPath, "XSLT_TREE", INT2NUM(XPATH_XSLT_TREE));
-}
+/*
+ * Document-class: LibXML::XML::XPath
+ *
+ * The XML::XPath module is used to query XML documents. It is
+ * usually accessed via the XML::Document#find or
+ * XML::Node#find methods.  For example:
+ *
+ *  document.find('/foo', namespaces) -> XML::XPath::Object
+ *
+ * The optional namespaces parameter can be a string, array or
+ * hash table.
+ *
+ *   document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
+ *   document.find('/foo', ['xlink:http://www.w3.org/1999/xlink',
+ *                          'xi:http://www.w3.org/2001/XInclude')
+ *   document.find('/foo', 'xlink' => 'http://www.w3.org/1999/xlink',
+ *                             'xi' => 'http://www.w3.org/2001/XInclude')
+ *
+ *
+ * === Working With Default Namespaces
+ *
+ * Finding namespaced elements and attributes can be tricky.
+ * Lets work through an example of a document with a default
+ * namespace:
+ *
+ *  <?xml version="1.0" encoding="utf-8"?>
+ *  <feed xmlns="http://www.w3.org/2005/Atom">
+ *    <title type="text">Phil Bogle's Contacts</title>
+ *  </feed>
+ *
+ * To find nodes you must define the atom namespace for
+ * libxml.  One way to do this is:
+ *
+ *   node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
+ *
+ * Alternatively, you can register the default namespace like this:
+ *
+ *   doc.root.namespaces.default_prefix = 'atom'
+ *   node = doc.find('atom:title')
+ *
+ * === More Complex Namespace Examples
+ *
+ * Lets work through some more complex examples using the
+ * following xml document:
+ *
+ *  <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ *    <soap:Body>
+ *      <getManufacturerNamesResponse xmlns="http://services.somewhere.com">
+ *        <IDAndNameList xmlns="http://services.somewhere.com">
+ *          <ns1:IdAndName xmlns:ns1="http://domain.somewhere.com"/>
+ *        </IDAndNameList>
+ *      </getManufacturerNamesResponse>
+ *    </soap:Body>
+ *  </soap:Envelope>
+ *
+ *  # Since the soap namespace is defined on the root
+ *  # node we can directly use it.
+ *  doc.find('/soap:Envelope')
+ *
+ *  # Since the ns1 namespace is not defined on the root node
+ *  # we have to first register it with the xpath engine.
+ *  doc.find('//ns1:IdAndName',
+ *           'ns1:http://domain.somewhere.com')
+ *
+ *  # Since the getManufacturerNamesResponse element uses a default
+ *  # namespace we first have to give it a prefix and register
+ *  # it with the xpath engine.
+ *  doc.find('//ns:getManufacturerNamesResponse',
+ *            'ns:http://services.somewhere.com')
+ *
+ *  # Here is an example showing a complex namespace aware
+ *  # xpath expression.
+ *  doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName',
+ *  ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
+*/
+
+
+#include "ruby_libxml.h"
+
+VALUE mXPath;
+
+VALUE
+rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject) {
+  VALUE result;
+  int type;
+
+  if (xobject == NULL) {
+    /* xmlLastError is different than xctxt->lastError.  Use
+     xmlLastError since it has the message set while xctxt->lastError
+     does not. */
+    xmlErrorPtr xerror = xmlGetLastError();
+    rxml_raise(xerror);
+  }
+
+  switch (type = xobject->type) {
+    case XPATH_NODESET:
+      result = rxml_xpath_object_wrap(xctxt->doc, xobject);
+      break;
+    case XPATH_BOOLEAN:
+      result = (xobject->boolval != 0) ? Qtrue : Qfalse;
+      xmlXPathFreeObject(xobject);
+      break;
+    case XPATH_NUMBER:
+      result = rb_float_new(xobject->floatval);
+      xmlXPathFreeObject(xobject);
+      break;
+    case XPATH_STRING:
+      result = rxml_new_cstr(xobject->stringval, xctxt->doc->encoding);
+      xmlXPathFreeObject(xobject);
+      break;
+    default:
+      xmlXPathFreeObject(xobject);
+      rb_raise(rb_eTypeError,
+        "can't convert XPath object of type %d to Ruby value", type
+      );
+  }
+
+  return result;
+}
+
+xmlXPathObjectPtr
+rxml_xpath_from_value(VALUE value) {
+  xmlXPathObjectPtr result = NULL;
+
+  switch (TYPE(value)) {
+    case T_TRUE:
+    case T_FALSE:
+      result = xmlXPathNewBoolean(RTEST(value));
+      break;
+    case T_FIXNUM:
+    case T_FLOAT:
+      result = xmlXPathNewFloat(NUM2DBL(value));
+      break;
+    case T_STRING:
+      result = xmlXPathWrapString(xmlStrdup((const xmlChar *)StringValuePtr(value)));
+      break;
+    case T_NIL:
+      result = xmlXPathNewNodeSet(NULL);
+      break;
+    case T_ARRAY: {
+      long i, j;
+      result = xmlXPathNewNodeSet(NULL);
+
+      for (i = RARRAY_LEN(value); i > 0; i--) {
+        xmlXPathObjectPtr obj = rxml_xpath_from_value(rb_ary_shift(value));
+
+        if ((obj->nodesetval != NULL) && (obj->nodesetval->nodeNr != 0)) {
+          for (j = 0; j < obj->nodesetval->nodeNr; j++) {
+            xmlXPathNodeSetAdd(result->nodesetval, obj->nodesetval->nodeTab[j]);
+          }
+        }
+      }
+      break;
+    }
+    default:
+      rb_raise(rb_eTypeError,
+        "can't convert object of type %s to XPath object", rb_obj_classname(value)
+      );
+  }
+
+  return result;
+}
+
+void rxml_init_xpath(void)
+{
+  mXPath = rb_define_module_under(mXML, "XPath");
+
+  /* 0: Undefined value. */
+  rb_define_const(mXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
+  /* 1: A nodeset, will be wrapped by XPath Object. */
+  rb_define_const(mXPath, "NODESET", INT2NUM(XPATH_NODESET));
+  /* 2: A boolean value. */
+  rb_define_const(mXPath, "BOOLEAN", INT2NUM(XPATH_BOOLEAN));
+  /* 3: A numeric value. */
+  rb_define_const(mXPath, "NUMBER", INT2NUM(XPATH_NUMBER));
+  /* 4: A string value. */
+  rb_define_const(mXPath, "STRING", INT2NUM(XPATH_STRING));
+  /* 5: An xpointer point */
+  rb_define_const(mXPath, "POINT", INT2NUM(XPATH_POINT));
+  /* 6: An xpointer range */
+  rb_define_const(mXPath, "RANGE", INT2NUM(XPATH_RANGE));
+  /* 7: An xpointer location set */
+  rb_define_const(mXPath, "LOCATIONSET", INT2NUM(XPATH_LOCATIONSET));
+  /* 8: XPath user type */
+  rb_define_const(mXPath, "USERS", INT2NUM(XPATH_USERS));
+  /* 9: An XSLT value tree, non modifiable */
+  rb_define_const(mXPath, "XSLT_TREE", INT2NUM(XPATH_XSLT_TREE));
+}