Merge pull request #14 from straker/resolveComplete

fix(livingcss): resolve promise when all pages have been parsed

Author: straker

index.js

@@ -94,7 +94,7 @@ function livingcss(source, dest, options) {
     tags[tag] = options.tags[tag];
   }
 
-  Promise.all([
+  return Promise.all([
     // read the handlebars template
     new Promise(function(resolve, reject) {
       fs.readFile(options.template, 'utf8', function(err, data) {
@@ -129,7 +129,11 @@ function livingcss(source, dest, options) {
 
     context.allSections = context.sections;
 
-    if (context.pages.length > 1) {
+    if (context.pages.length === 0) {
+      console.warn('Warning: no pages generated from source files.');
+    }
+
+    else if (context.pages.length > 1) {
       context.navbar = context.pages.map(function(page) {
         return {
           name: page.name,
@@ -138,6 +142,8 @@ function livingcss(source, dest, options) {
       });
     }
 
+    var promises = [];
+
     context.pages.forEach(function(page, index) {
       // deep copy context for each page
       var pageContext = JSON.parse(JSON.stringify(context));
@@ -151,8 +157,14 @@ function livingcss(source, dest, options) {
       }
 
       // values[0] = handlebars template
-      generate(path.join(dest, page.id + '.html'), values[0], pageContext, options);
+      promises.push(
+        generate(path.join(dest, page.id + '.html'), values[0], pageContext, options)
+      );
     });
+
+    // wait until all promises have returned (either rejected or resolved) before
+    // returning the last promise
+    return Promise.all(promises);
   })
   .catch(function(err) {
     console.error(err.stack);

test/data/no-tags.css

@@ -0,0 +1,3 @@
+/**
+ * No tag to parse.
+ */

test/integration.spec.js

@@ -0,0 +1,52 @@
+/*jshint -W030 */
+
+// test the index.js file and that everything works as expected
+var expect = require('chai').expect;
+var sinon = require('sinon');
+var path = require('path');
+var livingcss = require('../index');
+
+describe('livingcss', function() {
+
+  it('should resolve when all pages have been processed', function(done) {
+    var file = path.join(__dirname, 'data/page-multiple-tags.css');
+    var options = {
+      preprocess: function(context) {
+        return false;
+      }
+    };
+
+    sinon.spy(options, 'preprocess');
+
+    livingcss(file, '.', options).then(function() {
+      expect(options.preprocess.called).to.be.true;
+      expect(options.preprocess.callCount).to.equal(2);
+
+      done();
+    })
+    .catch(function(e) {
+      done(e);
+    });
+  });
+
+  it('should resolve when no pages have been processed', function(done) {
+    var file = path.join(__dirname, 'data/no-tags.css');
+    var options = {
+      preprocess: function(context) {
+        return false;
+      }
+    };
+
+    sinon.spy(options, 'preprocess');
+
+    livingcss(file, '.', options).then(function() {
+      expect(options.preprocess.called).to.be.false;
+
+      done();
+    })
+    .catch(function(e) {
+      done(e);
+    });
+  });
+
+});