allow to set template compiler

Closes gh-34.

.gitattributes

@@ -0,0 +1,2 @@
+# Automatically normalize line endings for all text-based files
+* text=crlf

.jshintrc

@@ -0,0 +1,13 @@
+{
+  "curly": true,
+  "eqeqeq": true,
+  "immed": true,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "sub": true,
+  "undef": true,
+  "boss": true,
+  "eqnull": true,
+  "node": true
+}

.travis.yml

@@ -1,3 +1,6 @@
 language: node_js
 node_js:
-  - 0.8
+  - "0.8"
+  - "0.10"
+before_script:
+  - npm install -g grunt-cli

AUTHORS

@@ -1,4 +1,5 @@
 Tim Branyen (http://tbranyen.com)
 Tyler Kellen (http://goingslowly.com/)
 Chris Talkington (http://christalkington.com/)
-Larry Davis (http://lazd.net/)
+Larry Davis (http://lazd.net/)
+Adrien Antoine (http://adriantoine.com/)

CHANGELOG

@@ -1,8 +1,30 @@
-v0.3.2:
+v0.5.1:
-  date: 2012-10-13
+  date: 2013-07-14
   changes:
-    - Add prettify option
+    - Display filepath when fails to compile.
-    - Add amdWrapper option
+v0.5.0:
+  date: 2013-03-06
+  changes:
+    - When `namespace` is false and `amd` is true, return templates directly from AMD wrapper.
+    - Rename `amdwrapper` option to `amd` to match grunt-contrib-handlebars.
+v0.4.1:
+  date: 2013-02-15
+  changes:
+    - First official release for Grunt 0.4.0.
+v0.4.1rc7:
+  date: 2012-01-29
+  changes:
+    - Correct line endings for lodash output on windows.
+v0.4.0rc7:
+  date: 2013-01-23
+  changes:
+    - Updating grunt/gruntplugin dependencies to rc7.
+    - Changing in-development grunt/gruntplugin dependency versions from tilde version ranges to specific versions.
+v0.4.0rc5:
+  date: 2013-01-09
+  changes:
+    - Updating to work with grunt v0.4.0rc5.
+    - Switching to this.files api.
 v0.3.1:
   date: 2012-10-12
   changes:
@@ -22,4 +44,4 @@ v0.2.2:
 v0.2.0:
   date: 2012-08-10
   changes:
-    - Refactored from grunt-contrib into individual repo.
+    - Refactored from grunt-contrib into individual repo.

CONTRIBUTING.md

@@ -0,0 +1 @@
+Please see the [Contributing to grunt](http://gruntjs.com/contributing) guide for information on contributing to this project.

Gruntfile.js

@@ -0,0 +1,163 @@
+/*
+ * grunt-contrib-jst
+ * http://gruntjs.com/
+ *
+ * Copyright (c) 2013 Tim Branyen, contributors
+ * Licensed under the MIT license.
+ */
+
+'use strict';
+
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    jshint: {
+      all: [
+        'Gruntfile.js',
+        'tasks/*.js',
+        '<%= nodeunit.tests %>'
+      ],
+      options: {
+        jshintrc: '.jshintrc'
+      }
+    },
+
+    // Before generating any new files, remove any previously-created files.
+    clean: {
+      test: ['tmp']
+    },
+
+    // Configuration to be run (and then tested).
+    jst: {
+      compile: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          }
+        },
+        files: {
+          "tmp/jst.js": ["test/fixtures/template.html"]
+        }
+      },
+      pretty_amd: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          prettify: true,
+          amd: true
+        },
+        files: {
+          "tmp/pretty_amd.js": ["test/fixtures/template.html"]
+        }
+      },
+      prettify: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          prettify: true
+        },
+        files: {
+          "tmp/pretty.js": ["test/fixtures/template.html"]
+        }
+      },
+      amd_wrapper: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          amd:true
+        },
+        files: {
+          "tmp/amd_wrapper.js": ["test/fixtures/template.html"]
+        }
+      },
+      amd_wrapper_no_ns: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          amd:true,
+          namespace:false
+        },
+        files: {
+          "tmp/amd_wrapper_no_ns.js": ["test/fixtures/template.html"]
+        }
+      },
+      uglyfile: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+        },
+        files: {
+          "tmp/uglyfile.js": ["test/fixtures/*bad-filename*"]
+        }
+      },
+      ns_nested: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          namespace: "MyApp.JST.Main"
+        },
+        files: {
+          "tmp/ns_nested.js": ["test/fixtures/template.html"]
+        }
+      },
+      ns_nested_this: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          namespace: "this.MyApp.JST.Main"
+        },
+        files: {
+          "tmp/ns_nested_this.js": ["test/fixtures/template.html"]
+        }
+      },
+      process_content: {
+        options: {
+          templateSettings: {
+            variable: 'obj'
+          },
+          processContent: function (src) {
+            return src.replace(/(^\s+|\s+$)/gm, '');
+          }
+        },
+        files: {
+          "tmp/process_content.js": ["test/fixtures/indent_template.html"]
+        }
+      },
+      local_scope: {
+        files: {
+          "tmp/local_scope.js": ["test/fixtures/template_local_scope.html"]
+        }
+      }
+    },
+
+    // Unit tests.
+    nodeunit: {
+      tests: ['test/*_test.js']
+    }
+  });
+
+  // Actually load this plugin's task(s).
+  grunt.loadTasks('tasks');
+
+  // These plugins provide necessary tasks.
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-nodeunit');
+  grunt.loadNpmTasks('grunt-contrib-internal');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  // Whenever the "test" task is run, first clean the "tmp" dir, then run this
+  // plugin's task(s), then test the result.
+  grunt.registerTask('test', ['clean', 'jst', 'nodeunit']);
+
+  // By default, lint and run all tests.
+  grunt.registerTask('default', ['jshint', 'test', 'build-contrib']);
+
+};

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Tim Branyen, contributors
+Copyright (c) 2013 Tim Branyen, contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -1,116 +1,168 @@
-# grunt-contrib-jst [![Build Status](https://secure.travis-ci.org/gruntjs/grunt-contrib-jst.png?branch=master)](http://travis-ci.org/gruntjs/grunt-contrib-jst)
+# grunt-contrib-jst v0.5.1 [![Build Status](https://travis-ci.org/gruntjs/grunt-contrib-jst.png?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jst)
-
+
-> Compile underscore templates to JST file.
+> Precompile Underscore templates to JST file.
-
+
-## Getting Started
+
-Install this grunt plugin next to your project's [grunt.js gruntfile][getting_started] with: `npm install grunt-contrib-jst`
+
-
+## Getting Started
-Then add this line to your project's `grunt.js` gruntfile:
+This plugin requires Grunt `~0.4.0`
-
+
-```javascript
+If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
-grunt.loadNpmTasks('grunt-contrib-jst');
+
-```
+```shell
-
+npm install grunt-contrib-jst --save-dev
-[grunt]: https://github.com/gruntjs/grunt
+```
-[getting_started]: https://github.com/gruntjs/grunt/blob/master/docs/getting_started.md
+
-
+Once the plugin has been installed, it may be enabled inside your Gruntfile with this line of JavaScript:
-### Overview
+
-
+```js
-This task compiles Underscore compatible templates into functions that can be concatenated and minified with existing source files.
+grunt.loadNpmTasks('grunt-contrib-jst');
-
+```
-Inside your `grunt.js` file, add a section named `jst`. This section specifies the files to compile and the options passed to [underscore.template](http://underscorejs.org/#template).
+
-
+*This plugin was designed to work with Grunt 0.4.x. If you're still using grunt v0.3.x it's strongly recommended that [you upgrade](http://gruntjs.com/upgrading-from-0.3-to-0.4), but in case you can't please use [v0.3.1](https://github.com/gruntjs/grunt-contrib-jst/tree/grunt-0.3-stable).*
-#### Parameters
+
-
+
-##### files ```object```
+
-
+## Jst task
-This defines what files this task will process and should contain key:value pairs.
+_Run this task with the `grunt jst` command._
-
+
-The key (destination) should be an unique filepath (supports [grunt.template](https://github.com/gruntjs/grunt/blob/master/docs/api_template.md)) and the value (source) should be a filepath or an array of filepaths (supports [minimatch](https://github.com/isaacs/minimatch)).
+Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide.
-
+
-Note: Values are precompiled to the namespaced JST array in the order passed.
+_This plugin uses [the Lo-Dash library](http://lodash.com/) to generate JavaScript template functions. Some developers generate template functions dynamically during development. If you are doing so, please be aware that the functions generated by this plugin may differ from those created at run-time. For instance, [the Underscore.js library](http://underscorejs.org/) will throw an exception if templates reference undefined top-level values, while Lo-Dash will silently insert an empty string in their place._
-
+### Options
-##### options ```object```
+
-
+#### separator
-This controls how this task (and its helpers) operate and should contain key:value pairs, see options below.
+Type: `String`
-
+Default: linefeed + linefeed
-#### Options
+
-
+Concatenated files will be joined on this string.
-##### namespace ```string```
+
-
+#### namespace
-The namespace in which the precompiled templates will be asssigned (default is JST).  *Use dot notation (e.g. App.Templates) for nested namespaces.*
+Type: `String`
-
+Default: 'JST'
-Example:
+
-``` javascript
+The namespace in which the precompiled templates will be assigned. Use dot notation (e.g. App.Templates) for nested namespaces or false for no namespace wrapping. When false with amd option set true, templates will be returned directly from the AMD wrapper.
-options: {
+
-  namespace: 'JST'
+#### processName
-}
+Type: `function`
-```
+Default: null
-
+
-##### prettify ```boolean```
+This option accepts a function which takes one argument (the template filepath) and returns a string which will be used as the key for the precompiled template object.  The example below stores all templates on the default JST namespace in capital letters.
-
+
-When doing a quick once-over of your compiled template file, it's nice to see
+```js
-an easy-to-read format that has one line per template. This will accomplish
+options: {
-that.
+  processName: function(filename) {
-
+    return filename.toUpperCase();
-Example:
+  }
-```javascript
+}
-options: {
+```
-  prettify: true
+
-}
+#### templateSettings
-```
+Type: `Object`
-
+Default: null
-##### amdWrapper ```boolean```
+
-
+The settings passed to underscore when compiling templates.
-With Require.js and a pre-compiled template.js you want the templates to be
+
-wrapped in a define. This will wrap the output in:
+```js
-``` javascript
+jst: {
-define(function() {
+  compile: {
-  //Templates
+    options: {
-  return this["NAMESPACE"];
+      templateSettings: {
-});
+        interpolate : /\{\{(.+?)\}\}/g
-```
+      }
-
+    },
-Example:
+    files: {
-``` javascript
+      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
-options: {
+    }
-  amdWrapper: true
+  }
-}
+}
-```
+```
-
+
-##### processName ```function```
+#### prettify
-
+Type: `boolean`
-This option accepts a function which takes one argument (the template filepath) and returns a string which will be used as the key for the precompiled template object.  The example below stores all templates on the default JST namespace in capital letters.
+Default: false
-
+
-``` javascript
+When doing a quick once-over of your compiled template file, it's nice to see
-options: {
+an easy-to-read format that has one line per template. This will accomplish
-  processName: function(filename) {
+that.
-    return filename.toUpperCase();
+
-  }
+```js
-}
+options: {
-```
+  prettify: true
-
+}
-##### templateSettings ```object```
+```
-
+
-The settings passed to underscore when compiling templates.
+#### amd
-
+Type: `boolean`
-#### Config Examples
+Default: false
-
+
-``` javascript
+Wraps the output file with an AMD define function and returns the compiled template namespace unless namespace has been explicitly set to false in which case the template function will be returned directly.
-jst: {
+
-  compile: {
+```js
-    options: {
+define(function() {
-      templateSettings: {
+    //...//
-        interpolate : /\{\{(.+?)\}\}/g
+    return this['[template namespace]'];
-      }
+});
-    },
+```
-    files: {
+
-      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
+Example:
-    }
+```js
-  }
+options: {
-}
+  amd: true
-```
+}
-
+```
---
+
-
+#### processContent
-*Task submitted by [Tim Branyen](http://github.com/tbranyen).*
+Type: `function`
+
+This option accepts a function which takes one argument (the file content) and
+returns a string which will be used as template string.
+The example below strips whitespace characters from the beginning and the end of
+each line.
+
+```js
+options: {
+  processContent: function(src) {
+    return src.replace(/(^\s+|\s+$)/gm, '');
+  }
+}
+```
+
+### Usage Examples
+
+```js
+jst: {
+  compile: {
+    options: {
+      templateSettings: {
+        interpolate : /\{\{(.+?)\}\}/g
+      }
+    },
+    files: {
+      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
+    }
+  }
+}
+```
+Note that the `interpolate: /\{\{(.+?)\}\}/g` setting above is simply an example of overwriting lodash's default interpolation. If you want to parse templates with the default `_.template` behavior (i.e. using `<div><%= this.id %></div>`), there's no need to overwrite `templateSettings.interpolate`.
+
+
+## Release History
+
+ * 2013-07-14   v0.5.1   Display filepath when fails to compile.
+ * 2013-03-06   v0.5.0   When `namespace` is false and `amd` is true, return templates directly from AMD wrapper. Rename `amdwrapper` option to `amd` to match grunt-contrib-handlebars.
+ * 2013-02-15   v0.4.1   First official release for Grunt 0.4.0.
+ * 2012-01-29   v0.4.1rc7   Correct line endings for lodash output on windows.
+ * 2013-01-23   v0.4.0rc7   Updating grunt/gruntplugin dependencies to rc7. Changing in-development grunt/gruntplugin dependency versions from tilde version ranges to specific versions.
+ * 2013-01-09   v0.4.0rc5   Updating to work with grunt v0.4.0rc5. Switching to this.files api.
+ * 2012-10-12   v0.3.1   Rename grunt-contrib-lib dep to grunt-lib-contrib.
+ * 2012-08-23   v0.3.0   Options no longer accepted from global config key.
+ * 2012-08-16   v0.2.3   Support for nested namespaces.
+ * 2012-08-12   v0.2.2   Added processName functionality & escaping single quotes in filenames.
+ * 2012-08-10   v0.2.0   Refactored from grunt-contrib into individual repo.
+
+---
+
+Task submitted by [Tim Branyen](http://tbranyen.com)
+
+*This file was generated on Sat Oct 19 2013 14:22:27.*

docs/jst-examples.md

@@ -0,0 +1,17 @@
+# Usage Examples
+
+```js
+jst: {
+  compile: {
+    options: {
+      templateSettings: {
+        interpolate : /\{\{(.+?)\}\}/g
+      }
+    },
+    files: {
+      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
+    }
+  }
+}
+```
+Note that the `interpolate: /\{\{(.+?)\}\}/g` setting above is simply an example of overwriting lodash's default interpolation. If you want to parse templates with the default `_.template` behavior (i.e. using `<div><%= this.id %></div>`), there's no need to overwrite `templateSettings.interpolate`.

docs/jst-options.md

@@ -0,0 +1,98 @@
+# Options
+
+## separator
+Type: `String`
+Default: linefeed + linefeed
+
+Concatenated files will be joined on this string.
+
+## namespace
+Type: `String`
+Default: 'JST'
+
+The namespace in which the precompiled templates will be assigned. Use dot notation (e.g. App.Templates) for nested namespaces or false for no namespace wrapping. When false with amd option set true, templates will be returned directly from the AMD wrapper.
+
+## processName
+Type: `function`
+Default: null
+
+This option accepts a function which takes one argument (the template filepath) and returns a string which will be used as the key for the precompiled template object.  The example below stores all templates on the default JST namespace in capital letters.
+
+```js
+options: {
+  processName: function(filename) {
+    return filename.toUpperCase();
+  }
+}
+```
+
+## templateSettings
+Type: `Object`
+Default: null
+
+The settings passed to underscore when compiling templates.
+
+```js
+jst: {
+  compile: {
+    options: {
+      templateSettings: {
+        interpolate : /\{\{(.+?)\}\}/g
+      }
+    },
+    files: {
+      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
+    }
+  }
+}
+```
+
+## prettify
+Type: `boolean`
+Default: false
+
+When doing a quick once-over of your compiled template file, it's nice to see
+an easy-to-read format that has one line per template. This will accomplish
+that.
+
+```js
+options: {
+  prettify: true
+}
+```
+
+## amd
+Type: `boolean`
+Default: false
+
+Wraps the output file with an AMD define function and returns the compiled template namespace unless namespace has been explicitly set to false in which case the template function will be returned directly.
+
+```js
+define(function() {
+    //...//
+    return this['[template namespace]'];
+});
+```
+
+Example:
+```js
+options: {
+  amd: true
+}
+```
+
+## processContent
+Type: `function`
+
+This option accepts a function which takes one argument (the file content) and
+returns a string which will be used as template string.
+The example below strips whitespace characters from the beginning and the end of
+each line.
+
+```js
+options: {
+  processContent: function(src) {
+    return src.replace(/(^\s+|\s+$)/gm, '');
+  }
+}
+```

docs/jst-overview.md

@@ -0,0 +1,3 @@
+Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide.
+
+_This plugin uses [the Lo-Dash library](http://lodash.com/) to generate JavaScript template functions. Some developers generate template functions dynamically during development. If you are doing so, please be aware that the functions generated by this plugin may differ from those created at run-time. For instance, [the Underscore.js library](http://underscorejs.org/) will throw an exception if templates reference undefined top-level values, while Lo-Dash will silently insert an empty string in their place._

docs/options.md

@@ -1,87 +0,0 @@
-##### files ```object```
-
-This defines what files this task will process and should contain key:value pairs.
-
-The key (destination) should be an unique filepath (supports [grunt.template](https://github.com/gruntjs/grunt/blob/master/docs/api_template.md)) and the value (source) should be a filepath or an array of filepaths (supports [minimatch](https://github.com/isaacs/minimatch)).
-
-Note: Values are precompiled to the namespaced JST array in the order passed.
-
-##### options ```object```
-
-This controls how this task (and its helpers) operate and should contain key:value pairs, see options below.
-
-#### Options
-
-##### namespace ```string```
-
-The namespace in which the precompiled templates will be asssigned (default is JST).  *Use dot notation (e.g. App.Templates) for nested namespaces.*
-
-Example:
-```js
-options: {
-  namespace: 'JST'
-}
-```
-##### prettify ```boolean```
-
-When doing a quick once-over of your compiled template file, it's nice to see
-an easy-to-read format that has one line per template. This will accomplish
-that.
-
-Example:
-```javascript
-options: {
-  prettify: true
-}
-```
-
-##### amdWrapper ```boolean```
-
-With Require.js and a pre-compiled template.js you want the templates to be
-wrapped in a define. This will wrap the output in:
-``` javascript
-define(function() {
-  //Templates
-  return this["NAMESPACE"];
-});
-```
-
-Example:
-``` javascript
-options: {
-  amdWrapper: true
-}
-```
-
-##### processName ```function```
-
-This option accepts a function which takes one argument (the template filepath) and returns a string which will be used as the key for the precompiled template object.  The example below stores all templates on the default JST namespace in capital letters.
-
-```js
-options: {
-  processName: function(filename) {
-    return filename.toUpperCase();
-  }
-}
-```
-
-##### templateSettings ```object```
-
-The settings passed to underscore when compiling templates.
-
-#### Config Examples
-
-```js
-jst: {
-  compile: {
-    options: {
-      templateSettings: {
-        interpolate : /\{\{(.+?)\}\}/g
-      }
-    },
-    files: {
-      "path/to/compiled/templates.js": ["path/to/source/**/*.html"]
-    }
-  }
-}
-```

docs/overview.md

@@ -1 +1 @@
-This task compiles Underscore compatible templates into functions that can be concatenated and minified with existing source files.
+*This plugin was designed to work with Grunt 0.4.x. If you're still using grunt v0.3.x it's strongly recommended that [you upgrade](http://gruntjs.com/upgrading-from-0.3-to-0.4), but in case you can't please use [v0.3.1](https://github.com/gruntjs/grunt-contrib-jst/tree/grunt-0.3-stable).*

grunt.js

@@ -1,114 +0,0 @@
-/*
- * grunt-contrib-jst
- * http://gruntjs.com/
- *
- * Copyright (c) 2012 Tim Branyen, contributors
- * Licensed under the MIT license.
- */
-
-module.exports = function(grunt) {
-  'use strict';
-
-  // Project configuration.
-  grunt.initConfig({
-    lint: {
-      all: ['grunt.js', 'tasks/*.js', '<config:nodeunit.tasks>']
-    },
-
-    jshint: {
-      options: {
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        node: true,
-        es5: true
-      }
-    },
-
-    // Before generating any new files, remove any previously-created files.
-    clean: {
-      test: ['tmp']
-    },
-
-    // Configuration to be run (and then tested).
-    jst: {
-      compile: {
-        files: {
-          "tmp/jst.js": ["test/fixtures/template.html"]
-        }
-      },
-      pretty_amd: {
-        options: {
-          prettify: true,
-          amdWrapper: true
-        },
-        files: {
-          "tmp/pretty_amd.js": ["test/fixtures/template.html"]
-        }
-      },
-      prettify: {
-        options: {
-          prettify: true
-        },
-        files: {
-          "tmp/pretty.js": ["test/fixtures/template.html"]
-        }
-      },
-      amd_wrapper: {
-        options: {
-          amdWrapper:true
-        },
-        files: {
-          "tmp/amd_wrapper.js": ["test/fixtures/template.html"]
-        }
-      },
-      uglyfile: {
-        files: {
-          "tmp/uglyfile.js": ["test/fixtures/*bad-filename*"]
-        }
-      },
-      ns_nested: {
-        options: {
-          namespace: "MyApp.JST.Main"
-        },
-        files: {
-          "tmp/ns_nested.js": ["test/fixtures/template.html"]
-        }
-      },
-      ns_nested_this: {
-        options: {
-          namespace: "this.MyApp.JST.Main"
-        },
-        files: {
-          "tmp/ns_nested_this.js": ["test/fixtures/template.html"]
-        }
-      }
-    },
-
-    // Unit tests.
-    nodeunit: {
-      tasks: ['test/*_test.js']
-    }
-  });
-
-  // Actually load this plugin's task(s).
-  grunt.loadTasks('tasks');
-
-  // The clean plugin helps in testing.
-  grunt.loadNpmTasks('grunt-contrib-clean');
-
-  // Whenever the "test" task is run, first clean the "tmp" dir, then run this
-  // plugin's task(s), then test the result.
-  grunt.renameTask('test', 'nodeunit');
-  grunt.registerTask('test', 'clean jst nodeunit');
-
-  // By default, lint and run all tests.
-  grunt.registerTask('default', 'lint test');
-};

package.json

@@ -1,41 +1,50 @@
-{
+{
-  "name": "grunt-contrib-jst",
+  "name": "grunt-contrib-jst",
-  "description": "Precompile Underscore templates to JST file.",
+  "description": "Precompile Underscore templates to JST file.",
-  "version": "0.3.2",
+  "version": "0.5.1",
-  "homepage": "https://github.com/gruntjs/grunt-contrib-jst",
+  "homepage": "https://github.com/gruntjs/grunt-contrib-jst",
-  "author": {
+  "author": {
-    "name": "Grunt Team",
+    "name": "Grunt Team",
-    "url": "http://gruntjs.com/"
+    "url": "http://gruntjs.com/"
-  },
+  },
-  "repository": {
+  "repository": {
-    "type": "git",
+    "type": "git",
-    "url": "git://github.com/gruntjs/grunt-contrib-jst.git"
+    "url": "git://github.com/gruntjs/grunt-contrib-jst.git"
-  },
+  },
-  "bugs": {
+  "bugs": {
-    "url": "https://github.com/gruntjs/grunt-contrib-jst/issues"
+    "url": "https://github.com/gruntjs/grunt-contrib-jst/issues"
-  },
+  },
-  "licenses": [
+  "licenses": [
-    {
+    {
-      "type": "MIT",
+      "type": "MIT",
-      "url": "https://github.com/gruntjs/grunt-contrib-jst/blob/master/LICENSE-MIT"
+      "url": "https://github.com/gruntjs/grunt-contrib-jst/blob/master/LICENSE-MIT"
-    }
+    }
-  ],
+  ],
-  "main": "grunt.js",
+  "engines": {
-  "engines": {
+    "node": ">= 0.8.0"
-    "node": ">= 0.8.0"
+  },
-  },
+  "scripts": {
-  "scripts": {
+    "test": "grunt test"
-    "test": "grunt test"
+  },
-  },
+  "dependencies": {
-  "dependencies": {
+    "lodash": "~1.0.0",
-    "underscore": "~1.3.3",
+    "grunt-lib-contrib": "~0.5.1"
-    "grunt-lib-contrib": "~0.3.0"
+  },
-  },
+  "devDependencies": {
-  "devDependencies": {
+    "grunt-contrib-jshint": "~0.6.0",
-    "grunt": "~0.3.15",
+    "grunt-contrib-nodeunit": "~0.2.0",
-    "grunt-contrib-clean": "~0.3.0"
+    "grunt-contrib-clean": "~0.4.1",
-  },
+    "grunt-contrib-internal": "~0.4.5",
-  "keywords": [
+    "grunt": "~0.4.0"
-    "gruntplugin"
+  },
-  ]
+  "peerDependencies": {
-}
+    "grunt": "~0.4.0"
+  },
+  "keywords": [
+    "gruntplugin"
+  ],
+  "files": [
+    "tasks",
+    "LICENSE-MIT"
+  ]
+}

tasks/jst.js

@@ -2,72 +2,94 @@
  * grunt-contrib-jst
  * http://gruntjs.com/
  *
- * Copyright (c) 2012 Tim Branyen, contributors
+ * Copyright (c) 2013 Tim Branyen, contributors
  * Licensed under the MIT license.
  */
 
-module.exports = function(grunt) {
+'use strict';
-  "use strict";
 
-  var _ = require("underscore");
+module.exports = function(grunt) {
-  var helpers = require('grunt-lib-contrib').init(grunt);
+
+  var _ = require('lodash');
 
   // filename conversion for templates
   var defaultProcessName = function(name) { return name; };
 
-  grunt.registerMultiTask("jst", "Compile underscore templates to JST file", function() {
+  grunt.registerMultiTask('jst', 'Compile underscore templates to JST file', function() {
-
+    var lf = grunt.util.linefeed;
-    var helpers = require("grunt-lib-contrib").init(grunt);
+    var helpers = require('grunt-lib-contrib').init(grunt);
-    var options = helpers.options(this, {namespace: "JST", templateSettings: {}});
+    var options = this.options({
+      namespace: 'JST',
+      templateSettings: {},
+      processContent: function (src) { return src; },
+      separator: lf + lf,
+      template: _.template
+    });
 
     // assign filename transformation functions
     var processName = options.processName || defaultProcessName;
 
-    grunt.verbose.writeflags(options, "Options");
+    var nsInfo;
+    if (options.namespace !== false) {
+      nsInfo = helpers.getNamespaceDeclaration(options.namespace);
+    }
 
-    // TODO: ditch this when grunt v0.4 is released
+    this.files.forEach(function(f) {
-    this.files = this.files || helpers.normalizeMultiTaskFiles(this.data, this.target);
+      var output = f.src.filter(function(filepath) {
-
+        // Warn on and remove invalid source files (if nonull was set).
-    var compiled, srcFiles, src, filename;
+        if (!grunt.file.exists(filepath)) {
-    var output = [];
+          grunt.log.warn('Source file "' + filepath + '" not found.');
-    var nsInfo = helpers.getNamespaceDeclaration(options.namespace);
+          return false;
-
+        } else {
-    this.files.forEach(function(files) {
+          return true;
-      srcFiles = grunt.file.expandFiles(files.src);
+        }
-      srcFiles.forEach(function(file) {
+      })
-        src = grunt.file.read(file);
+      .map(function(filepath) {
+        var src = options.processContent(grunt.file.read(filepath));
+        var compiled, filename;
 
         try {
-          compiled = _.template(src, false, options.templateSettings).source;
+          compiled = options.template(src, false, options.templateSettings).source;
         } catch (e) {
           grunt.log.error(e);
-          grunt.fail.warn("JST failed to compile.");
+          grunt.fail.warn('JST "' + filepath + '" failed to compile.');
         }
 
         if (options.prettify) {
-          compiled = compiled.replace(/\n+/g, '');
+          compiled = compiled.replace(new RegExp('\n', 'g'), '');
         }
-        filename = processName(file);
+        filename = processName(filepath);
-        output.push(nsInfo.namespace+"["+JSON.stringify(filename)+"] = "+compiled+";");
+
+        if (options.amd && options.namespace === false) {
+          return 'return ' + compiled;
+        }
+        return nsInfo.namespace+'['+JSON.stringify(filename)+'] = '+compiled+';';
       });
 
-      if(output.length > 0) {
+      if (output.length < 1) {
-        output.unshift(nsInfo.declaration);
+        grunt.log.warn('Destination not written because compiled files were empty.');
-        if (options.amdWrapper) {
+      } else {
-            if (options.prettify) {
+        if (options.namespace !== false) {
-              output.forEach(function(line, index) {
+          output.unshift(nsInfo.declaration);
-                output[index] = "  " + line;
-              });
-            }
-            output.unshift("define(function(){");
-            output.push("  return " + nsInfo.namespace + ";\n});");
         }
-        grunt.file.write(files.dest, output.join("\n\n"));
+        if (options.amd) {
-        grunt.log.writeln("File '" + files.dest + "' created.");
+          if (options.prettify) {
+            output.forEach(function(line, index) {
+              output[index] = "  " + line;
+            });
+          }
+          output.unshift("define(function(){");
+          if (options.namespace !== false) {
+            // Namespace has not been explicitly set to false; the AMD
+            // wrapper will return the object containing the template.
+            output.push("  return " + nsInfo.namespace + ";");
+          }
+          output.push("});");
+        }
+        grunt.file.write(f.dest, output.join(grunt.util.normalizelf(options.separator)));
+        grunt.log.writeln('File "' + f.dest + '" created.');
       }
     });
 
-
   });
-
 };

test/expected/amd_wrapper.js

@@ -2,15 +2,14 @@ define(function(){
 
 this["JST"] = this["JST"] || {};
 
-this["JST"]["test/fixtures/template.html"] = function(obj){
+this["JST"]["test/fixtures/template.html"] = function(obj) {
-var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};
+var __t, __p = '', __e = _.escape;
-with(obj||{}){
+__p += '<head><title>' +
-__p+='<head><title>'+
+((__t = ( obj.title )) == null ? '' : __t) +
-( title )+
 '</title></head>';
-}
+return __p
-return __p;
 };
 
   return this["JST"];
+
 });

test/expected/amd_wrapper_no_ns.js

@@ -0,0 +1,11 @@
+define(function(){
+
+return function(obj) {
+var __t, __p = '', __e = _.escape;
+__p += '<head><title>' +
+((__t = ( obj.title )) == null ? '' : __t) +
+'</title></head>';
+return __p
+}
+
+});

test/expected/jst.js

@@ -1,11 +1,9 @@
 this["JST"] = this["JST"] || {};
 
-this["JST"]["test/fixtures/template.html"] = function(obj){
+this["JST"]["test/fixtures/template.html"] = function(obj) {
-var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};
+var __t, __p = '', __e = _.escape;
-with(obj||{}){
+__p += '<head><title>' +
-__p+='<head><title>'+
+((__t = ( obj.title )) == null ? '' : __t) +
-( title )+
 '</title></head>';
-}
+return __p
-return __p;
 };

test/expected/local_scope.js

@@ -0,0 +1,13 @@
+this["JST"] = this["JST"] || {};
+
+this["JST"]["test/fixtures/template_local_scope.html"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<head><title>' +
+((__t = ( title )) == null ? '' : __t) +
+'</title></head>';
+
+}
+return __p
+};

test/expected/ns_nested.js

@@ -2,12 +2,10 @@ this["MyApp"] = this["MyApp"] || {};
 this["MyApp"]["JST"] = this["MyApp"]["JST"] || {};
 this["MyApp"]["JST"]["Main"] = this["MyApp"]["JST"]["Main"] || {};
 
-this["MyApp"]["JST"]["Main"]["test/fixtures/template.html"] = function(obj){
+this["MyApp"]["JST"]["Main"]["test/fixtures/template.html"] = function(obj) {
-var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};
+var __t, __p = '', __e = _.escape;
-with(obj||{}){
+__p += '<head><title>' +
-__p+='<head><title>'+
+((__t = ( obj.title )) == null ? '' : __t) +
-( title )+
 '</title></head>';
-}
+return __p
-return __p;
 };

test/expected/pretty.js

@@ -1,3 +1,3 @@
 this["JST"] = this["JST"] || {};
 
-this["JST"]["test/fixtures/template.html"] = function(obj){var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};with(obj||{}){__p+='<head><title>'+( title )+'</title></head>';}return __p;};
+this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '', __e = _.escape;__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};

test/expected/pretty_amd.js

@@ -2,7 +2,8 @@ define(function(){
 
   this["JST"] = this["JST"] || {};
 
-  this["JST"]["test/fixtures/template.html"] = function(obj){var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};with(obj||{}){__p+='<head><title>'+( title )+'</title></head>';}return __p;};
+  this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '', __e = _.escape;__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};
 
   return this["JST"];
+
 });

test/expected/process_content.js

@@ -0,0 +1,9 @@
+this["JST"] = this["JST"] || {};
+
+this["JST"]["test/fixtures/indent_template.html"] = function(obj) {
+var __t, __p = '', __e = _.escape;
+__p += '<div>\n<div>\n<div>\n' +
+((__t = ( obj.name )) == null ? '' : __t) +
+'\n</div>\n</div>\n</div>';
+return __p
+};

test/expected/uglyfile.js

@@ -1,9 +1,7 @@
 this["JST"] = this["JST"] || {};
 
-this["JST"]["test/fixtures/it's-a-bad-filename.html"] = function(obj){
+this["JST"]["test/fixtures/it's-a-bad-filename.html"] = function(obj) {
-var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};
+var __t, __p = '', __e = _.escape;
-with(obj||{}){
+__p += 'never name your file like this.';
-__p+='never name your file like this.';
+return __p
-}
-return __p;
 };

test/fixtures/indent_template.html

@@ -0,0 +1,7 @@
+<div>
+  <div>
+    <div>
+      <%= obj.name %>
+    </div>
+  </div>
+</div>

test/fixtures/template.html

@@ -1 +1 @@
-<head><title><%= title %></title></head>
+<head><title><%= obj.title %></title></head>

test/fixtures/template_local_scope.html

@@ -0,0 +1 @@
+<head><title><%= title %></title></head>

test/jst_test.js

@@ -6,7 +6,7 @@ exports['jst'] = {
 
     var expect, result;
 
-    test.expect(7);
+    test.expect(10);
 
     expect = grunt.file.read("test/expected/jst.js");
     result = grunt.file.read("tmp/jst.js");
@@ -23,7 +23,7 @@ exports['jst'] = {
     expect = grunt.file.read("test/expected/ns_nested.js"); // same as previous test
     result = grunt.file.read("tmp/ns_nested_this.js");
     test.equal(expect, result, "should define parts of nested namespaces, ignoring this.");
-
+    
     expect = grunt.file.read("test/expected/pretty.js"); 
     result = grunt.file.read("tmp/pretty.js");
     test.equal(expect, result, "should make the output be 1 line per template, making the output less ugly");
@@ -32,9 +32,21 @@ exports['jst'] = {
     result = grunt.file.read("tmp/amd_wrapper.js");
     test.equal(expect, result, "should wrap the template with define for AMD pattern");
     
+    expect = grunt.file.read("test/expected/amd_wrapper_no_ns.js");
+    result = grunt.file.read("tmp/amd_wrapper_no_ns.js");
+    test.equal(expect, result, "should wrap the template with define for AMD pattern and return the function itself with no namespace");
+    
     expect = grunt.file.read("test/expected/pretty_amd.js"); 
     result = grunt.file.read("tmp/pretty_amd.js");
     test.equal(expect, result, "should make the AMD wrapper output pretty");
+    
+    expect = grunt.file.read("test/expected/process_content.js");
+    result = grunt.file.read("tmp/process_content.js");
+    test.equal(expect, result, "should convert file content");
+
+    expect = grunt.file.read("test/expected/local_scope.js");
+    result = grunt.file.read("tmp/local_scope.js");
+    test.equal(expect, result, "should add `with` block when templateSettings.variable is undefined");
 
     test.done();
   }