Merge branch 'version-prefix'

Close #3

Author: Hans Kristian Flaatten

README.md

@@ -34,15 +34,17 @@ Resize a given source `image` into several `versions`.
   * **integer** `height` - image pixel height
   * **string** `path` - complete path to source image
 * **object** `output` - image resize output config
-  * **object[]** `versions` - Array of version objects
-    * **string** `suffix` - suffix for the resized image (ex. "-small")
+  * **string** `prefix` image versions name prefix (default `""`)
+  * **integrer** `quality` - global version quality (default `80`)
+  * **object[]** `versions` - array of version objects
+    * **string** `suffix` - suffix for the resized image (ex. `-small`)
     * **integer** `maxWidth` - max width for resized image
     * **integer** `maxHeight` - max height for resized image
-    * **integer** `quality` - quality for resized image
-    * **string** `ratio` - force aspectratio on resized image (ex. "4:3")
+    * **integer** `quality` - quality for resized image (default `80`)
+    * **string** `ratio` - force aspectratio on resized image (ex. `4:3`)
     * **boolean** `flatten` - used in conjunction with background
-    * **string** `background` - set background to transparent image
-    * **string** `format` - image format for resized image (ex. "png")
+    * **string** `background` - set background to transparent image (ex. `red`)
+    * **string** `format` - image format for resized image (ex. `png`)
 * **function** `cb` - callback function (**Error** `error`, **object[]** `versions`)
   * **Error** `error` - error output if command failed
   * **object[]** `versions` - resized image versions

index.js

@@ -7,7 +7,7 @@ var join = require('path').join;
 var sprintf = require('util').format;
 
 module.exports = function(image, output, cb) {
-  var cmd = module.exports.cmd(image, output.versions);
+  var cmd = module.exports.cmd(image, output);
   exec(cmd, {timeout: 10000}, function(e, stdout, stderr) {
     if (e) { return cb(e); }
     if (stderr) { return cb(new Error(stderr)); }
@@ -56,7 +56,7 @@ module.exports.path = function(path, opts) {
     ext = '.' + opts.format;
   }
 
-  return join(dir, base + opts.suffix + ext);
+  return join(dir, opts.prefix + base + opts.suffix + ext);
 };
 
 /**
@@ -67,13 +67,20 @@ module.exports.path = function(path, opts) {
  *
  * @return string convert command
  */
-module.exports.cmd = function(image, versions) {
+module.exports.cmd = function(image, output) {
   var cmd = [
     sprintf('convert %s -strip -write mpr:%s +delete', image.path, image.path)
   ];
 
-  for (var i = 0; i < versions.length; i++) {
-    cmd.push(module.exports.cmdVersion(image, versions[i], i === versions.length-1));
+  for (var i = 0; i < output.versions.length; i++) {
+    var version = output.versions[i];
+    var last = (i === output.versions.length-1);
+
+    version.prefix = version.prefix || output.prefix || '';
+    version.suffix = version.suffix || '';
+    version.quality = version.quality || output.quality || 80;
+
+    cmd.push(module.exports.cmdVersion(image, version, last));
   }
 
   return cmd.join(' ');
@@ -95,7 +102,9 @@ module.exports.cmdVersion = function(image, version, last) {
   cmd.push(sprintf('mpr:%s', image.path));
 
   // -quality
-  cmd.push(sprintf('-quality %d', version.quality || 80));
+  if (version.quality) {
+    cmd.push(sprintf('-quality %d', version.quality));
+  }
 
   // -background
   if (version.background) {
@@ -118,7 +127,8 @@ module.exports.cmdVersion = function(image, version, last) {
 
   // -write
   version.path = module.exports.path(image.path, {
-    suffix: version.suffix || '',
+    prefix: version.prefix,
+    suffix: version.suffix,
     format: version.format
   });
 

test.js

@@ -5,24 +5,40 @@ var resize = require('./index');
 
 describe('resize.path()', function() {
   it('returns new relative path with suffix', function() {
-    var path = resize.path('./foo.jpg', {suffix: '-bar'});
+    var path = resize.path('./foo.jpg', {prefix: '', suffix: '-bar'});
+
     assert.equal(path, 'foo-bar.jpg');
   });
 
   it('returns new relative path with custom format', function() {
-    var path = resize.path('./foo.jpg', {suffix: '-bar', format: 'png'});
+    var path = resize.path('./foo.jpg', {
+      prefix: '',
+      suffix: '-bar',
+      format: 'png'
+    });
+
     assert.equal(path, 'foo-bar.png');
   });
 
   it('returns new absolute path with suffix', function() {
-    var path = resize.path('/foo/bar/baz.jpg', {suffix: '-bix'});
+    var path = resize.path('/foo/bar/baz.jpg', {prefix: '', suffix: '-bix'});
     assert.equal(path, '/foo/bar/baz-bix.jpg');
   });
 
   it('returns new absolute path with custom format', function() {
-    var path = resize.path('/foo/bar/baz.jpg', {suffix: '-bix', format: 'png'});
+    var path = resize.path('/foo/bar/baz.jpg', {
+      prefix: '',
+      suffix: '-bix',
+      format: 'png'
+    });
+
     assert.equal(path, '/foo/bar/baz-bix.png');
   });
+
+  it('returns new path with prefix', function() {
+    var path = resize.path('/foo/bar/baz.jpg', {prefix: 'prefix-', suffix: ''});
+    assert.equal(path, '/foo/bar/prefix-baz.jpg');
+  });
 });
 
 describe('resize.crop()', function() {
@@ -50,6 +66,26 @@ describe('resize.crop()', function() {
 describe('resize.cmd()', function() { });
 
 describe('resize.cmdVersion()', function() {
+  it('returns convert command for version', function() {
+    var image = {
+      path: './a.jpg',
+      width: 2000,
+      height: 1000
+    };
+
+    var version = {
+      prefix: '',
+      suffix: '-b',
+      maxWidth: 500,
+      maxHeight: 500
+    };
+
+    var cmd = resize.cmdVersion(image, version);
+    var out = 'mpr:./a.jpg -resize "500x500" -write a-b.jpg +delete';
+
+    assert.equal(cmd, out);
+  });
+
   it('sets custom quality if specified', function() {
     var image = {
       path: './a.jpg',
@@ -58,6 +94,7 @@ describe('resize.cmdVersion()', function() {
     };
 
     var version = {
+      prefix: '',
       suffix: '-b',
       quality: 50,
       maxWidth: 500,