Changed underscore dependency to lodash (#56)

* Changed `underscore` dependency to `lodash`

* Added Lodash to package.json

Author: Mark Lagendijk

lib/file-handlers/css.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var getCssUrls = require('css-url-parser');
 var utils = require('../utils');
 

lib/filename-generators/by-type.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var path = require('path');
 var utils = require('../utils.js');
 
@@ -15,7 +15,7 @@ module.exports = function generateFilename (resource, options, loadedResources)
 	var basename = path.basename(filename, extension);
 	var index = 1;
 
-	while (_.contains(occupiedFilenames, currentFilename)) {
+	while (_.includes(occupiedFilenames, currentFilename)) {
 		currentFilename = path.join(directory, basename + '_' + index + extension);
 		index++;
 	}
@@ -29,9 +29,8 @@ function getOccupiedFilenames (loadedResources, options) {
 }
 
 function getDirectoryByExtension (extension, options) {
-	return _.chain(options.subdirectories)
-			.filter(function matchesExtension (directory) { return _.contains(directory.extensions, extension); })
+	return _(options.subdirectories)
+			.filter(function matchesExtension (directory) { return _.includes(directory.extensions, extension); })
 			.map(function getDirectory (directory) { return directory.directory; })
-			.first()
-			.value() || '';
+			.first() || '';
 }

lib/filename-generators/filename-generator-getter.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var byTypeFilenameGenerator = require('./by-type');
 var bySiteStructureFilenameGenerator = require('./by-site-structure');
 

lib/request.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var Promise = require('bluebird');
 var request = require('request');
 var get = Promise.promisify(request.get);

lib/resource.js

@@ -1,11 +1,11 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var path = require('path');
 var types = require('./config/resource-types');
 var typesByHtmlData = require('./config/resource-types-by-tag');
 
 function getTypeByHtmlData (htmlData) {
 	var type = _.findKey(typesByHtmlData, function containsHtmlData (rules) {
-		return _.findWhere(rules, htmlData);
+		return _.find(rules, htmlData);
 	});
 	return type || types.other;
 }

lib/scraper.js

@@ -6,7 +6,7 @@ var outputFileAsync = Promise.promisify(fs.outputFile);
 var ensureDirAsync = Promise.promisify(fs.ensureDir);
 
 var path = require('path');
-var _ = require('underscore');
+var _ = require('lodash');
 
 var defaults = require('./config/defaults');
 var recursiveSources = require('./config/recursive-sources');

lib/utils.js

@@ -1,6 +1,6 @@
 var url = require('url');
 var path = require('path');
-var _ = require('underscore');
+var _ = require('lodash');
 var Promise = require('bluebird');
 
 function isUrl (path) {
@@ -43,7 +43,7 @@ function waitAllFulfilled (promises) {
 }
 
 function createOutputObject (resource) {
-	var assets = _.chain(resource.getChildren())
+	var assets = _(resource.getChildren())
 		.map(createOutputObject)
 		.uniq()
 		.value();

package.json

@@ -37,9 +37,9 @@
     "compare-urls": "^1.0.0",
     "css-url-parser": "^1.0.0",
     "fs-extra": "^0.28.0",
+    "lodash": "^4.11.1",
     "request": "^2.42.0",
-    "srcset": "^1.0.0",
-    "underscore": "^1.7.0"
+    "srcset": "^1.0.0"
   },
   "devDependencies": {
     "codeclimate-test-reporter": "^0.3.1",

test/unit/file-handlers/html-test.js

@@ -1,5 +1,5 @@
 require('should');
-var _ = require('underscore');
+var _ = require('lodash');
 var sinon = require('sinon');
 var nock = require('nock');
 var fs = require('fs-extra');

test/unit/scraper-test.js

@@ -5,7 +5,7 @@ var nock = require('nock');
 var proxyquire = require('proxyquire');
 var fs = require('fs-extra');
 var path = require('path');
-var _ = require('underscore');
+var _ = require('lodash');
 var Scraper = require('../../lib/scraper');
 var Resource = require('../../lib/resource');
 
@@ -112,9 +112,9 @@ describe('Scraper', function () {
 				s.originalResources[0].should.be.an.instanceOf(Resource);
 				s.originalResources[1].should.be.an.instanceOf(Resource);
 				s.originalResources[2].should.be.an.instanceOf(Resource);
-				_.where(s.originalResources, { url: 'http://first-url.com' }).should.have.length(1);
-				_.where(s.originalResources, { url: 'http://second-url.com' }).should.have.length(1);
-				_.where(s.originalResources, { url: 'http://third-url.com' }).should.have.length(1);
+				_.filter(s.originalResources, { url: 'http://first-url.com' }).should.have.length(1);
+				_.filter(s.originalResources, { url: 'http://second-url.com' }).should.have.length(1);
+				_.filter(s.originalResources, { url: 'http://third-url.com' }).should.have.length(1);
 				done();
 			}).catch(done);
 		});
@@ -469,7 +469,7 @@ describe('Scraper', function () {
 			htmlLoadStub = sinon.stub().resolves();
 
 			Scraper = proxyquire('../../lib/scraper', {
-				'underscore': {
+				'lodash': {
 					'noop': noopStub
 				},
 				'./file-handlers/html': htmlLoadStub,