Bug-fix: constructor handlers were sometimes not being loaded.

theakman2 · Mar 14, 2014 · 0531b3c · 0531b3c
1 parent 5db0806
commit 0531b3c
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -288,7 +288,7 @@ When you `require` a module asynchronously, webant intelligently tries to includ
 
 ### Well tested
 
-Webant is thoroughly tested with 170+ unit tests, most of which use a headless browser ([PhantomJS](http://phantomjs.org)) to ensure the module works in a browser environment as intended.
+Webant is thoroughly tested with 180+ unit tests, most of which use a headless browser ([PhantomJS](http://phantomjs.org)) to ensure the module works in a browser environment as intended.
 
 ## Dynamic requires
 

diff --git a/lib/util/handlers.js b/lib/util/handlers.js
@@ -13,6 +13,9 @@ function fetch(str) {
 		throw new Error("Handler '" + str + "' not found. " +
 				"Are you sure the package 'webant-handler-" + str + "' is installed?");
 	}
+	if (typeof handler === "function") {
+		handler = new handler();
+	}
 	return handler;
 }
 
@@ -51,17 +54,10 @@ function populate(data,intoHandlers,intoAliases) {
 		} else if (Array.isArray(data[i])) {
 			handler = fetch(data[i][0]);
 			settings = data[i][1];
-		} else {
-			var h = data[i];
-			if (typeof h === "function") {
-				h = new h();
-			}
-			if (
-				(h.aliases && (typeof h.aliases === "object"))
-				|| (h.extensions && (typeof h.handle === "function"))
-			) {
-				handler = h;
-			}
+		} else if (typeof data[i] === "function") {
+			handler = new data[i]();
+		} else if (typeof data[i] === "object") {
+			handler = data[i];
 		}
 
 		if (handler) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webant",
-	"version": "4.3.2",
+	"version": "4.3.3",
 	"description": "Bringing CommonJS-style requires to the browser and more.",
 	"keywords": ["ant", "browser", "browserify", "build", "builder", "bundle", "bundler", "cjs", "commonjs", "deploy", "generator", "make", "modules", "package", "packager", "require", "requirejs", "web", "webant", "webmake"],
 	"author": "A Kazim",
@@ -15,7 +15,9 @@
 	},
 	"devDependencies": {
 		"shell-escape": "~0.0.1",
-		"tap": "~0.4.8"
+		"tap": "~0.4.8",
+		"webant-handler-text":"~2.0.0",
+		"webant-handler-dustjs":"~3.0.0"
 	},
 	"repository": "git://github.com/theakman2/node-modules-webant.git",
 	"bin": "./bin/webant",

diff --git a/test/tests/webant-handlers.js b/test/tests/webant-handlers.js
@@ -0,0 +1,6 @@
+var webantTester = require("../lib/webant.js");
+
+webantTester("handlers",1,{handlers:["dustjs","text"]},function(obj,data,done){
+	data.t.equivalent(obj,{a:"Dust file Bob here.",b:"I'm a text file!"});
+	done();
+});
diff --git a/test/webant/handlers/build/index.html b/test/webant/handlers/build/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+<script type="text/javascript" src="js/main.js"></script>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/test/webant/handlers/src/a.dust b/test/webant/handlers/src/a.dust
@@ -0,0 +1 @@
+Dust file {name} here.
diff --git a/test/webant/handlers/src/b.txt b/test/webant/handlers/src/b.txt
@@ -0,0 +1 @@
+I'm a text file!
diff --git a/test/webant/handlers/src/main.js b/test/webant/handlers/src/main.js
@@ -0,0 +1,6 @@
+var g = {};
+
+g.a = require("./a.dust")({name:"Bob"});
+g.b = require("./b.txt");
+
+window.__global = g;