return html in callback, rename keys in default.js

Author: s0ph1e

lib/defaults.js

@@ -4,38 +4,38 @@ var config = {
   srcToLoad: [
     {
       selector: 'img',
-      attributeName: 'src'
+      attr: 'src'
     },
     {
       selector: 'input',
-      attributeName: 'src'
+      attr: 'src'
     },
     {
       selector: 'object',
-      attributeName: 'data'
+      attr: 'data'
     },
     {
       selector: 'embed',
-      attributeName: 'src'
+      attr: 'src'
     },
     {
       selector: 'param[name="movie"]',
-      attributeName: 'value'
+      attr: 'value'
     },
     {
       selector: 'script',
-      attributeName: 'src'
+      attr: 'src'
     },
     {
       selector: 'link[rel="stylesheet"]',
-      attributeName: 'href'
+      attr: 'href'
     },
     {
       selector: 'link[rel*="icon"]',
-      attributeName: 'href'
+      attr: 'href'
     },
   ],
-  staticDirectories: [
+  directories: [
     {
       directory: 'images',
       extensions: ['.png', '.jpg', '.jpeg', '.gif']

lib/load.js

@@ -20,7 +20,7 @@ var Loader = function (data) {
     options[key] = _.has(options, key) ? options[key] : defaults[key];
   });
 
-  staticFullPaths = _.map(options.staticDirectories, function (dir) {
+  staticFullPaths = _.map(options.directories, function (dir) {
     return path.resolve(options.path, dir.directory)
   });
   logger = new Logger(options.log);
@@ -91,7 +91,7 @@ var Loader = function (data) {
    * @returns {string}
    */
   function getDirectoryByExtension(ext) {
-    var dirObj = _.chain(options.staticDirectories)
+    var dirObj = _.chain(options.directories)
       .filter(function (dir) {
         return _.indexOf(dir.extensions, ext) >= 0
       })
@@ -297,18 +297,16 @@ var Loader = function (data) {
     // Load all sources
     _.each(options.srcToLoad, function (src) {
       p = p.then(function (newHtml) {
-        return loadSources(newHtml, src.selector, src.attributeName)
+        return loadSources(newHtml, src.selector, src.attr)
       });
     });
 
     // Save index page
     var indexFilePath = path.resolve(options.path, options.indexFile);
     p = p.then(function (html) {
-      return fs.outputFileAsync(indexFilePath, html, {encoding: encoding})
-    })
-      .then(function () {
-        return {status: 'success'}
-      });
+      fs.outputFileSync(indexFilePath, html, {encoding: encoding});
+      return {html: html}
+    });
 
     return p;
   }