From 392ff15ee1d6a42620063ed6f5a0c4ca9ef14dbf Mon Sep 17 00:00:00 2001
From: Mikael Selander <ciddan@gmail.com>
Date: Thu, 7 Feb 2013 13:56:35 +0100
Subject: [PATCH 1/2] Added replace capability to the wrap-injector. Removed
 test/actual-files. Those should not have been checked in.

---
 Gruntfile.coffee                  | 20 ++++++++++++++++++--
 README.md                         | 11 +++++++++--
 package.json                      |  6 +++---
 tasks/template.coffee             | 15 ++++++++++-----
 test/actual/concat.html           |  3 ---
 test/actual/main.html             |  3 ---
 test/actual/wrapped.html          |  5 -----
 test/actual/wrappedAdv.html       |  5 -----
 test/actual/wrappedConcat.html    |  7 -------
 test/expected/wrappedReplace.html |  5 +++++
 test/template-test.coffee         |  8 ++++++++
 11 files changed, 53 insertions(+), 35 deletions(-)
 delete mode 100644 test/actual/concat.html
 delete mode 100644 test/actual/main.html
 delete mode 100644 test/actual/wrapped.html
 delete mode 100644 test/actual/wrappedAdv.html
 delete mode 100644 test/actual/wrappedConcat.html
 create mode 100644 test/expected/wrappedReplace.html

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 056f306..ea1a5e0 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -68,6 +68,22 @@ module.exports = (grunt) ->
               prop: 'dest'
               rem:  'test/'
             }]
+      advWrapReplace:
+        files:
+          'test/actual/wrappedReplace.html': 'test/source/main.template'
+        options:
+          data:
+            message: 'WrapReplace'
+            class: 'foo'
+          wrap:
+            banner: '<wrapped id="#{0}">\n'
+            footer: '\n</wrapped>'
+            inject: [{
+              prop: 'src'
+              rem:  'test/'
+              repl:
+                ".template": ".html"
+            }]
 
 
     coffeelintOptions:
@@ -101,7 +117,7 @@ module.exports = (grunt) ->
   grunt.registerTask 'mocha', 'run mocha', () ->
     done = grunt.task.current.async()
     require('child_process').exec(
-      'mocha --compilers coffee:coffee-script -R nyan'
+      'mocha --compilers coffee:coffee-script -R spec'
       , (err, stdout) ->
         grunt.log.write stdout
         done err
@@ -112,5 +128,5 @@ module.exports = (grunt) ->
     'coffeelint'
     'template'
     'mocha'
-    
+    'clean'
   ]
\ No newline at end of file
diff --git a/README.md b/README.md
index 21dc3a1..f1d8492 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,11 @@ Wrap the template with a banner and footer.
 Type: `Object`
 Default: `{}`
 
-It is possible to inject file-path related data into the banner or footer of the wrapper. This is useful if you're wrapping your template with a script-tag, such as `<script type="text/ng-template" src="path/of/view.html">`. At the moment there are two values that are available to inject: `'src'` and `'dest'`. `'src'` represents the path to the template file, `'dest'` the path to the processed output file. Should you want to remove any part of the `'src'` or `'dest'` paths you can do so by specifying the `rem` property. The injection points are specified using positional markers, as such: `foo #{0} bar #{1}`.
+It is possible to inject file-path related data into the banner or footer of the wrapper. This is useful if you're wrapping your template with a script-tag, such as `<script type="text/ng-template" src="path/of/view.html">`. At the moment there are two values that are available to inject: `'src'` and `'dest'`. `'src'` represents the path to the template file, `'dest'` the path to the processed output file. The injection points are specified using positional markers, as such: `foo #{0} bar #{1}`.
+
+Should you want to remove any part of the `'src'` or `'dest'` paths you can do so by specifying the `rem` property.
+
+Additionally, you can substring replace any number of parts of the injected string by specifying the `repl` property as a list of key/value pairs.
 
 ### Usage Examples
 
@@ -52,7 +56,10 @@ template: {
           prop: 'src'
         }, {
           prop: 'dest',
-          rem:  '/unwanted/path'
+          rem:  '/unwanted/path',
+          repl: {
+            ".wrongExtension": ".rightExtension"
+          }
         }]
       }
     },
diff --git a/package.json b/package.json
index dbde281..35af53f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-template-helper",
   "description": "Grunt template processor and wrapper",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "homepage": "https://github.com/ciddan/grunt-template-helper",
   "author": {
     "name": "Mikael Selander",
@@ -32,8 +32,8 @@
     "grunt-contrib-coffee": "0.4.0rc7",
     "chai": ">= 1.5.x"
   },
