Merge tag 'v0.18.7' into mt

Switched Travis and AppVeyor releases over to my own release tokens.

Author: gagern

.travis.yml

@@ -1,26 +1,47 @@
 language: node_js
-
 env:
-    - CXX=g++-4.8
-
+- CXX=g++-4.8
+os:
+- linux
+- osx
 node_js:
-    - "0.10"
-    - "0.12"
-    - iojs-1
-    - iojs-2
-    - iojs-3
-    - 4
-    - 6
-
+- '0.10'
+- '0.12'
+- 4
+- 6
+- 7
+- 8
 addons:
-    apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - g++-4.8
-
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
 sudo: false
-
 before_install:
-    - $CXX --version
-    - case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm install -g npm@2 ;; esac
+- if [[ $TRAVIS_OS_NAME == "osx" ]]; then export CXX=clang; fi
+- $CXX --version
+
+- PUBLISH_BINARY=false
+- echo $TRAVIS_BRANCH
+- echo `git describe --tags --always HEAD`
+
+- case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm install -g npm@2 ;; esac
+- npm config set progress false
+- npm config set spin false
+- npm install -g node-gyp node-pre-gyp
+install:
+- npm install --build-from-source
+before_deploy:
+- node-pre-gyp package 2>&1
+deploy:
+  provider: releases
+  api_key:
+    secure: QJAG0W3SQBcP/rQpDgqeKXR4hccspyNe1GGyRVO8TlxEBCn6+UcfqMQbgqnpwtNBce/3D1CwyRrkl+zigvN6aoU7T4YjNcHqxx0Srmqvf146+HFMrl9eAXWt8U8xQT0aoPUrTNQybSqF27IvecePOEQ3KmwpwI/IXGUFA7JxEis++nznFRCSq74nq6HPJ8Ht3Ek7zx/kEn4puPcDlXFDm3k0YmX8A1hPQ3qfNRuIpsBrSomnbPZQbIB+/+egs5pHxbQkaihTLULuVrt5A0Dd5Zh6fs8fqTywKCacAhRvbrbNzGDlLc/FVR9VR0/ucV7bp28S3DILFhx5oJeBAkev92wbD+TLg9a2fxU1yMTjdyVuH7lJcy8AhjeokngyYj4L6Dbw92HdCxxj9UqaE6/T8Z51NbJBgJqZpfGoX8D48ynROYhXmL3TSdp7b5XDx9525czf7eiyG1HthnLppwo5qwkvaqI/J4lqljxHDQGxVvjwoQuJ3Hg/YVC6ASmyJCu0ulJfRAIaqQ35xx1Pfwdk2ZGxQ0pFHjWd4jJBkK9B2TM+kB9ObODaSLn9a3ncP4HlcNbVRwRw5BX5hLsVLE3MVhlLgBVm3bbvoY7233GkiykLOY/qXyqn15O/Zn9y1RoLTzyfhkJclbwXZ0PSpQ7YhD5LmvSJnwZtOTl3wYbxX/s=
+  file: build/stage/libxmljs/libxmljs/releases/download/**/*.tar.gz
+  file_glob: true
+  skip_cleanup: true
+  on:
+    repo: gagern/libxmljs
+    tags: true
+    condition: $TRAVIS_TAG == v[0-9]*-mt

README.md

