Merge pull request #593 from stephanebachelier/uglify-task-naming

support both uglify and uglifyjs in flow

lib/flow.js

@@ -14,8 +14,27 @@ var _ = require('lodash');
 //   }
 //
 var Flow = module.exports = function (flowConfig) {
-  this._steps = flowConfig.steps || {};
-  this._post = flowConfig.post || {};
+  this.setSteps(flowConfig.steps);
+  this.setPost(flowConfig.post);
+};
+
+Flow.formatStepName = function (step) {
+  if (typeof step === 'string') {
+    return /uglify/.test(step) ? 'uglify' : step;
+  }
+
+  step.name = /uglify/.test(step.name) ? 'uglify' : step.name;
+
+  return step;
+};
+
+Flow.formatSteps = function (steps) {
+  var formattedSteps = {};
+  _.forIn(steps, function (config, type) {
+    formattedSteps[type] = config.map(Flow.formatStepName);
+  });
+
+  return formattedSteps;
 };
 
 //
@@ -29,8 +48,7 @@ Flow.prototype.steps = function (blockType) {
 // Set the steps for the flow
 //
 Flow.prototype.setSteps = function (steps) {
-  // FIXME: Check format !!!
-  this._steps = steps;
+  this._steps = Flow.formatSteps(steps) || {};
 };
 
 //
@@ -44,8 +62,7 @@ Flow.prototype.post = function (blockType) {
 // Set the post for the flow
 //
 Flow.prototype.setPost = function (post) {
-  // FIXME: Check format !!!
-  this._post = post;
+  this._post = Flow.formatSteps(post) || {};
 };
 
 

test/test-flow.js

@@ -3,7 +3,7 @@ var assert = require('assert');
 var helpers = require('./helpers');
 var Flow = require('../lib/flow.js');
 
-describe('ConfigWriter', function () {
+describe('Flow', function () {
   before(helpers.directory('temp'));
 
   it('should allow steps per block type', function () {
@@ -73,7 +73,7 @@ describe('ConfigWriter', function () {
     assert.deepEqual(flow.steps('js'), ['foo', 'bar']);
   });
 
-  it('should allow to set steps', function () {
+  it('should allow to set post-processors', function () {
     var flow = new Flow({
       post: {
         html: ['bar']
@@ -85,4 +85,43 @@ describe('ConfigWriter', function () {
     assert.deepEqual(flow.post('js'), ['foo', 'bar']);
   });
 
+  it('should rename uglifyjs to uglify in steps', function () {
+    var flow = new Flow({});
+    flow.setSteps({
+      js: ['uglifyjs']
+    });
+
+    assert.deepEqual(flow.steps('js'), ['uglify']);
+  });
+
+  it('should rename uglifyjs to uglify in steps given to contructor', function () {
+    var flow = new Flow({
+      steps: {
+        js: ['uglifyjs']
+      }
+    });
+
+    assert.deepEqual(flow.steps('js'), ['uglify']);
+  });
+
+  it('should rename uglifyjs to uglify in post-processors', function () {
+    var flow = new Flow({});
+    flow.setPost({
+      js: ['uglifyjs']
+
+    });
+
+    assert.deepEqual(flow.post('js'), ['uglify']);
+  });
+
+  it('should rename uglifyjs to uglify in post-processors given to contructor', function () {
+    var flow = new Flow({
+      post: {
+        js: ['uglifyjs']
+      }
+    });
+
+    assert.deepEqual(flow.post('js'), ['uglify']);
+  });
+
 });