Allow to specify array of files as src, that resolve gcpantazis#10

Gruntfile.js

@@ -72,6 +72,19 @@ module.exports = function(grunt) {
         options: {
           resize: '300x300'
         }
+      },
+
+      SrcAsArray: {
+        imageDirectory: IMAGES,
+        src: [
+          IMAGES + '/deep/directory/foo/*.png'
+        ],
+        destination: 'tmp/optimized/src_as_array',
+        outputSuffix: '_medium',
+        keepDirectoryStructure: false,
+        options: {
+          resize: '66%'
+        }
       }
     },
 

tasks/grunt-images.js

@@ -19,8 +19,8 @@ module.exports = function(grunt) {
         dest = currentTask.data.destination,
         keepDirectoryStructure = currentTask.data.keepDirectoryStructure,
         outputSuffix = currentTask.data.outputSuffix,
-        files = grunt.file.expand(currentTask.data.files),
-        fileCount = files.length;
+        files = getFiles(currentTask),
+        fileCount = getFileCount(files);
 
     if ( !dest && outputSuffix ) {
       grunt.log.error('Images Error: "outputSuffix" was set, but "destination" was not. Please set both if using "outputSuffix".');
@@ -34,7 +34,7 @@ module.exports = function(grunt) {
       return;
     }
 
-    if ( files.length === 0 ) {
+    if ( fileCount === 0 ) {
       grunt.log.error('Images Error: No images matched.');
       done(true);
       return;
@@ -46,8 +46,7 @@ module.exports = function(grunt) {
       grunt.file.mkdir(dest);
     }
 
-    files.forEach(function( filepath ) {
-
+    eachFile(files, function( filepath ) {
       var tempFilePath;
 
       if ( !filepath.match(imageDirectory) ) {
@@ -191,4 +190,31 @@ module.exports = function(grunt) {
       callback(err);
     });
   };
+
+  var eachFile = function (files, cb) {
+    files.forEach(function (file) {
+      file.src.forEach(cb);
+    });
+  };
+
+  var getFileCount = function (files) {
+    var count = 0;
+
+    files.forEach(function (file) {
+      count += file.src.length;
+    });
+
+    return count;
+  };
+
+  var getFiles = function (currentTask) {
+    //Backward compatibility
+    if (typeof currentTask.data.files === "string") {
+      return [{
+        src: grunt.file.expand(currentTask.data.files)
+      }];
+    }
+
+    return currentTask.files;
+  };
 };

tests/convert_test.js

@@ -6,7 +6,7 @@ exports.images = {
 
     var actual, expected;
 
-    test.expect(3);
+    test.expect(4);
 
     actual = grunt.file.read('tmp/optimized/jpeg_resizes/nasa_thumb.jpg').length;
     expected = grunt.file.read('tests/expected/jpeg_resizes/nasa_thumb.jpg').length;
@@ -26,6 +26,12 @@ exports.images = {
       return 'PNG 33% Resize - Actual size ('+actual+') within 3% of expected size ('+expected+').';
     })());
 
+    actual = grunt.file.exists('tmp/optimized/src_as_array/mag-glass_medium.png');
+    expected = true;
+    test.ok(actual === expected, (function(){
+      return 'Expected file "tmp/optimized/src_as_array/mag-glass_medium.png" to exists';
+    })());
+
     test.done();
   }
-};
+};

tests/pngquant_test.js

@@ -22,4 +22,4 @@ exports.images = {
 
     test.done();
   }
-};
+};