@@ -1,8 +1,10 @@
 # Libxmljs-mt
 [![Build Status](https://secure.travis-ci.org/gagern/libxmljs.svg?branch=master)](http://travis-ci.org/gagern/libxmljs)
 
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/64dea28o6yuaq7om/branch/master?svg=true)](https://ci.appveyor.com/project/gagern/libxmljs/branch/master)
+
 This project is a fork of [libxmljs](https://github.com/libxmljs/libxmljs).
-The current version 0.18.0 is based on libxmljs 0.18.0 and libxml 2.9.4.
+The current version 0.18.1 is based on libxmljs 0.18.7 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.
@@ -97,4 +99,3 @@ Start by checking out the open issues both for [the upstream project](https://gi
 ### Requirements
 
 Make sure you have met the requirements for [node-gyp](https://github.com/TooTallNate/node-gyp#installation). You *do not* need to manually install node-gyp; it comes bundled with node.
-

appveyor.yml

@@ -1,22 +1,73 @@
 environment:
- matrix:
-  - nodejs_version: LTS
-  - nodejs_version: Stable
+  npm_version: latest
+  gyp_version: latest
+  pre_gyp_version: latest
+  github_release_token:
+    secure: rI8VrSUANI+Slubd7OIzW6YNSyEmnAEpl2EYsN+CtXYcup4svkPQnqwWM2J70FPM
+  matrix:
+    - nodejs_version: 0.10
+      npm_version: 4.0.3
+      gyp_version: 3.5.0
+      pre_gyp_version: 0.6.36
+    - nodejs_version: 0.12
+      npm_version: 4.0.3
+      gyp_version: 3.5.0
+      pre_gyp_version: 0.6.36
+    - nodejs_version: 4
+    - nodejs_version: 5
+    - nodejs_version: 6
+    - nodejs_version: 7
+    - nodejs_version: 8
 
-os:
-  - Visual Studio 2013
-  - Visual Studio 2015
+platform:
+  - x86
+  - x64
+
+image: Visual Studio 2015
+
+artifacts:
+  - path: build\**\*.tar.gz
+    name: libxml_binary
 
 install:
-  - ps: Install-Product node $env:nodejs_version
-  - node --version
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - npm --version
+  - npm config set msvs_version 2015
+  - npm config set python C:\Python27\python.exe
+  - npm install -g npm@%npm_version%
   - npm --version
-  - git submodule update --init --recursive
+  - npm install -g node-gyp@%gyp_version%
+  - npm install -g node-pre-gyp@%pre_gyp_version%
+
+  # work around an issue with node-gyp v3.3.1 and node 4x
+  # https://github.com/nodejs/node-gyp/issues/921
+  - npm config set -g cafile=package.json
+  - npm config set -g strict-ssl=false
+  - npm config set registry http://registry.npmjs.org/
 
 build_script:
-  - npm install
+  - npm install --msvs_version=2015
 
 test_script:
-  - npm test
+  - node --expose-gc node_modules/nodeunit/bin/nodeunit test
+
+after_test:
+  - node-pre-gyp package 2>&1
+
+deploy:
+  - provider: GitHub
+    release: $(APPVEYOR_REPO_TAG_NAME)
+    artifact: libxml_binary
+    auth_token: $(github_release_token)
+    draft: false
+    prerelease: false
+    on:
+      appveyor_repo_tag: true
 
-deploy: off
+after_deploy:
+  - npm config delete -g cafile
+  - npm config delete -g strict-ssl
+  - npm config delete registry
+  - node-pre-gyp clean
+  - npm install --fallback-to-build=false
+  - node --expose-gc node_modules/nodeunit/bin/nodeunit test

binding.gyp

@@ -10,6 +10,10 @@
         'vendor/libxml/include',
         "<!(node -e \"require('nan')\")"
       ],
+      'cflags': [ '-Wall' ],
+      'xcode_settings': {
+        'OTHER_CFLAGS': [ '-Wall' ]
+      },
       'sources': [
         'src/libxmljs.cc',
         'src/xml_attribute.cc',
@@ -59,7 +63,7 @@
         'vendor/libxml/xmlunicode.c',
         'vendor/libxml/xmlwriter.c',
         'vendor/libxml/xpath.c',
-        'vendor/libxml/xpointer.c',
+        'vendor/libxml/xpointer.c'
       ],
       'defines': [
         'IN_LIBXMLJS',
@@ -70,6 +74,7 @@
           # node-gyp 2.x doesn't add this anymore
           # https://github.com/TooTallNate/node-gyp/pull/612
           'xcode_settings': {
+            'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
             'OTHER_LDFLAGS': [
               '-undefined dynamic_lookup'
             ],

lib/document.js

@@ -155,7 +155,8 @@ module.exports.fromHtmlFragment = function(string, opts) {
         throw new Error('fromHtmlFragment options must be an object');
     }
 
-    opts.excludeImpliedElements = true;
+    opts.doctype = false;
+    opts.implied = false;
 
     return bindings.fromHtml(string, opts);
 };

package.json

@@ -6,10 +6,18 @@
     "Roman Shtylman",
     "Martin von Gagern <[email protected]>"
   ],
+  "binary": {
+        "module_name" : "xmljs",
+        "module_path" : "./build/Release/",
+        "host"        : "https://github.com",
+        "remote_path" : "./gagern/libxmljs/releases/download/v{version}-mt/",
+        "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
+  },
   "description": "multi-threaded libxml bindings for v8 javascript engine",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "scripts": {
-    "test": "node --expose_gc node_modules/nodeunit/bin/nodeunit test"
+    "install": "node-pre-gyp install --fallback-to-build --loglevel http",
+    "test": "node --expose_gc ./node_modules/.bin/nodeunit test"
   },
   "repository": {
     "type": "git",
@@ -24,10 +32,11 @@
     "node": ">=0.8.0"
   },
   "dependencies": {
-    "bindings": "^1.2.1",
-    "nan": "^2.3.2"
+    "node-pre-gyp": "~0.6.32",
+    "bindings": "1.2.1",
+    "nan": "~2.5.0"
   },
   "devDependencies": {
-    "nodeunit": "^0.9.0"
+    "nodeunit": "0.9.0"
   }
 }

src/libxmljs.cc

@@ -59,18 +59,25 @@ void adjustMem(ssize_t diff)
     // our cleanup routines for libxml will be called (freeing memory)
     // but v8 is already offline and does not need to be informed
     // trying to adjust after shutdown will result in a fatal error
-#if (NODE_MODULE_VERSION > 0x000B)
+#if (NODE_MODULE_VERSION > 14)
+    if (v8::Isolate::GetCurrent() == 0 ||
+        v8::Isolate::GetCurrent()->IsDead())
+    {
+        return;
+    }
+#elif (NODE_MODULE_VERSION > 0x000B)
     if (v8::Isolate::GetCurrent() == 0)
     {
         assert(diff <= 0);
         return;
     }
-#endif
+#else
     if (v8::V8::IsDead())
     {
         assert(diff <= 0);
         return;
     }
+#endif
     actuallyAdjustMem(diff);
 }
 

src/xml_attribute.cc

@@ -23,7 +23,7 @@ XmlAttribute::New(xmlNode* xml_obj, const xmlChar* name, const xmlChar* value)
     }
 
     XmlAttribute* attribute = new XmlAttribute(attr);
