The file.expandMapping method "ext" option is now / aware. Closes gh-625

.
gruntjs · Jan 21, 2013 · 2555495 · 2555495
1 parent e2cc850
commit 2555495
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/lib/grunt/file.js b/lib/grunt/file.js
@@ -150,7 +150,7 @@ file.expandMapping = function(patterns, destBase, options) {
     }
     // Change the extension?
     if (options.ext) {
-      destPath = destPath.replace(/(\..*)?$/, options.ext);
+      destPath = destPath.replace(/(\.[^\/]*)?$/, options.ext);
     }
     // Generate destination filename.
     var dest = options.rename(destBase, destPath, options);

diff --git a/test/fixtures/expand-mapping-ext/dir.ectory/file-no-extension b/test/fixtures/expand-mapping-ext/dir.ectory/file-no-extension
diff --git a/test/fixtures/expand-mapping-ext/dir.ectory/sub.dir.ectory/file.ext.ension b/test/fixtures/expand-mapping-ext/dir.ectory/sub.dir.ectory/file.ext.ension
diff --git a/test/fixtures/expand-mapping-ext/file.ext.ension b/test/fixtures/expand-mapping-ext/file.ext.ension
diff --git a/test/grunt/file_test.js b/test/grunt/file_test.js
@@ -272,14 +272,22 @@ exports['file.expandMapping'] = {
     test.done();
   },
   'ext': function(test) {
-    test.expect(1);
-    var actual = grunt.file.expandMapping(['expand/**/*.txt'], 'dest', {ext: '.foo'});
-    var expected = [
+    test.expect(2);
+    var actual, expected;
+    actual = grunt.file.expandMapping(['expand/**/*.txt'], 'dest', {ext: '.foo'});
+    expected = [
       {dest: 'dest/expand/deep/deep.foo', src: 'expand/deep/deep.txt'},
       {dest: 'dest/expand/deep/deeper/deeper.foo', src: 'expand/deep/deeper/deeper.txt'},
       {dest: 'dest/expand/deep/deeper/deepest/deepest.foo', src: 'expand/deep/deeper/deepest/deepest.txt'},
     ];
     test.deepEqual(actual, expected, 'specified extension should be added');
+    actual = grunt.file.expandMapping(['expand-mapping-ext/**/file*'], 'dest', {ext: '.foo'});
+    expected = [
+      {dest: 'dest/expand-mapping-ext/dir.ectory/file-no-extension.foo', src: 'expand-mapping-ext/dir.ectory/file-no-extension'},
+      {dest: 'dest/expand-mapping-ext/dir.ectory/sub.dir.ectory/file.foo', src: 'expand-mapping-ext/dir.ectory/sub.dir.ectory/file.ext.ension'},
+      {dest: 'dest/expand-mapping-ext/file.foo', src: 'expand-mapping-ext/file.ext.ension'},
+    ];
+    test.deepEqual(actual, expected, 'specified extension should be added');
     test.done();
   },
   'cwd': function(test) {