hogan_assets 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hogan_assets (1.0.1)
+    hogan_assets (1.0.2)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)

data/README.md

@@ -4,7 +4,7 @@
 
 **hogan.js** is a templating engine developed at [Twitter](http://twitter.com) that follows the **mustache** spec and compiles the templates to JavaScript. The first bit is *cool*, since **mustache** is *cool*. The second bit is **awesome and full of win** because we can now compile our **mustache** templates on the server using the asset pipeline/sprockets.
 
-This gem contains **hogan.js v1.0.4**
+This gem contains **hogan.js v1.0.5**
 
 ## Installation
 
@@ -55,6 +55,10 @@ Templates are compiled to a global JavaScript object named `HoganTemplates`. To
 
 I made this because I <3 **mustache** and want to use it in Rails. Follow me on [Github](https://github.com/leshill) and [Twitter](https://twitter.com/leshill).
 
+# Contributors
+
+* Matthew Nelson (@mdavidn) : Remove unnecessary template source
+
 ## Contributing
 
 1. Fork it

data/lib/hogan_assets/tilt.rb

@@ -6,15 +6,10 @@ module HoganAssets
 
     def evaluate(scope, locals, &block)
       compiled_template = Hogan.compile(data)
-      code = data.inspect
       template_name = scope.logical_path.inspect
       <<-TEMPLATE
-        (function() {
-          this.HoganTemplates || (this.HoganTemplates = {});
-          this.HoganTemplates[#{template_name}] = new Hogan.Template(#{code});
-          this.HoganTemplates[#{template_name}].r = #{compiled_template};
-          return HoganTemplates[#{template_name}];
-        }).call(this);
+        this.HoganTemplates || (this.HoganTemplates = {});
+        this.HoganTemplates[#{template_name}] = new Hogan.Template(#{compiled_template});
       TEMPLATE
     end
 

data/lib/hogan_assets/version.rb

@@ -1,3 +1,3 @@
 module HoganAssets
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/hogan_assets/tilt_test.rb

@@ -12,14 +12,10 @@ module HoganAssets
       end.new
 
       template = HoganAssets::Tilt.new('/myapp/app/assets/templates/path/to/template.mustache') { "This is {{mustache}}" }
-      assert_equal <<END_EXPECTED, template.render(scope, {})
-        (function() {
-          this.HoganTemplates || (this.HoganTemplates = {});
-          this.HoganTemplates["path/to/template"] = new Hogan.Template("This is {{mustache}}");
-          this.HoganTemplates["path/to/template"].r = function(c,p,i){i = i || "";var b = i + "";var _ = this;b += "This is ";b += (_.v(_.f("mustache",c,p,0)));return b;;};
-          return HoganTemplates["path/to/template"];
-        }).call(this);
-END_EXPECTED
+      assert_equal <<-END_EXPECTED, template.render(scope, {})
+        this.HoganTemplates || (this.HoganTemplates = {});
+        this.HoganTemplates[\"path/to/template\"] = new Hogan.Template(function(c,p,i){var _=this;_.b(i=i||\"\");_.b(\"This is \");_.b(_.v(_.f(\"mustache\",c,p,0)));return _.fl();;});
+      END_EXPECTED
     end
   end
 end

data/vendor/assets/javascripts/hogan.js

@@ -17,13 +17,13 @@
 
 var Hogan = {};
 
-(function (Hogan) {
-  Hogan.Template = function constructor(renderFunc, text, compiler) {
-    if (renderFunc) {
-      this.r = renderFunc;
-    }
+(function (Hogan, useArrayBuffer) {
+  Hogan.Template = function (renderFunc, text, compiler, options) {
+    this.r = renderFunc || this.r;
     this.c = compiler;
+    this.options = options;
     this.text = text || '';
+    this.buf = (useArrayBuffer) ? [] : '';
   }
 
   Hogan.Template.prototype = {
@@ -33,6 +33,9 @@ var Hogan = {};
     // variable escaping
     v: hoganEscape,
 
+    // triple stache
+    t: coerceToString,
+
     render: function render(context, partials, indent) {
       return this.ri([context], partials || {}, indent);
     },
@@ -51,7 +54,7 @@ var Hogan = {};
       }
 
       if (this.c && typeof partial == 'string') {
-        partial = this.c.compile(partial);
+        partial = this.c.compile(partial, this.options);
       }
 
       return partial.ri(context, partials, indent);
@@ -59,20 +62,18 @@ var Hogan = {};
 
     // render a section
     rs: function(context, partials, section) {
-      var buf = '',
-          tail = context[context.length - 1];
+      var tail = context[context.length - 1];
 
       if (!isArray(tail)) {
-        return buf = section(context, partials);
+        section(context, partials, this);
+        return;
       }
 
       for (var i = 0; i < tail.length; i++) {
         context.push(tail[i]);
-        buf += section(context, partials);
+        section(context, partials, this);
         context.pop();
       }
-
-      return buf;
     },
 
     // maybe start a section
@@ -157,16 +158,20 @@ var Hogan = {};
     // higher order templates
     ho: function(val, cx, partials, text, tags) {
       var compiler = this.c;
+      var options = this.options;
+      options.delimiters = tags;
       var t = val.call(cx, text, function(t) {
-        return compiler.compile(t, {delimiters: tags}).render(cx, partials);
+        return compiler.compile(t, options).render(cx, partials);
       });
-      var s = compiler.compile(t.toString(), {delimiters: tags}).render(cx, partials);
-      this.b = s;
+      this.b(compiler.compile(t.toString(), options).render(cx, partials));
       return false;
     },
 
-    // higher order template result buffer
-    b: '',
+    // template result buffering
+    b: (useArrayBuffer) ? function(s) { this.buf.push(s); } :
+                          function(s) { this.buf += s; },
+    fl: (useArrayBuffer) ? function() { var r = this.buf.join(''); this.buf = []; return r; } :
+                           function() { var r = this.buf; this.buf = ''; return r; },
 
     // lambda replace section
     ls: function(val, ctx, partials, inverted, start, end, tags) {
@@ -197,10 +202,10 @@ var Hogan = {};
       if (typeof result == 'function') {
         result = result.call(cx);
       }
-      result = result.toString();
+      result = coerceToString(result);
 
-      if (this.c && ~result.indexOf("{{")) {
-        return this.c.compile(result).render(cx, partials);
+      if (this.c && ~result.indexOf("{\u007B")) {
+        return this.c.compile(result, this.options).render(cx, partials);
       }
 
       return result;
@@ -215,8 +220,13 @@ var Hogan = {};
       rQuot = /\"/g,
       hChars =/[&<>\"\']/;
 
+
+  function coerceToString(val) {
+    return String((val === null || val === undefined) ? '' : val);
+  }
+
   function hoganEscape(str) {
-    str = String((str === null || str === undefined) ? '' : str);
+    str = coerceToString(str);
     return hChars.test(str) ?
       str
         .replace(rAmp,'&amp;')
@@ -457,7 +467,7 @@ var Hogan = {};
   }
 
   function writeCode(tree) {
-    return 'i = i || "";var b = i + "";var _ = this;' + walk(tree) + 'return b;';
+    return 'var _=this;_.b(i=i||"");' + walk(tree) + 'return _.fl();';
   }
 
   Hogan.generate = function (code, text, options) {
@@ -465,7 +475,7 @@ var Hogan = {};
       return 'function(c,p,i){' + code + ';}';
     }
 
-    return new Hogan.Template(new Function('c', 'p', 'i', code), text, Hogan);
+    return new Hogan.Template(new Function('c', 'p', 'i', code), text, Hogan, options);
   }
 
   function esc(s) {
@@ -506,37 +516,36 @@ var Hogan = {};
 
   function section(nodes, id, method, start, end, tags) {
     return 'if(_.s(_.' + method + '("' + esc(id) + '",c,p,1),' +
-           'c,p,0,' + start + ',' + end + ', "' + tags + '")){' +
-           'b += _.rs(c,p,' +
-           'function(c,p){ var b = "";' +
+           'c,p,0,' + start + ',' + end + ',"' + tags + '")){' +
+           '_.rs(c,p,' +
+           'function(c,p,_){' +
            walk(nodes) +
-           'return b;});c.pop();}' +
-           'else{b += _.b; _.b = ""};';
+           '});c.pop();}';
   }
 
   function invertedSection(nodes, id, method) {
-    return 'if (!_.s(_.' + method + '("' + esc(id) + '",c,p,1),c,p,1,0,0,"")){' +
+    return 'if(!_.s(_.' + method + '("' + esc(id) + '",c,p,1),c,p,1,0,0,"")){' +
            walk(nodes) +
            '};';
   }
 
   function partial(tok) {
-    return 'b += _.rp("' +  esc(tok.n) + '",c,p,"' + (tok.indent || '') + '");';
+    return '_.b(_.rp("' +  esc(tok.n) + '",c,p,"' + (tok.indent || '') + '"));';
   }
 
   function tripleStache(id, method) {
-    return 'b += (_.' + method + '("' + esc(id) + '",c,p,0));';
+    return '_.b(_.t(_.' + method + '("' + esc(id) + '",c,p,0)));';
   }
 
   function variable(id, method) {
-    return 'b += (_.v(_.' + method + '("' + esc(id) + '",c,p,0)));';
+    return '_.b(_.v(_.' + method + '("' + esc(id) + '",c,p,0)));';
   }
 
   function text(id) {
-    return 'b += ' + id + ';';
+    return '_.b(' + id + ');';
   }
 
-  Hogan.parse = function(tokens, options) {
+  Hogan.parse = function(tokens, text, options) {
     options = options || {};
     return buildTree(tokens, '', [], options.sectionTags || []);
   },
@@ -565,12 +574,8 @@ var Hogan = {};
       return t;
     }
 
-    t = this.generate(writeCode(this.parse(this.scan(text, options.delimiters), options)), text, options);
+    t = this.generate(writeCode(this.parse(this.scan(text, options.delimiters), text, options)), text, options);
     return this.cache[key] = t;
   };
 })(typeof exports !== 'undefined' ? exports : Hogan);
 
-
-if (typeof define === 'function' && define.amd) {
-  define(Hogan);
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hogan_assets
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70264420834000 !ruby/object:Gem::Requirement
+  requirement: &70197692099300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70264420834000
+  version_requirements: *70197692099300
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70264420833500 !ruby/object:Gem::Requirement
+  requirement: &70197692098520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70264420833500
+  version_requirements: *70197692098520
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70264420833020 !ruby/object:Gem::Requirement
+  requirement: &70197692097800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70264420833020
+  version_requirements: *70197692097800
 description: Use compiled hogan.js (mustache) JavaScript templates with sprockets
   and the Rails asset pipeline.
 email: