Rework muliple urls param, rename params indexFile -> defaultFilename, srcToLoad -> sources

Author: s0ph1e

lib/config/defaults.js

@@ -1,7 +1,7 @@
 var config = {
-  indexFile: 'index.html',
+  defaultFilename: 'index.html',
   log: false,
-  srcToLoad: [
+  sources: [
     {
       selector: 'img',
       attr: 'src'

lib/load.js

@@ -48,9 +48,7 @@ var Loader = function (data) {
 
   function getDirectoryByExtension(ext) {
     var dirObj = _.chain(options.subdirectories)
-      .filter(function (dir) {
-        return _.indexOf(dir.extensions, ext) >= 0
-      })
+      .filter(function (dir) { return _.contains(dir.extensions, ext); })
       .first()
       .value();
     return (!dirObj) ? '' : dirObj.directory;
@@ -109,7 +107,7 @@ var Loader = function (data) {
       return loadCssSources(currentOptions.url, absoluteLocalPath, html);
     });
 
-    _.each(options.srcToLoad, function (src) {
+    _.each(options.sources, function (src) {
       p = p.then(function loadSource(html) {
         return loadHtmlSources(currentOptions.url, absoluteLocalPath, html, src.selector, src.attr);
       });
@@ -194,36 +192,33 @@ var Loader = function (data) {
     });
   }
 
+  function adaptLoadOptions (loadOptions) {
+    loadOptions = _.isArray(loadOptions) ? loadOptions : [loadOptions];
+
+    return _.reduce(loadOptions, function (memo, loadOption) {
+      var url = _.isObject(loadOption) && _.has(loadOption, 'url') ? loadOption.url : loadOption.toString();
+      var filename = _.isObject(loadOption) && _.has(loadOption, 'filename') ? loadOption.filename : options.defaultFilename;
+
+      memo.push({
+        url: url,
+        filename: filename
+      });
+      return memo;
+    }, []);
+  }
+
   function beforeLoad() {
     fs.ensureDirSync(options.directory);
 
-    // Create map { url -> local filename } for downloading
-    var loadOptions = (function () {
-      if (!_.isEmpty(options.paths)) {
-        return _.map(options.paths, function (path) {
-          return {
-            filename: path.filename,
-            url: url.resolve(path.url || options.url, path.path || '/')
-          };
-        });
-      } else {
-        return [
-          {
-            filename: options.indexFile,
-            url: options.url
-          }
-        ];
-      }
-    })();
-
     // Set static subdirectories as loaded to avoid saving file with subdirectory's name
     _.map(options.subdirectories, function (dir) {
       setLoadedFilename(dir.directory, path.resolve(options.directory, dir.directory));
     });
 
     logger = new Logger(options.log);
 
-    return Promise.resolve(loadOptions);
+    // Create map { url -> local filename } for downloading
+    return Promise.resolve(adaptLoadOptions(options.urls));
   }
 
   function load(loadOptions) {