Added test & additional check for pr bezoerb#13

Author: bezoerb

Gruntfile.js

@@ -170,16 +170,15 @@ module.exports = function (grunt) {
                 options: {
                     base: 'test/fixture',
                     minify: true,
+                    css: [
+                        'test/fixture/styles/main.css',
+                        'test/fixture/styles/bootstrap.css'
+                    ],
                     width: 1300,
-                    height: 900,
-                css: [
-                    'test/fixture/styles/main.css',
-                    'test/fixture/styles/bootstrap.css'
-                ],
+                    height: 900
                 },
-                files: [
-                    {expand: true, cwd: 'test/fixture/multiple', src: ['*.html'], dest: 'test/generated/multiple-files-folder'}
-                ]
+                src: 'test/fixture/multiple/index{1,2,3}.html',
+                dest: 'test/generated/multiple-files-folder/'
             }
         }
     });
@@ -188,7 +187,7 @@ module.exports = function (grunt) {
     grunt.loadTasks('tasks');
 
 
-    grunt.registerTask('test', ['complexity', 'jshint', 'critical', 'simplemocha', 'watch']);
-    grunt.registerTask('ci', ['complexity', 'jshint', 'critical', 'simplemocha']);
+    grunt.registerTask('test', [ 'jshint', 'critical', 'simplemocha', 'watch']);
+    grunt.registerTask('ci', [ 'jshint', 'critical', 'simplemocha']);
     grunt.registerTask('default', ['test']);
 };

package.json

@@ -27,7 +27,8 @@
   },
   "dependencies": {
     "async": "^1.2.0",
-    "critical": "^0.5.6"
+    "critical": "^0.5.6",
+    "fs-extra": "^0.18.4"
   },
   "devDependencies": {
     "chai": "^3.0.0",

tasks/critical.js

@@ -13,6 +13,12 @@ module.exports = function (grunt) {
     var path = require('path');
     var async = require('async');
     var extend = require('util')._extend;
+    var fs = require('fs-extra');
+
+
+    function isDir(p) {
+        return typeof p === 'string' && (grunt.file.isDir(p) || /\/$/.test(p));
+    }
 
     grunt.registerMultiTask('critical', 'Extract & inline critical-path CSS from HTML', function () {
 
@@ -49,28 +55,29 @@ module.exports = function (grunt) {
                 return;
             }
 
+            if (srcFiles.length > 1 && !isDir(f.dest)) {
+                grunt.log.warn('Destination needs to be a directory for multiple src files');
+                return;
+            }
+
             // choose wether to create raw css or complete html
             var command = (/\.(css|scss|less|styl)/.test(path.extname(f.dest))) ? 'generate' : 'generateInline';
 
             async.eachSeries(srcFiles,function(src,cb){
                 var opts = extend({},options);
                 opts.src = path.resolve(src).replace(basereplace,'');
 
-                // check if the destination is a folder and not a file
-                var destination;
-                if (grunt.file.isDir(f.dest)) {
-
-                    destination = path.join(f.dest, src);
-                } else  {
-                    destination = f.dest;
+                var destination = f.dest;
+                if (isDir(f.dest)) {
+                    destination = path.join(f.dest, opts.src);
                 }
 
                 try {
                     critical[command](opts, function (err, output){
                         if (err) {
                             return cb(err);
                         }
-                        grunt.file.write(destination, output);
+                        fs.outputFileSync(destination, output);
                         // Print a success message.
                         grunt.log.ok('File "' + destination + '" created.');
 

test/index.js

@@ -76,4 +76,14 @@ describe('critical',function(){
         expect(exists('fixture/styles/bootstrap.1956cc2d.css')).to.equal(true);
     });
 
+    it('should write files to folder when folder is specified as dest', function(){
+        var output,expected = read('expected/index-multiple-minified.html');
+
+        for (var i=1; i<=3; i++) {
+            expect(exists('generated/multiple-files-folder/multiple/index'+i+'.html')).to.equal(true);
+            output = read('generated/multiple-files-folder/multiple/index'+i+'.html');
+            expect(output).to.equal(expected.replace('<title>pagex</title>','<title>page' + i + '</title>'));
+        }
+    });
+
 });