Fix absolute path calcul

Add tests for links module

2 files changed, 11 insertions, 9 deletions

diff --git a/lib/utils/links.js b/lib/utils/links.js
index 9fe6127..9a95824 100644
--- a/lib/utils/links.js
+++ b/lib/utils/links.js
@@ -26,15 +26,17 @@ var isRelative = function(href) {
 // outdir: directory parent from the html output
 
 var toAbsolute = function(_href, dir, outdir) {
-    // Absolute file in source
-    _href = path.join(dir, _href);
+    if (isExternal(_href)) return _href;
 
-    // make it relative to output
-    _href = path.relative(outdir, _href);
+    // Path '_href' inside the base folder
+    var hrefInRoot = path.normalize(path.join(dir, _href));
+    if (_href[0] == "/") hrefInRoot = path.normalize(_href.slice(1));
 
-    if (process.platform === 'win32') {
-        _href = _href.replace(/\\/g, '/');
-    }
+    // Make it relative to output
+    _href = path.relative(outdir, hrefInRoot);
+
+    // Normalize windows paths
+    _href = _href.replace(/\\/g, '/');
 
     return _href;
 };
diff --git a/lib/utils/page.js b/lib/utils/page.js
index 7d21e94..6a6ee9c 100644
--- a/lib/utils/page.js
+++ b/lib/utils/page.js
@@ -168,7 +168,7 @@ function normalizeHtml(src, options) {
 
 // Convert svg images to png
 function convertImages(images, options) {
-    options.book.log.info("convert ", images.length, "images to png");
+    options.book.log.info.ln("convert ", images.length, "images to png");
 
     return _.reduce(images, function(prev, image) {
         return prev.then(function() {
@@ -187,7 +187,7 @@ function convertImages(images, options) {
         });
     }, Q())
     .then(function() {
-        options.book.log.info.ok();
+        options.book.log.info.ok(images.length+" images converted with success");
     });
 };