Utils refactoring

Author: s0ph1e

lib/utils.js

@@ -1,44 +1,22 @@
-var Url = require('url');
-
-function trimUrl(url) {
-  var questionMarkIndex = url.indexOf('?');
-  if (questionMarkIndex > 0) {
-    url = url.substring(0, questionMarkIndex);
-  }
-  return url;
-}
+var url = require('url');
 
 function trimFilename(filename) {
-  var questionMarkIndex = filename.indexOf('?'),
-    hashIndex = filename.indexOf('#'),
-    indexToCut = filename.length;
-
-  if (questionMarkIndex >= 0 && hashIndex >= 0) {
-    indexToCut = questionMarkIndex < hashIndex ? questionMarkIndex : hashIndex
-  } else if (questionMarkIndex >= 0) {
-    indexToCut = questionMarkIndex;
-  } else if (hashIndex >= 0) {
-    indexToCut = hashIndex;
-  }
-
-  return filename.substring(0, indexToCut);
+  var queryRegexp = /[\?#](.*)$/;
+  return filename.replace(queryRegexp, '');
 }
 
 function isPathAbsolute(path) {
-  var absolutePathRegexp = /^http:\/|^https:\/|^\/\//;
+  var absolutePathRegexp = /^(http:\/|https:\/|\/\/)/;
   return absolutePathRegexp.test(path);
 }
 
-function getAbsolutePath(curPath, link) {
-  if (isPathAbsolute(link)) {
-    var absolutePathNoProtocolRegexp = /^\/\//;
-    if (absolutePathNoProtocolRegexp.test(link)) {
-      link = 'http:' + link;
-    }
-    return link;
-  } else {
-    return Url.resolve(curPath, link);
+function getAbsolutePath(currentUrl, path) {
+  var pathObj = url.parse(path);
+  if (isPathAbsolute(path) && !pathObj.protocol) {
+    pathObj.protocol = 'http';
+    path = url.format(pathObj);
   }
+  return url.resolve(currentUrl, path);
 }
 
 function pathToUnixFormat(filepath) {
@@ -47,12 +25,11 @@ function pathToUnixFormat(filepath) {
 
 // Check if path contains base64 encoded image
 function isEmbeddedSource(path) {
-  var embeddedImageRegexp = /data:(.*?);base64,/;
-  return embeddedImageRegexp.test(path);
+  var embeddedRegexp = /data:(.*?);base64,/;
+  return embeddedRegexp.test(path);
 }
 
 module.exports.getAbsolutePath = getAbsolutePath;
 module.exports.pathToUnixFormat = pathToUnixFormat;
 module.exports.isEmbeddedSource = isEmbeddedSource;
-module.exports.trimUrl = trimUrl;
 module.exports.trimFilename = trimFilename;