fix subfolder jade paths

Author: juanfran

index.js

@@ -17,22 +17,28 @@ function gulpJadeInheritance(options) {
 
   function writeStream(currentFile) {
     if (currentFile && currentFile.contents.length) {
-      var currentFileOptions = _.defaults(options, {'basedir': currentFile.base});
-      var jadeInheritance = new JadeInheritance(currentFile.path, currentFileOptions.basedir, currentFileOptions);
-      var filepath;
-
-      for (var i = 0; i < jadeInheritance.files.length; i++) {
-        filepath = options.basedir + "/" +  jadeInheritance.files[i];
-        if (_.indexOf(files, filepath) === -1) {
-          files.push(filepath);
-        }
-      }
+      files.push(currentFile);
     }
   }
 
   function endStream() {
     if (files.length) {
-      vfs.src(files)
+      var jadeInheritanceFiles = [];
+      var filesPaths = [];
+
+      options = _.defaults(options, {'basedir': process.cwd()});
+
+      _.forEach(files, function(file) {
+        var jadeInheritance = new JadeInheritance(file.path, options.basedir, options);
+
+        var fullpaths = _.map(jadeInheritance.files, function (file) {
+          return options.basedir + "/" +  file;
+        });
+
+        filesPaths = _.union(filesPaths, fullpaths);
+      });
+
+      vfs.src(filesPaths, {'base': options.basedir})
         .pipe(es.through(
           function (f) {
             stream.emit('data', f);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-jade-inheritance",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Rebuild only changed jade files and all it dependencies",
   "main": "index.js",
   "scripts": {

test/fixtures/subfolder/fixture5.jade

@@ -0,0 +1 @@
+p fixture 5

test/main.js

@@ -23,9 +23,9 @@ describe('gulp-jade-inheritance', function(done) {
     var fixture = getFixtureFile('fixture1.jade')
 
     var fileNames = [
-      'fixture1.jade',
-      'fixture2.jade',
-      'fixture3.jade'
+      'test/fixtures/fixture1.jade',
+      'test/fixtures/fixture2.jade',
+      'test/fixtures/fixture3.jade'
     ];
 
     var files = [];
@@ -93,7 +93,7 @@ describe('gulp-jade-inheritance', function(done) {
 
       var files = [];
 
-      var stream = plugin({basedir: 'test/fixtures2'});
+      var stream = plugin({basedir: 'test/fixtures5'});
       stream
         .on('data', function (file) {
           files.push(file);
@@ -128,4 +128,25 @@ describe('gulp-jade-inheritance', function(done) {
       stream.end();
     });
   });
+
+  it('subfolder jade', function(done) {
+    var fixture = getFixtureFile('subfolder/fixture5.jade')
+
+    var files = [];
+
+    var stream = plugin({basedir: 'test/fixtures'});
+    stream
+      .on('data', function (file) {
+        expect(file.base).to.be.eql('test/fixtures');
+        files.push(file);
+      })
+      .once('end', function() {
+        expect(files).to.have.length(1);
+
+        done();
+      });
+
+    stream.write(fixture);
+    stream.end();
+  });
 });