-    v8::Local<v8::Object> obj = Nan::New(constructor_template)->GetFunction()->NewInstance();
+    v8::Local<v8::Object> obj = Nan::NewInstance(Nan::New(constructor_template)->GetFunction()).ToLocalChecked();
     attribute->Wrap(obj);
     return scope.Escape(obj);
 }
@@ -39,7 +39,7 @@ XmlAttribute::New(xmlAttr* attr)
     }
 
     XmlAttribute* attribute = new XmlAttribute(attr);
-    v8::Local<v8::Object> obj = Nan::New(constructor_template)->GetFunction()->NewInstance();
+    v8::Local<v8::Object> obj = Nan::NewInstance(Nan::New(constructor_template)->GetFunction()).ToLocalChecked();
     attribute->Wrap(obj);
     return scope.Escape(obj);
 }

src/xml_comment.cc

@@ -87,7 +87,7 @@ XmlComment::New(xmlNode* node)
     }
 
     XmlComment* comment = new XmlComment(node);
-    v8::Local<v8::Object> obj = Nan::New(constructor_template)->GetFunction()->NewInstance();
+    v8::Local<v8::Object> obj = Nan::NewInstance(Nan::New(constructor_template)->GetFunction()).ToLocalChecked();
     comment->Wrap(obj);
     return scope.Escape(obj);
 }

src/xml_document.cc

@@ -250,7 +250,7 @@ XmlDocument::New(xmlDoc* doc)
         return scope.Escape(static_cast<XmlDocument*>(doc->_private)->handle());
     }
 
-    v8::Local<v8::Object> obj = Nan::New(constructor_template)->GetFunction()->NewInstance();
+    v8::Local<v8::Object> obj = Nan::NewInstance(Nan::New(constructor_template)->GetFunction()).ToLocalChecked();
 
     XmlDocument* document = Nan::ObjectWrap::Unwrap<XmlDocument>(obj);
 
@@ -413,8 +413,6 @@ NAN_METHOD(XmlDocument::FromXml)
         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());