Merge pull request #26 from stefanpenner/cleanup

Cleanup
gabrielgrant · May 12, 2015 · 3c3e89e · 3c3e89e
2 parents ba51411 + 6d47d2d
commit 3c3e89e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 55 deletions.
diff --git a/index.js b/index.js
@@ -4,21 +4,12 @@ var mkdirp = require('mkdirp')
 var includePathSearcher = require('include-path-searcher')
 var CachingWriter = require('broccoli-caching-writer')
 var less = require('less')
-var _ = require('lodash')
+var merge = require('lodash-node/modern/object/merge')
 var RSVP = require('rsvp');
-
-function writeFilePromise(filename, data, options) {
-  return new RSVP.Promise(function(resolve, reject) {
-    fs.writeFile(filename, data, options, function (err) {
-      if (err) {
-        return reject(err);
-      }
-      return resolve(data);
-    });
-  });
-}
+var writeFile = RSVP.denodeify(fs.writeFile);
 
 module.exports = LessCompiler;
+
 LessCompiler.prototype = Object.create(CachingWriter.prototype)
 LessCompiler.prototype.constructor = LessCompiler
 
@@ -55,30 +46,24 @@ LessCompiler.prototype.updateCache = function (srcDir, destDir) {
     paths: srcDir
   }
 
-  _.merge(lessOptions, this.lessOptions)
+  merge(lessOptions, this.lessOptions)
+
   lessOptions.paths = [path.dirname(lessOptions.filename)].concat(lessOptions.paths);
   data = fs.readFileSync(lessOptions.filename, 'utf8');
 
-  return new RSVP.Promise(function(resolve, reject) {
-
-    less.render(data, lessOptions).then(function (output) {
-
-      var fileWriterPromises = [ writeFilePromise(destFile, output.css, { encoding: 'utf8' }) ];
+  return less.render(data, lessOptions).
+    catch(function(err) {
+      less.writeError(err, lessOptions);
+      throw err;
+    }).
+    then(function (output) {
+      var fileWriterPromises = [writeFile(destFile, output.css, { encoding: 'utf8' }) ];
       var sourceMapURL = lessOptions.sourceMap && lessOptions.sourceMap.sourceMapURL;
+
       if (sourceMapURL) {
-        fileWriterPromises.push( writeFilePromise(destDir + '/' + sourceMapURL, output.map, { encoding: 'utf8' }) );
+        fileWriterPromises.push( writeFile(destDir + '/' + sourceMapURL, output.map, { encoding: 'utf8' }) );
       }
 
-      RSVP.all(fileWriterPromises).then(function() {
-        return resolve(output);
-      }, function(err) {
-        return reject(err);
-      });
-
-    }, function (err) {
-      less.writeError(err, lessOptions);
-      reject(err);
-    });
-
-  });
+      return RSVP.Promise.all(fileWriterPromises);
+    })
 }
diff --git a/package.json b/package.json
@@ -32,15 +32,16 @@
     "css"
   ],
   "scripts": {
-    "test": "mocha test/runner.js --reporter spec"
+    "test": "mocha test/runner.js --reporter spec",
+    "test:debug": "mocha debug test/runner.js --reporter spec"
   },
   "dependencies": {
-    "mkdirp": "^0.5.0",
-    "lodash": "^2.4.1",
+    "broccoli-caching-writer": "^0.5.4",
     "include-path-searcher": "^0.1.0",
     "less": "^2.5.0",
-    "rsvp": "^3.0.17",
-    "broccoli-caching-writer": "^0.5.4"
+    "lodash-node": "^3.8.0",
+    "mkdirp": "^0.5.0",
+    "rsvp": "^3.0.17"
   },
   "readmeFilename": "README.md",
   "bugs": {
@@ -49,6 +50,6 @@
   "homepage": "https://github.com/gabrielgrant/broccoli-less-single",
   "devDependencies": {
     "broccoli": "^0.13.3",
-    "mocha": "^2.2.1"
+    "mocha": "^2.2.4"
   }
 }
diff --git a/test/tests/compare-output.js b/test/tests/compare-output.js
@@ -3,24 +3,23 @@ var read = require('../utils/read')
 var lessCompile = require('../utils/build');
 var expected = path.join(__dirname, '..', 'expected');
 
-function compare (name, done, lessOptions) {
-  lessCompile('../less', name + '.less', name + '.css', lessOptions).then(function (result) {
+function compare (name, lessOptions) {
+  return lessCompile('../less', name + '.less', name + '.css', lessOptions).then(function (result) {
     assert.equal(result.css, read(path.join(expected, result.outputFile)));
-    done();
-  }).catch(done);
+  });
 }
 
 describe('lessCompiler', function () {
-  it('basic less preprocessing', function (done) {
-    compare('basic', done);
+  it('basic less preprocessing', function () {
+    return compare('basic');
   });
 
-  it('import statements functioning', function (done) {
-    compare('import', done);
+  it('import statements functioning', function () {
+    return compare('import');
   });
 
-  it('`lessOption` discovers paths', function (done) {
-    compare('paths', done, {
+  it('`lessOption` discovers paths', function () {
+    return compare('paths', {
       paths: ['../less/branch']
     });
   });

diff --git a/test/utils/build.js b/test/utils/build.js
@@ -14,13 +14,11 @@ module.exports = function (inputTrees, inputFile, outputFile, lessOptions) {
 
   var less = compileLess.apply(this, arguments);
 
-  return new RSVP.Promise(function (resolve, reject) {
-    return new broccoli.Builder(less).build().then(function (results) {
-      resolve({
-        css: read(path.join(results.directory, outputFile)),
-        directory: results.directory,
-        outputFile: outputFile
-      });
-    });
+  return new broccoli.Builder(less).build().then(function (results) {
+    return {
+      css: read(path.join(results.directory, outputFile)),
+      directory: results.directory,
+      outputFile: outputFile
+    };
   });
 }