Merge tag 'v0.18.0' into mt

0.18.0

Author: gagern

.travis.yml

@@ -10,7 +10,7 @@ node_js:
     - iojs-2
     - iojs-3
     - 4
-    - 5
+    - 6
 
 addons:
     apt:

Makefile

@@ -1,5 +1,5 @@
 
-target=./build/Release/libxmljs.node
+target=./build/Release/xmljs.node
 
 all: $(target)
 

README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://secure.travis-ci.org/gagern/libxmljs.svg?branch=master)](http://travis-ci.org/gagern/libxmljs)
 
 This project is a fork of [libxmljs](https://github.com/libxmljs/libxmljs).
-The current version 0.17.2 is based on libxmljs 0.17.1 and libxml 2.9.4.
+The current version 0.18.0 is based on libxmljs 0.18.0 and libxml 2.9.4.
 
 Libxmljs was originally designed with single-threaded operations in mind.
 There are no asynchroneous operations for things like parsing XML documents.

package.json

@@ -7,7 +7,7 @@
     "Martin von Gagern <[email protected]>"
   ],
   "description": "multi-threaded libxml bindings for v8 javascript engine",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "scripts": {
     "test": "node --expose_gc node_modules/nodeunit/bin/nodeunit test"
   },
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "bindings": "^1.2.1",
-    "nan": "^2.0.7"
+    "nan": "^2.3.2"
   },
   "devDependencies": {
     "nodeunit": "^0.9.0"

src/xml_document.cc

@@ -235,7 +235,7 @@ NAN_METHOD(XmlDocument::ToString)
     if (xmlBufferLength(buf) > 0)
         ret = Nan::New<v8::String>((char*)xmlBufferContent(buf), xmlBufferLength(buf)).ToLocalChecked();
     xmlBufferFree(buf);
-    
+
     return info.GetReturnValue().Set(ret);
 }
 
@@ -317,7 +317,7 @@ xmlParserOption getParserOptions(v8::Local<v8::Object> props) {
     ret |= getParserOption(props, "cdata", XML_PARSE_NOCDATA, false);       // 16384: merge CDATA as text nodes
 
     ret |= getParserOption(props, "noxincnode", XML_PARSE_NOXINCNODE);      // 32768: do not generate XINCLUDE START/END nodes
-    ret |= getParserOption(props, "xinclude", XML_PARSE_NOXINCNODE, false); // 32768: do not generate XINCLUDE START/END nodes
+    ret |= getParserOption(props, "xincnode", XML_PARSE_NOXINCNODE, false); // 32768: do not generate XINCLUDE START/END nodes
 
     ret |= getParserOption(props, "compact", XML_PARSE_COMPACT);            // 65536: compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
     /*ret |= getParserOption(props, "compact", HTML_PARSE_COMPACT , false);   // 65536: compact small text nodes*/
@@ -400,24 +400,49 @@ NAN_METHOD(XmlDocument::FromHtml)
     return info.GetReturnValue().Set(doc_handle);
 }
 
+// FIXME: this method is almost identical to FromHtml above.
+// The two should be refactored to use a common function for most
+// of the work
 NAN_METHOD(XmlDocument::FromXml)
 {
     Nan::HandleScope scope;
     XmlSyntaxErrorsSync errors; // RAII sentinel
 
-    xmlParserOption opts = getParserOptions(info[1]->ToObject());
+    v8::Local<v8::Object> options = info[1]->ToObject();
+    v8::Local<v8::Value>  baseUrlOpt  = options->Get(
+        Nan::New<v8::String>("baseUrl").ToLocalChecked());
+    v8::Local<v8::Value>  encodingOpt = options->Get(
+        Nan::New<v8::String>("encoding").ToLocalChecked());
+    v8::Local<v8::Value> excludeImpliedElementsOpt = options->Get(
+        Nan::New<v8::String>("excludeImpliedElements").ToLocalChecked());
+
+    // the base URL that will be used for this document
+    v8::String::Utf8Value baseUrl_(baseUrlOpt->ToString());
+    const char * baseUrl = *baseUrl_;
+    if (!baseUrlOpt->IsString()) {
+        baseUrl = NULL;
+    }
+
+    // the encoding to be used for this document
+    // (leave NULL for libxml to autodetect)
+    v8::String::Utf8Value encoding_(encodingOpt->ToString());
+    const char * encoding = *encoding_;
+    if (!encodingOpt->IsString()) {
+        encoding = NULL;
+    }
 
+    int opts = (int) getParserOptions(options);
     xmlDocPtr doc;
     if (!node::Buffer::HasInstance(info[0])) {
       // Parse a string
       v8::String::Utf8Value str(info[0]->ToString());
-      doc = xmlReadMemory(*str, str.length(), NULL, "UTF-8", opts);
+      doc = xmlReadMemory(*str, str.length(), baseUrl, "UTF-8", opts);
     }
     else {
       // Parse a buffer
       v8::Local<v8::Object> buf = info[0]->ToObject();
       doc = xmlReadMemory(node::Buffer::Data(buf), node::Buffer::Length(buf),
-                          NULL, NULL, opts);
+                          baseUrl, encoding, opts);
     }
 
     if (!doc) {

test/fixtures/baseurl.dtd

@@ -0,0 +1,3 @@
+<!ELEMENT example EMPTY>
+<!ATTLIST example msg CDATA "IMPLIED">
+<!ENTITY happy "Happy gardens forever!">

test/xml_parser.js

@@ -55,6 +55,31 @@ module.exports.recoverable_parse = function(assert) {
     assert.done();
 };
 
+module.exports.baseurl_xml = function(assert) {
+    var str = '<!DOCTYPE example SYSTEM "baseurl.dtd">\n' +
+      '<example msg="&happy;"/>\n';
+
+    // First verify it fails when we don't give baseUrl
+    var doc = libxml.Document.fromXml(str, {
+      dtdvalid: true,
+      nonet: true,
+    });
+    assert.ok(doc.errors.length > 0);
+
+    // Now it should work
+    var doc = libxml.Document.fromXml(str, {
+      dtdvalid: true,
+      nonet: true,
+      baseUrl: __dirname + '/fixtures/example.xml',
+    });
+    assert.ok(!doc.errors || doc.errors.length == 0);
+
+    assert.done();
+};
+
+
+
+
 module.exports.fatal_error = function(assert) {
     var filename = __dirname + '/fixtures/errors/comment.xml';
     var str = fs.readFileSync(filename, 'utf8');