make callback optional

Author: s0ph1e

lib/load.js

@@ -20,9 +20,6 @@ var Loader = function (data) {
     options[key] = _.has(options, key) ? options[key] : defaults[key];
   });
 
-  staticFullPaths = _.map(options.directories, function (dir) {
-    return path.resolve(options.path, dir.directory)
-  });
   logger = new Logger(options.log);
 
   function makeRequest(url) {
@@ -283,9 +280,14 @@ var Loader = function (data) {
       .then(function (html) { // Prepare for further loading
         return prepare(html)
       })
-      .then(function (html) {   // Load css sources in index page
+      .then(function (html) {
         fs.ensureDirSync(options.path);
         setLoadedFilename(options.url, options.path);
+
+        staticFullPaths = _.map(options.directories, function (dir) {
+          return path.resolve(options.path, dir.directory)
+        });
+
         return loadCssSources(html, options.url);
       })
   }
@@ -315,22 +317,27 @@ var Loader = function (data) {
     return fs.removeAsync(options.path);
   }
 
+  function noop() {}
+
   return {
     scrape: function (callback) {
+      callback = typeof callback === 'function' ? callback : noop;
+
+      if (!options.path) {
+        return callback(new Error('Path is not defined'));
+      }
       if (fs.existsSync(options.path)) {
-        return callback(new Error('Path ' + options.path + ' exists!'), null);
+        return callback(new Error('Path ' + options.path + ' exists'));
       }
 
       process()
-        .then(function (res) {
-          return callback(null, res)
-        })
-        .catch(function (e) {
-          return errorCleanup()
-            .then(function() {
-              return callback(e, null)
-            });
-        })
+        .then(function (res, e) {
+          if (e) {
+            errorCleanup();
+            res = null;
+          }
+          return callback(e, res);
+        });
     }
   }
 };