Merge branch 'ppitonak-18_targetPrefix'

* ppitonak-18_targetPrefix:
  Force prefix & targetPrefix to end with slash
  reproducer for issue #18, targetPrefix doesn't work when path contains no slash

Fixes #18

Gruntfile.js

@@ -74,6 +74,21 @@ module.exports = function (grunt) {
                     dest: 'test/compiled/layout.jade'
                 }]
             },
+            withPrefixNoSlash: {
+                options: {
+                    tasks: {
+                        js: ['concat', 'uglify', 'filerev'],
+                        css: ['concat', 'cssmin']
+                    },
+                    dirTasks: ['filerev'],
+                    prefix: 'test',
+                    targetPrefix: 'test'
+                },
+                files: [{
+                    src: 'test/fixtures/withPrefixNoSlash.jade',
+                    dest: 'test/compiled/withPrefixNoSlash.jade'
+                }]
+            },
             alternate: {
                 options: {
                     tasks: {
@@ -129,6 +144,7 @@ module.exports = function (grunt) {
         'jadeUsemin:basic',
         'jadeUsemin:advanced',
         'jadeUsemin:withPrefix',
+        'jadeUsemin:withPrefixNoSlash',
         'jadeUsemin:alternate',
         'jadeUsemin:empty',
         'copy:test',

tasks/jade_usemin.js

@@ -16,24 +16,38 @@ module.exports = function (grunt) {
             tasks: {
                 js: ['concat', 'uglify'],
                 css: ['concat', 'cssmin']
-            }
+            },
+            prefix: null,
+            targetPrefix: null,
+            dirTasks: null,
+            replacePath: {}
         });
 
         //force dirTasks to always be an array
         if (options.dirTasks && !Array.isArray(options.dirTasks)) {
             options.dirTasks = [options.dirTasks];
         }
 
+        //targetPrefix must be a string
         if (options.targetPrefix && !_.isString(options.targetPrefix)) {
             grunt.warn('Option targetPrefix must be a string');
             options.targetPrefix = null;
         }
 
+        //if targetPrefix exists - make sure it ends with a /
+        if (options.targetPrefix && options.targetPrefix.slice(-1) !== '/') {
+            options.targetPrefix += '/';
+        }
+
         if (options.prefix && !_.isString(options.prefix)) {
             grunt.warn('Option prefix must be a string');
             options.prefix = null;
         }
 
+        if (options.prefix && options.prefix.slice(-1) !== '/') {
+            options.prefix += '/';
+        }
+
         var extractedTargets = jadeUsemin.iterateFiles(this.files, options);
 
         //rules:

test/fixtures/withPrefixNoSlash.jade

@@ -0,0 +1,3 @@
+//-<!-- build:js compiled/jquery.min.js -->
+script(src='/src/script1.js')
+//-<!-- endbuild -->

test/test.js

@@ -62,6 +62,15 @@ exports.jadeUsemin = {
         test.ok(/jquery.min.(\w+).js/.test(filename));
         test.done();
     },
+    withPrefixNoSlash: function (test) {
+        test.expect(2);
+        var layout = grunt.file.read('test/compiled/withPrefixNoSlash.jade');
+        test.ok(/compiled\/jquery\.min\.(\w+)\.js/.test(layout));
+        var filename = grunt.file.expand('test/compiled/jquery.min.*.js')[0];
+        filename = path.basename(filename);
+        test.ok(/jquery.min.(\w+).js/.test(filename));
+        test.done();
+    },
     windowsPaths: function (test) {
         test.expect(1);