-  "_id": "grunt-template-helper@0.0.2",
-  "_from": "grunt-template-helper0.0.1",
+  "_id": "grunt-template-helper@0.1.0",
+  "_from": "grunt-template-helper0.0.2",
   "keywords": [
     "gruntplugin",
     "grunttemplate",
diff --git a/tasks/template.coffee b/tasks/template.coffee
index 96f1450..e628452 100644
--- a/tasks/template.coffee
+++ b/tasks/template.coffee
@@ -31,22 +31,27 @@ module.exports = (grunt) ->
 
     try
       wrap = options.wrap?.banner? and options.wrap?.footer?
+      inject = wrap and options.wrap.inject?.length >= 1
+
       processed = grunt.template.process src, options
       processed = "#{options.wrap.banner}#{processed}#{options.wrap.footer}" if wrap
 
-      if wrap and options.wrap.inject? and options.wrap.inject.length >= 1
+      if wrap and inject
         for inj, pos in options.wrap.inject
-          inj.rem ?= ''
+          inj.rem  ?= ''
+          inj.repl ?= {}
 
           switch inj.prop
             when 'src'
               inject = filepath.replace inj.rem, ''
-              processed = processed.replace('#{' + pos + '}', inject)
             when 'dest'
               inject = dest.replace inj.rem, ''
-              processed = processed.replace('#{' + pos + '}', inject)
-
+            else
+              inject = '#{' + pos + '}'
+              grunt.log.warn 'Invalid inject property supplied, not replacing positional marker'
 
+          inject = inject.replace k, v for k, v of inj.repl
+          processed = processed.replace('#{' + pos + '}', inject)
 
       return processed
     catch e
diff --git a/test/actual/concat.html b/test/actual/concat.html
deleted file mode 100644
index 522b30c..0000000
--- a/test/actual/concat.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="foo">
-  <h1>Concat</h1>
-</div>
\ No newline at end of file
diff --git a/test/actual/main.html b/test/actual/main.html
deleted file mode 100644
index 5c1d3f9..0000000
--- a/test/actual/main.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="foo">
-  <h1>Single</h1>
-</div>
\ No newline at end of file
diff --git a/test/actual/wrapped.html b/test/actual/wrapped.html
deleted file mode 100644
index 6ced960..0000000
--- a/test/actual/wrapped.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wrapped>
-<div class="foo">
-  <h1>Wrap</h1>
-</div>
-</wrapped>
\ No newline at end of file
diff --git a/test/actual/wrappedAdv.html b/test/actual/wrappedAdv.html
deleted file mode 100644
index 7429fab..0000000
--- a/test/actual/wrappedAdv.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wrapped id="actual/wrappedAdv.html">
-<div class="foo">
-  <h1>Wrap</h1>
-</div>
-</wrapped>
\ No newline at end of file
diff --git a/test/actual/wrappedConcat.html b/test/actual/wrappedConcat.html
deleted file mode 100644
index 6782d9a..0000000
--- a/test/actual/wrappedConcat.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<wrapped id="actual/wrappedConcat.html">
-<div class="foo">
-</wrapped>
-<wrapped id="actual/wrappedConcat.html">
-  <h1>WrapConcat</h1>
-</div>
-</wrapped>
\ No newline at end of file
diff --git a/test/expected/wrappedReplace.html b/test/expected/wrappedReplace.html
new file mode 100644
index 0000000..0d2fedd
--- /dev/null
+++ b/test/expected/wrappedReplace.html
@@ -0,0 +1,5 @@
+<wrapped id="source/main.html">
+<div class="foo">
+  <h1>WrapReplace</h1>
+</div>
+</wrapped>
\ No newline at end of file
diff --git a/test/template-test.coffee b/test/template-test.coffee
index 1f3c77e..ca7abc6 100644
--- a/test/template-test.coffee
+++ b/test/template-test.coffee
@@ -51,4 +51,12 @@ describe 'Task template', ->
     expected = grunt.file.read './test/expected/wrappedConcat.html'
     actual = grunt.file.read './test/actual/wrappedConcat.html'
 
+    assert.strictEqual actual, expected
+
+  it 'should be able to replace part of an injected value', ->
+    assert.isTrue grunt.file.exists './test/actual/wrappedReplace.html'
+
+    expected = grunt.file.read './test/expected/wrappedReplace.html'
+    actual = grunt.file.read './test/actual/wrappedReplace.html'
+
     assert.strictEqual actual, expected
\ No newline at end of file

From 1fded96c7d83debe3e03f71cd3119c8b34bb5967 Mon Sep 17 00:00:00 2001
From: Mikael Selander <ciddan@gmail.com>
Date: Thu, 7 Feb 2013 13:59:10 +0100
Subject: [PATCH 2/2] Fixed inject-section indentation in the readme.

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f1d8492..b2ca2fc 100644
--- a/README.md
+++ b/README.md
@@ -53,12 +53,12 @@ template: {
         banner: '<script type="text/ng-template" from="#{0}" to="#{1}"></script>',
         footer: '</script>',
         inject: [{
-          prop: 'src'
-        }, {
-          prop: 'dest',
-          rem:  '/unwanted/path',
-          repl: {
-            ".wrongExtension": ".rightExtension"
+            prop: 'src'
+          }, {
+            prop: 'dest',
+            rem:  '/unwanted/path',
+            repl: {
+              ".wrongExtension": ".rightExtension"
           }
         }]
       }