fix: spaces in file names

Fixes inlining local files with spaces in names. Fixes remy#148.
djhargrove · Jun 25, 2017 · c3cbdf0 · c3cbdf0
1 parent 5786954
commit c3cbdf0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/lib/get.js b/lib/get.js
@@ -31,7 +31,13 @@ module.exports = function get(url, options) {
 
   if (this.isFile && url.indexOf('http') !== 0) {
     debug('inliner.get file: %s', url);
-    cache[url] = fs.readFile(url).then(function read(body) {
+    cache[url] = fs.readFile(url).catch(function (error) {
+      if (error.code === 'ENOENT' || error.code === 'ENAMETOOLONG') {
+        debug(error.code + ': ' + base + ', trying decodeURI');
+        return fs.readFile(decodeURI(url));
+      }
+      throw error;
+    }).then(function read(body) {
       return {
         body: body,
         headers: {

diff --git a/test/fixtures/spaces in names.css b/test/fixtures/spaces in names.css
@@ -0,0 +1,4 @@
+body {
+    background-color: #222;
+    color: wheat;
+}
diff --git a/test/fixtures/spaces in names.js b/test/fixtures/spaces in names.js
@@ -0,0 +1 @@
+console.log("Hi");
diff --git a/test/fixtures/spaces in names.result.html b/test/fixtures/spaces in names.result.html
@@ -0,0 +1 @@
+<!DOCTYPE html> <html> <head> <title>Spaces in file names test</title> <meta charset="UTF-8"> <style>body{ background-color:#222;color:wheat;}</style> <script type="text/javascript">console.log("Hi");</script> </head> <body> <div>Some content</div> </body> </html> 
diff --git a/test/fixtures/spaces in names.src.html b/test/fixtures/spaces in names.src.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Spaces in file names test</title>
+        <meta charset="UTF-8">
+        <link rel="stylesheet" href="spaces%20in%20names.css" />
+        <script type="text/javascript" src="spaces%20in%20names.js"></script>
+    </head>
+    <body>
+        <div>Some content</div>
+    </body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html> <html> <head> <title>Spaces in file names test</title> <meta charset="UTF-8"> <style>body{ background-color:#222;color:wheat;}</style> <script type="text/javascript">console.log("Hi");</script> </head> <body> <div>Some content</div> </body> </html>