Merge branch 'hamlet-2' of https://github.com/gregwebs/consolidate.js …

…into gregwebs-hamlet-2

Readme.md

@@ -16,6 +16,7 @@
   - [ejs](https://github.com/visionmedia/ejs)
   - [haml](https://github.com/visionmedia/haml.js) [(website)](http://haml-lang.com/)
   - [haml-coffee](https://github.com/9elements/haml-coffee) [(website)](http://haml-lang.com/)
+  - [hamlet](https://github.com/gregwebs/hamlet.js)
   - [handlebars](https://github.com/wycats/handlebars.js/) [(website)](http://handlebarsjs.com/)
   - [hogan](https://github.com/twitter/hogan.js) [(website)](http://twitter.github.com/hogan.js/)
   - [htmling](https://github.com/codemix/htmling)

lib/consolidate.js

@@ -415,6 +415,26 @@ exports.haml.render = function(str, options, fn){
   }
 };
 
+/**
+ * Hamlet support.
+ */
+
+exports.hamlet = fromStringRenderer('hamlet');
+
+/**
+ * Hamlet string support.
+ */
+
+exports.hamlet.render = function(str, options, fn){
+  var engine = requires.hamlet || (requires.hamlet = require('hamlet'));
+  try {
+    options.locals = options;
+    fn(null, engine.render(str, options).trimLeft());
+  } catch (err) {
+    fn(err);
+  }
+};
+
 /**
  * Whiskers support.
  */

package.json

@@ -19,6 +19,7 @@
     "jqtpl": "1.1.0",
     "liquor": "0.0.4",
     "lodash": "1.2.0",
+    "hamlet": "0.3.3",
     "hamljs": "0.6.1",
     "whiskers": "0.2.2",
     "haml-coffee": "1.4.0",

test/consolidate.js

@@ -6,6 +6,7 @@ require('./shared').test('jazz');
 require('./shared').test('jqtpl');
 require('./shared').test('liquor');
 require('./shared').test('haml');
+require('./shared').test('hamlet');
 require('./shared').test('eco');
 require('./shared').test('whiskers');
 require('./shared').test('haml-coffee');

test/fixtures/hamlet/user.hamlet

@@ -0,0 +1,2 @@
+<p>#{user.name}
+>