Merge pull request #27 from seyfert/master

rebaseRelativeTo fixes

src/css.js

@@ -29,8 +29,8 @@ module.exports = function( options, callback )
                 return callback( null ); // Skip
             }
 
-            var css = "url(\"" + datauriContent + "\");";
-            var re = new RegExp( "url\\(\\s?[\"']?(" + inline.escapeSpecialChars( args.src ) + ")[\"']?\\s?\\);", "g" );
+            var css = "url(\"" + datauriContent + "\")";
+            var re = new RegExp( "url\\(\\s?[\"']?(" + inline.escapeSpecialChars( args.src ) + ")[\"']?\\s?\\)", "g" );
             result = result.replace( re, () => css );
 
             return callback( null );
@@ -39,26 +39,28 @@ module.exports = function( options, callback )
 
     var rebase = function( src )
     {
-        var css = "url(\"" + path.join( settings.rebaseRelativeTo, src ).replace( /\\/g, "/" ) + "\");";
-        var re = new RegExp( "url\\(\\s?[\"']?(" + inline.escapeSpecialChars( src ) + ")[\"']?\\s?\\);", "g" );
+        var css = "url(\"" + path.join( settings.rebaseRelativeTo, src ).replace( /\\/g, "/" ) + "\")";
+        var re = new RegExp( "url\\(\\s?[\"']?(" + inline.escapeSpecialChars( src ) + ")[\"']?\\s?\\)", "g" );
         result = result.replace( re, () => css );
     };
 
     var result = settings.fileContent;
     var tasks = [];
     var found = null;
 
-    var urlRegex = /url\(\s?["']?([^)'"]+)["']?\s?\);.*/gi;
+    var urlRegex = /url\(\s?["']?([^)'"]+)["']?\s?\).*/i;
+    var index = 0;
 
     if( settings.rebaseRelativeTo )
     {
         var matches = {};
         var src;
 
-        while( ( found = urlRegex.exec( result ) ) !== null )
+        while( ( found = urlRegex.exec( result.substring(index) ) ) !== null )
         {
             src = found[ 1 ];
             matches[ src ] = true;
+            index = found.index + index + 1;
         }
 
         for( src in matches )
@@ -73,7 +75,8 @@ module.exports = function( options, callback )
     var inlineAttributeCommentRegex = new RegExp( "\\/\\*\\s?" + settings.inlineAttribute + "\\s?\\*\\/", "i" );
     var inlineAttributeIgnoreCommentRegex = new RegExp( "\\/\\*\\s?" + settings.inlineAttribute + "-ignore\\s?\\*\\/", "i" );
 
-    while( ( found = urlRegex.exec( result ) ) !== null )
+    index = 0;
+    while( ( found = urlRegex.exec( result.substring(index) ) ) !== null )
     {
         if( !inlineAttributeIgnoreCommentRegex.test( found[ 0 ] ) &&
             ( settings.images || inlineAttributeCommentRegex.test( found[ 0 ] ) ) )
@@ -84,6 +87,7 @@ module.exports = function( options, callback )
                 limit: settings.images
             } ) );
         }
+        index = found.index + index + 1;
     }
 
     parallel( tasks, function( err )

src/html.js

@@ -86,7 +86,7 @@ module.exports = function( options, callback )
 
                 var cssOptions = xtend( {}, settings, {
                     fileContent: content.toString(),
-                    rebaseRelativeTo: path.relative( settings.relativeTo, path.join( settings.relativeTo, args.src, ".." + path.sep ) )
+                    rebaseRelativeTo: path.relative( settings.relativeTo, settings.rebaseRelativeTo || path.join( settings.relativeTo, args.src, ".." + path.sep ) )
                 } );
 
                 css( cssOptions, function( err, content )

src/util.js

@@ -133,7 +133,7 @@ function getRemote( uri, settings, callback, toDataUri )
 util.getInlineFilePath = function( src, relativeTo )
 {
     src = src.replace( /^\//, "" );
-    return path.resolve( relativeTo, src ).replace( /\?.*$/, "" );
+    return path.resolve( relativeTo, src ).replace( /[\?#].*$/, "" );
 };
 
 util.getInlineFileContents = function( src, relativeTo )

test/cases/assets/fonts.css

@@ -0,0 +1,17 @@
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('open-sans-v13-latin-regular.eot');
+  src: url('open-sans-v13-latin-regular.eot?#iefix') format('embedded-opentype'),
+       url(open-sans-v13-latin-regular.woff2) format('woff2'),
+       url("open-sans-v13-latin-regular.woff") format('woff'),
+       url('open-sans-v13-latin-regular.svg#OpenSans') format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('open-sans-v13-latin-regular.eot');
+  src: url('open-sans-v13-latin-regular.eot?#iefix') format('embedded-opentype'), url(open-sans-v13-latin-regular.woff2) format('woff2'), url("open-sans-v13-latin-regular.woff") format('woff'), url('open-sans-v13-latin-regular.svg#OpenSans') format('svg');
+}

test/cases/css-rebase.css

@@ -0,0 +1,3 @@
+body {
+    background: url(icon.png);
+}

test/cases/css-rebase.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>test</title>
+    <link href="assets/fonts.css" rel="stylesheet">
+</head>
+<body>
+</body>
+</html>

test/cases/css-rebase_out.css

@@ -0,0 +1,3 @@
+body {
+    background: url("assets/icon.png");
+}

test/cases/css-rebase_out.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>test</title>
+    <style>
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url("assets/fonts/open-sans-v13-latin-regular.eot");
+  src: url("assets/fonts/open-sans-v13-latin-regular.eot?#iefix") format('embedded-opentype'),
+       url("assets/fonts/open-sans-v13-latin-regular.woff2") format('woff2'),
+       url("assets/fonts/open-sans-v13-latin-regular.woff") format('woff'),
+       url("assets/fonts/open-sans-v13-latin-regular.svg#OpenSans") format('svg');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url("assets/fonts/open-sans-v13-latin-regular.eot");
+  src: url("assets/fonts/open-sans-v13-latin-regular.eot?#iefix") format('embedded-opentype'), url("assets/fonts/open-sans-v13-latin-regular.woff2") format('woff2'), url("assets/fonts/open-sans-v13-latin-regular.woff") format('woff'), url("assets/fonts/open-sans-v13-latin-regular.svg#OpenSans") format('svg');
+}
+</style>
+</head>
+<body>
+</body>
+</html>

test/spec.js

@@ -152,6 +152,22 @@ describe( "html", function()
                 }
             );
         } );
+
+        it( "should rebase inline local links relative to", function( done )
+        {
+            var expected = readFile( "test/cases/css-rebase_out.html" );
+
+            inline.html( {
+                    fileContent: readFile( "test/cases/css-rebase.html" ),
+                    relativeTo: "test/cases/",
+                    rebaseRelativeTo: "test/cases/assets/fonts"
+                },
+                function( err, result )
+                {
+                    testEquality( err, result, expected, done );
+                }
+            );
+        } );
     } );
 
     describe( "scripts", function()
@@ -579,6 +595,22 @@ describe( "css", function()
             }
         );
     } );
+
+    it( "should rebase local urls", function( done )
+    {
+        var expected = readFile( "test/cases/css-rebase_out.css" );
+
+        inline.css( {
+                fileContent: readFile( "test/cases/css-rebase.css" ),
+                rebaseRelativeTo: "assets",
+                images: false
+            },
+            function( err, result )
+            {
+                testEquality( err, result, expected, done );
+            }
+        );
+    } );
 } );
 
 describe( "util", function()