cleanup, remove extra closures, do not mutate options and add test for filters

Author: phated

index.js

@@ -1,30 +1,32 @@
 'use strict';
 
+var jade = require('jade');
+var extend = require('xtend');
 var through = require('through2');
 var ext = require('gulp-util').replaceExtension;
 var PluginError = require('gulp-util').PluginError;
 
+function handleCompile(contents, opts){
+  if(opts.client){
+    return opts.compileClient(contents, opts);
+  }
 
-module.exports = function(options){
-  var opts = options || {};
-  var jade = opts.jade || require('jade');
-  var compile = jade.compile;
-  var compileClient = jade.compileClient;
-
-  function handleCompile(contents){
-    if(opts.client){
-      return compileClient(contents, opts);
-    }
+  return opts.compile(contents, opts)(opts.locals || opts.data);
+}
 
-    return compile(contents, opts)(opts.locals || opts.data);
+function handleExtension(filepath, opts){
+  if(opts.client){
+    return ext(filepath, '.js');
   }
+  return ext(filepath, '.html');
+}
 
-  function handleExtension(filepath){
-    if(opts.client){
-      return ext(filepath, '.js');
-    }
-    return ext(filepath, '.html');
-  }
+module.exports = function(options){
+  options = options || {};
+  var opts = extend(options, {
+    compile: (options.jade || jade).compile,
+    compileClient: (options.jade || jade).compileClient
+  });
 
   function CompileJade(file, enc, cb){
     opts.filename = file.path;
@@ -33,7 +35,7 @@ module.exports = function(options){
       opts.data = file.data;
     }
 
-    file.path = handleExtension(file.path);
+    file.path = handleExtension(file.path, opts);
 
     if(file.isStream()){
       return cb(new PluginError('gulp-jade', 'Streaming not supported'));

package.json

@@ -13,7 +13,8 @@
   "dependencies": {
     "gulp-util": "~2.2",
     "jade": "1.1 - 1.7",
-    "through2": "^0.5.1"
+    "through2": "^0.5.1",
+    "xtend": "^4.0.0"
   },
   "main": "index.js",
   "engines": {

test/filters.js

@@ -0,0 +1,35 @@
+'use strict';
+
+var test = require('tap').test;
+
+var task = require('../');
+var path = require('path');
+var fs = require('fs');
+var gutil = require('gulp-util');
+var jade = require('jade');
+
+jade.filters.shout = function(str){
+  return str.toUpperCase() + '!!!!';
+};
+
+var filePath = path.join(__dirname, 'fixtures', 'filters.jade');
+var base = path.join(__dirname, 'fixtures');
+var cwd = __dirname;
+
+var file = new gutil.File({
+  path: filePath,
+  base: base,
+  cwd: cwd,
+  contents: fs.readFileSync(filePath)
+});
+
+test('should compile a jade template with a custom jade instance with filters', function(t){
+  var stream = task();
+  stream.on('data', function(newFile){
+    t.ok(newFile);
+    t.ok(newFile.contents);
+    t.equal(newFile.contents.toString(), 'HELLO, TESTER!!!!');
+    t.end();
+  });
+  stream.write(file);
+});

test/fixtures/filters.jade

@@ -0,0 +1,2 @@
+:shout
+  hello, tester