Move receiving file processing function to separate function

Author: s0ph1e

lib/load.js

@@ -56,29 +56,38 @@ var Loader = function (data) {
     return (!dirObj) ? '' : dirObj.directory;
   }
 
+  function getFileProcessingFunction(url, filename) {
+    var ext = path.extname(filename);
+    var processingFunction;
+
+    switch (ext) {
+      case '.css':
+        processingFunction = loadCssSources.bind(null, url, filename);
+        break;
+      case '.html':
+        processingFunction = loadHtml.bind(null, url, filename);
+        break;
+      default:
+        processingFunction = function () {
+          return arguments[0];
+        };
+        break;
+    }
+    return processingFunction;
+  }
+
   function loadFromUrl(url, desiredFilename) {
     var localFilename = getLoadedFilename(url);
-    var ext, fileProcessingFunction;
+    var fileProcessingFunction;
 
     if (!localFilename) {
+      // Get filename
       localFilename = getFilename(desiredFilename || path.basename(url));
-      ext = path.extname(localFilename);
-
-      switch (ext) {
-        case '.css':
-          fileProcessingFunction = loadCssSources.bind(null, url, localFilename);
-          break;
-        case '.html':
-          fileProcessingFunction = loadHtml.bind(null, url, localFilename);
-          break;
-        default:
-          fileProcessingFunction = function () {
-            return arguments[0];
-          };
-          break;
-      }
-
+      // Get processing function for file
+      fileProcessingFunction = getFileProcessingFunction(url, localFilename);
+      // Set file as loaded
       setLoadedFilename(url, localFilename);
+      // Request -> processing -> save to fs
       return utils.makeRequest(url).then(fileProcessingFunction).then(function saveFileToFS(text) {
         return fs.outputFileAsync(localFilename, text, {encoding: 'binary'});
       }).then(function fileSavedToFS() {
@@ -120,16 +129,16 @@ var Loader = function (data) {
       self.remove();
     });
 
-    // Update hrefs
-    $('a[href]').each(function () {
-      var self = $(this);
-      var href = self.attr('href');
-      var url = utils.getUrl(currentOptions.url, href);
-      var localFileForUrl = _.findWhere(options.urlsToLoad, { url: url });
-      if (localFileForUrl) {
-        self.attr('href', localFileForUrl.filename);
-      }
-    });
+//    // Update hrefs for loaded paths
+//    $('a[href]').each(function () {
+//      var self = $(this);
+//      var href = self.attr('href');
+//      var url = utils.getUrl(currentOptions.url, href);
+//      var localFileForUrl = _.findWhere(options.urlsToLoad, { url: url });
+//      if (localFileForUrl) {
+//        self.attr('href', localFileForUrl.filename);
+//      }
+//    });
 
     return Promise.resolve($.html());
   }
@@ -194,7 +203,7 @@ var Loader = function (data) {
         return _.map(options.paths, function (path) {
           return {
             filename: path.filename,
-            url: url.resolve(path.url || options.url, path.path)
+            url: url.resolve(path.url || options.url, path.path || '/')
           };
         });
       } else {
@@ -231,7 +240,7 @@ var Loader = function (data) {
 
   function errorCleanup(error) {
     if (!_.isEmpty(getAllLoadedFilenames())) {
-      fs.removeAsync(options.directory)
+      fs.removeAsync(options.directory);
     }
     throw error;
   }
@@ -242,6 +251,7 @@ var Loader = function (data) {
     getAllLoadedFilenames: getAllLoadedFilenames,
     getFilename: getFilename,
     getDirectoryByExtension: getDirectoryByExtension,
+    getFileProcessingFunction: getFileProcessingFunction,
     loadFromUrl: loadFromUrl,
     loadHtml: loadHtml,
     beforeHtmlProcessing: beforeHtmlProcessing,