Supporting absolute search paths

jonkemp · Aug 6, 2015 · 4eee0ef · 4eee0ef
1 parent 76d2eea
commit 4eee0ef
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -6,13 +6,15 @@ var gutil = require('gulp-util'),
     multimatch = require('multimatch');
 
 function getSearchPaths(cwd, searchPath, filepath) {
+    // Assuming all paths are relative, strip off leading slashes
+    filepath = filepath.replace(/^\/+/, '');
     // Check for multiple search paths within the array
     if (searchPath.indexOf(',') !== -1) {
         return searchPath.split(',').map(function (nestedSearchPath) {
-            return path.join(cwd, nestedSearchPath, filepath);
+            return path.resolve(cwd, nestedSearchPath, filepath);
         });
     } else {
-        return path.join(cwd, searchPath, filepath);
+        return path.resolve(cwd, searchPath, filepath);
     }
 }
 

diff --git a/test/fixtures/absolute-search-path.html b/test/fixtures/absolute-search-path.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+  <!-- build:css /css/combined.css -->
+  <link href="one.css" rel="stylesheet">
+  <link href="two.css" rel="stylesheet">
+  <!-- endbuild -->
+</head>
+</html>
diff --git a/test/test.js b/test/test.js
@@ -406,6 +406,33 @@ describe('useref.assets()', function() {
         stream.end();
     });
 
+    it('should understand absolute search paths', function(done) {
+        var a = 0;
+
+        var testFile = getFixture('absolute-search-path.html');
+
+        var searchPath = path.join(__dirname, 'fixtures', 'css');
+
+        var stream = useref.assets({
+            searchPath: searchPath
+        });
+
+        stream.on('data', function(newFile){
+            should.exist(newFile.contents);
+            newFile.path.should.equal(path.normalize('./test/fixtures/css/combined.css'));
+            ++a;
+        });
+
+        stream.once('end', function () {
+            a.should.equal(1);
+            done();
+        });
+
+        stream.write(testFile);
+
+        stream.end();
+    });
+
     it('should not explode on custom blocks', function (done) {
         var stream = useref.assets();