Update dependencies

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "0.10"
-  - "0.8"
 before_script:
   - "npm install -g grunt-cli"
   # Narwhal uses a hardcoded path to openjdk v6, so use that version

package.json

@@ -41,10 +41,10 @@
 		"grunt": "~0.4.4",
 		"grunt-shell": "~0.6.4",
 		"grunt-template": "~0.2.3",
-		"istanbul": "~0.2.6",
-		"qunit-clib": "~1.3.0",
+		"istanbul": "~0.2.7",
+		"qunit-extras": "~1.0.0",
 		"qunitjs": "~1.11.0",
-		"regenerate": "~0.5.4",
+		"regenerate": "~0.6.0",
 		"requirejs": "~2.1.11",
 		"unicode-6.3.0": "~0.1.2"
 	}

scripts/export-data.js

@@ -21,12 +21,12 @@ require(unicodePackage).blocks.forEach(function(block) {
 // All code points except those that map to combining marks
 var allExceptCombiningMarks = regenerate()
 	.addRange(0x000000, 0x10FFFF)
-	.remove(combiningMarks.toArray());
+	.remove(combiningMarks);
 
 module.exports = {
 	'combiningMarks': combiningMarks.toString(),
 	'allExceptCombiningMarks': allExceptCombiningMarks.toString(),
-	'highSurrogates': regenerate.fromCodePointRange(0xD800, 0xDBFF),
-	'lowSurrogates': regenerate.fromCodePointRange(0xDC00, 0xDFFF),
+	'highSurrogates': regenerate().addRange(0xD800, 0xDBFF).toString(),
+	'lowSurrogates': regenerate().addRange(0xDC00, 0xDFFF).toString(),
 	'version': packageInfo.version
 };

strip-combining-marks.js

@@ -43,9 +43,7 @@
 		if (freeModule) { // in Node.js or RingoJS v0.8.0+
 			freeModule.exports = stripCombiningMarks;
 		} else { // in Narwhal or RingoJS v0.7.0-
-			for (var key in stripCombiningMarks) {
-				stripCombiningMarks.hasOwnProperty(key) && (freeExports[key] = stripCombiningMarks[key]);
-			}
+			freeExports.stripCombiningMarks = stripCombiningMarks;
 		}
 	} else { // in Rhino or a web browser
 		root.stripCombiningMarks = stripCombiningMarks;

tests/tests.js

@@ -1,22 +1,27 @@
-;(function(root) {
+(function(root) {
 	'use strict';
 
-	/** Use a single `load` function */
-	var load = typeof require == 'function' ? require : root.load;
+	var noop = Function.prototype;
+
+	var load = (typeof require == 'function' && !(root.define && define.amd)) ?
+		require :
+		(!root.document && root.java && root.load) || noop;
 
-	/** The unit testing framework */
 	var QUnit = (function() {
-		var noop = Function.prototype;
 		return root.QUnit || (
 			root.addEventListener || (root.addEventListener = noop),
 			root.setTimeout || (root.setTimeout = noop),
 			root.QUnit = load('../node_modules/qunitjs/qunit/qunit.js') || root.QUnit,
-			(load('../node_modules/qunit-clib/qunit-clib.js') || { 'runInContext': noop }).runInContext(root),
 			addEventListener === noop && delete root.addEventListener,
 			root.QUnit
 		);
 	}());
 
+	var qe = load('../node_modules/qunit-extras/qunit-extras.js');
+	if (qe) {
+		qe.runInContext(root);
+	}
+
 	/** The `stripCombiningMarks` object to test */
 	var stripCombiningMarks = root.stripCombiningMarks || (root.stripCombiningMarks = (
 		stripCombiningMarks = load('../strip-combining-marks.js') || root.stripCombiningMarks,