Merge pull request #134 from kitcheck/expand-cwd

Fixes `cwd` being part of the $templateCache string when `expand:true`

Gruntfile.js

@@ -216,6 +216,15 @@ module.exports = function(grunt) {
         dest: 'tmp/relative_url.js'
       },
 
+      // URLs should match path, sans the `cwd`
+      relative_url_expand: {
+        expand: true,
+        cwd: 'test/fixtures',
+        src: ['three/**/*.html'],
+        dest: 'tmp',
+        ext: '.js'
+      },
+
       // Customize URLs to not have an extension
       custom_url:  {
         src: ['test/fixtures/one.html', 'test/fixtures/two/**/*.html'],

tasks/angular-templates.js

@@ -40,7 +40,10 @@ module.exports = function(grunt) {
         grunt.log.warn('No templates found');
       }
 
-      var compiler  = new Compiler(grunt, options, file.cwd);
+      var expanded = file.orig.expand;
+      var cwd = file.orig.expand ? file.orig.cwd : file.cwd;
+
+      var compiler  = new Compiler(grunt, options, cwd, expanded);
       var appender  = new Appender(grunt);
       var modules   = compiler.modules(file.src);
       var compiled  = [];

tasks/lib/compiler.js

@@ -18,7 +18,7 @@ var Url     = require('url');
  * @param  {String} cwd     Determines if paths are relative or not
  * @return {Object}
  */
-var Compiler = function(grunt, options, cwd) {
+var Compiler = function(grunt, options, cwd, expanded) {
 
   /**
    * Wrap individual cache registration script in bootstrap function
@@ -44,6 +44,10 @@ var Compiler = function(grunt, options, cwd) {
       path = path.replace(/\/?$/, '/');
     }
 
+    if(cwd && expanded){
+      url = url.replace(cwd, '').replace(/^\//,'');
+    }
+
     // Append formatted URL
     path += Url.format( Url.parse( url.replace(/\\/g, '/') ) );
 
@@ -166,7 +170,7 @@ var Compiler = function(grunt, options, cwd) {
    * @return {String}       Template path
    */
   this.path = function(file) {
-    if (cwd) {
+    if (cwd && !expanded) {
       return cwd + '/' + file;
     }
 

test/angular-templates_test.js

@@ -165,6 +165,22 @@ exports.ngtemplates = {
     test.done();
   },
 
+  relative_url_expand: function(test) {
+    test.expect(2);
+
+    var actual    = grunt.file.read('tmp/three/three.js');
+    var expected  = grunt.file.read('test/expected/relative_url_expand_three.js');
+
+    test.equal(expected, actual);
+
+    actual    = grunt.file.read('tmp/three/three_two.js');
+    expected  = grunt.file.read('test/expected/relative_url_expand_three_two.js');
+
+    test.equal(expected, actual);
+
+    test.done();
+  },
+
   custom_url: function(test) {
     test.expect(1);
 

test/expected/relative_url_expand_three.js

@@ -0,0 +1,12 @@
+angular.module('relative_url_expand').run(['$templateCache', function($templateCache) {
+  'use strict';
+
+  $templateCache.put('three/three.html',
+    "<h2>Three</h2>\n" +
+    "\n" +
+    "<!-- Comment for three -->\n" +
+    "\n" +
+    "<textarea readonly=\"readonly\">We are three.</textarea>\n"
+  );
+
+}]);

test/expected/relative_url_expand_three_two.js

@@ -0,0 +1,12 @@
+angular.module('relative_url_expand').run(['$templateCache', function($templateCache) {
+  'use strict';
+
+  $templateCache.put('three/three_two.html',
+    "<h2>Three Two</h2>\n" +
+    "\n" +
+    "<!-- Comment for three two -->\n" +
+    "\n" +
+    "<textarea readonly=\"readonly\">We are three two.</textarea>\n"
+  );
+
+}]);

test/fixtures/three/three.html

@@ -0,0 +1,5 @@
+<h2>Three</h2>
+
+<!-- Comment for three -->
+
+<textarea readonly="readonly">We are three.</textarea>

test/fixtures/three/three_two.html

@@ -0,0 +1,5 @@
+<h2>Three Two</h2>
+
+<!-- Comment for three two -->
+
+<textarea readonly="readonly">We are three two.</textarea>