Merge pull request #209 from evilebottnawi/url/resolve

Resolve relative paths as urls

src/helpers.js

@@ -1,4 +1,5 @@
 const path = require("path"),
+  url = require("url"),
   fs = require("fs"),
   _ = require("underscore"),
   color = require("tinycolor2"),
@@ -23,8 +24,12 @@ const path = require("path"),
     ROTATE_DEGREES = 90;
 
   function helpers(options) {
-    function relative(directory) {
-      return path.join(options.path, directory).replace(/\\/g, "/");
+    function directory(path) {
+      return path.substr(-1) === "/" ? path : `${path}/`;
+    }
+
+    function relative(path) {
+      return url.resolve(options.path && directory(options.path), path);
     }
 
     function print(context, message) {

test/default.test.js

@@ -1,22 +1,17 @@
-const favicons = require('../src');
-const test = require('ava');
-const path = require('path');
+const favicons = require("../src");
+const test = require("ava");
 
-test.cb('should generate the expected default result', t => {
-    t.plan(1);
+const { logo, normalize } = require("./util");
 
-    favicons(path.join(__dirname, 'logo.png'), {}, (error, response) => {
+test.cb("should generate the expected default result", t => {
+  t.plan(1);
 
-        if (error) {
-            throw error;
-        }
+  favicons(logo, {}, (error, result) => {
+    if (error) {
+      throw error;
+    }
 
-        const result = [...response.files, ...response.images].reduce(
-            (obj, {name, contents}) => Object.assign(obj, {[name]: contents}),
-            {'index.html': response.html}
-        );
-
-        t.snapshot(result);
-        t.end();
-    });
+    t.snapshot(normalize(result));
+    t.end();
+  });
 });

test/prefixed.test.js

@@ -0,0 +1,14 @@
+const favicons = require('../src');
+const test = require('ava');
+
+const {logo, normalize} = require('./util');
+
+test('should allow setting an URL prefix', async t => {
+    t.plan(1);
+
+    const result = await favicons(logo, {
+        path: 'https://domain/subdomain',
+    });
+
+    t.snapshot(normalize(result));
+});

test/promise.test.js

@@ -1,16 +1,12 @@
-const favicons = require('../src');
-const test = require('ava');
-const path = require('path');
+const favicons = require("../src");
+const test = require("ava");
 
-test('should return a promise if callback is undefined', t => {
-    t.plan(1);
+const { logo, normalize } = require("./util");
 
-    return favicons(path.join(__dirname, 'logo.png'), {}).then(response => {
-        const result = [...response.files, ...response.images].reduce(
-            (obj, {name, contents}) => Object.assign(obj, {[name]: contents}),
-            {'index.html': response.html}
-        );
+test("should return a promise if callback is undefined", t => {
+  t.plan(1);
 
-        t.snapshot(result);
-    });
+  return favicons(logo, {}).then(result => {
+    t.snapshot(normalize(result));
+  });
 });

test/stream.test.js

@@ -1,18 +1,20 @@
-const favicons = require('../src').stream;
-const test = require('ava');
-const path = require('path');
-const gulp = require('gulp');
+const favicons = require("../src").stream;
+const test = require("ava");
+const gulp = require("gulp");
 
-test.cb('should provide stream interface', t => {
-    t.plan(1);
+const { logo } = require("./util");
 
-    const result = {};
+test.cb("should provide stream interface", t => {
+  t.plan(1);
 
-    gulp.src(path.join(__dirname, 'logo.png'))
-        .pipe(favicons({ html: 'index.html', pipeHTML: true }))
-        .on('data', chunk => result[chunk.path] = chunk.contents)
-        .on('end', () => {
-            t.snapshot(result);
-            t.end();
-        });
+  const result = {};
+
+  gulp
+    .src(logo)
+    .pipe(favicons({ html: "index.html", pipeHTML: true }))
+    .on("data", chunk => (result[chunk.path] = chunk.contents))
+    .on("end", () => {
+      t.snapshot(result);
+      t.end();
+    });
 });

test/util.js

@@ -0,0 +1,9 @@
+const path = require("path");
+
+module.exports.logo = path.resolve(__dirname, "logo.png");
+
+module.exports.normalize = ({ files, images, html }) =>
+  [...files, ...images].reduce(
+    (obj, { name, contents }) => Object.assign(obj, { [name]: contents }),
+    { "index.html": html }
+  );