hogan_assets 1.5.1 → 1.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTEyZTQxNDZlYWQ1MzA5NzAzZTZmZTAxOGMwZmI3M2VhZTU5MDBlZA==
+  data.tar.gz: !binary |-
+    M2UzMmZiMGU1YTRhNzU4ZDNkNzAzMWI1NDYwMzRjYmFiMWZlZjNlZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2FiNzhkM2U3MzcxODI5ZTI1YWYxMjM1YjAwODZhMDJjMjhmOGNmMzNkNzc3
+    Y2VjZmViN2U4OTM3MDU5NmUyNTAyMTVhNzU2NWExMGQxMTdiYzAyMTk4OWVl
+    YjlkZTY5OGY4NzRkMDdkZGQ2OGFjOTljYjg3MzQ3OTY5ZjFiOGY=
+  data.tar.gz: !binary |-
+    NDA1ODgyYjBkMDQ2MjRmMWRkOGEyM2FlMmJiMDM0MGIxOGJjMTI1MjdjMWQ5
+    OTE3OGY4YzdlNjE1NGZjZDFlNzdjN2VhYzVlZjhmZTBkYjIzZmYzYzg1ZWU5
+    NTQwYmRjZmM3ZmZhYWJlODY5YmZlMTZmYzhmNzk0NGZmOTUwMDc=

data/.gitignore

@@ -11,6 +11,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+tags
 test/tmp
 test/version_tmp
 tmp

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.0 (2013-03-27)
+
+* Update to `hogan.js` as of this [commit](https://github.com/twitter/hogan.js/commit/9a9eb1ab8fbbfedc9de73aeac4f9c1798d190a21)
+
 ## 1.5.1 (2013-2-26)
 
 * hamstache\_extensions and slimstache\_extensions options - @AlexRiedler

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hogan_assets (1.5.1)
+    hogan_assets (1.6.0)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -21,8 +21,8 @@ GEM
       multi_json (~> 1.0)
     haml (3.1.6)
     hike (1.2.1)
-    multi_json (1.3.5)
-    rack (1.4.1)
+    multi_json (1.7.1)
+    rack (1.5.2)
     slim (1.3.4)
       temple (~> 0.5.5)
       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 v3.0.0**
+This gem contains **hogan.js 3.0.0** as of this [commit](https://github.com/twitter/hogan.js/commit/9a9eb1ab8fbbfedc9de73aeac4f9c1798d190a21)
 
 ## Installation
 

data/lib/hogan_assets/version.rb

@@ -1,3 +1,3 @@
 module HoganAssets
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/test/hogan_assets/tilt_test.rb

@@ -15,22 +15,24 @@ module HoganAssets
     def test_render
       scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.mustache'
 
-      template = HoganAssets::Tilt.new(scope.s_path) { "This is {{mustache}}" }
+      source = "This is {{mustache}}"
+      template = HoganAssets::Tilt.new(scope.s_path) { source }
 
       assert_equal <<-END_EXPECTED, template.render(scope, {})
         this.HoganTemplates || (this.HoganTemplates = {});
-        this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "", Hogan, {});
+        this.HoganTemplates["path/to/template"] = new Hogan.Template(#{compiled_template source}, "", Hogan, {});
       END_EXPECTED
     end
 
     def test_hamstache_render
       scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.hamstache'
 
-      template = HoganAssets::Tilt.new(scope.s_path) { "%p This is {{hamstache}}" }
+      source = "%p This is {{mustache}}"
+      template = HoganAssets::Tilt.new(scope.s_path) { source }
 
       assert_equal <<-END_EXPECTED, template.render(scope, {})
         this.HoganTemplates || (this.HoganTemplates = {});
-        this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"<p>This is \");t.b(t.v(t.f(\"hamstache\",c,p,0)));t.b(\"</p>\");t.b(\"\\n\");return t.fl(); },partials: {}, subs: {  }}, \"\", Hogan, {});
+        this.HoganTemplates["path/to/template"] = new Hogan.Template(#{compiled_template haml_compiled scope, source}, "", Hogan, {});
       END_EXPECTED
     end
 
@@ -41,11 +43,12 @@ module HoganAssets
 
       scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.mustache'
 
-      template = HoganAssets::Tilt.new(scope.s_path) { "This is {{mustache}}" }
+      source = "This is {{mustache}}"
+      template = HoganAssets::Tilt.new(scope.s_path) { source }
 
       assert_equal <<-END_EXPECTED, template.render(scope, {})
         this.HoganTemplates || (this.HoganTemplates = {});
-        this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "This is {{mustache}}", Hogan, {});
+        this.HoganTemplates["path/to/template"] = new Hogan.Template(#{compiled_template source}, "This is {{mustache}}", Hogan, {});
       END_EXPECTED
     end
 
@@ -56,11 +59,12 @@ module HoganAssets
 
       scope = make_scope '/myapp/app/assets/javascripts', 'app/templates/template.mustache'
 
-      template = HoganAssets::Tilt.new(scope.s_path) { "This is {{mustache}}" }
+      source = "This is {{mustache}}"
+      template = HoganAssets::Tilt.new(scope.s_path) { source }
 
       assert_equal <<-END_EXPECTED, template.render(scope, {})
         this.HoganTemplates || (this.HoganTemplates = {});
-        this.HoganTemplates[\"template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "", Hogan, {});
+        this.HoganTemplates["template"] = new Hogan.Template(#{compiled_template source}, "", Hogan, {});
       END_EXPECTED
     end
 
@@ -71,11 +75,12 @@ module HoganAssets
 
       scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.mustache'
 
-      template = HoganAssets::Tilt.new(scope.s_path) { "This is {{mustache}}" }
+      source = "This is {{mustache}}"
+      template = HoganAssets::Tilt.new(scope.s_path) { source }
 
       assert_equal <<-END_EXPECTED, template.render(scope, {})
         this.JST || (this.JST = {});
-        this.JST[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "", Hogan, {});
+        this.JST["path/to/template"] = new Hogan.Template(#{compiled_template source}, "", Hogan, {});
       END_EXPECTED
     end
 

data/test/test_helper.rb

@@ -11,7 +11,16 @@ module HoganAssets::Config
 
   end
 end
+
 module TestSupport
+  def compiled_template(text)
+    HoganAssets::Hogan.compile(text)
+  end
+
+  def haml_compiled(scope, text)
+    Haml::Engine.new(text, HoganAssets::Config.haml_options.merge(@options)).render(scope, {})
+  end
+
   # Try to act like sprockets.
   def make_scope(root, file)
     Class.new do

data/vendor/assets/javascripts/hogan.js

@@ -1,4 +1,4 @@
-/*
+/*!
  *  Copyright 2011 Twitter, Inc.
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ var Hogan = {};
     codeObj = codeObj || {};
     this.r = codeObj.code || this.r;
     this.c = compiler;
-    this.options = options;
+    this.options = options || {};
     this.text = text || '';
     this.partials = codeObj.partials || {};
     this.subs = codeObj.subs || {};
@@ -73,14 +73,18 @@ var Hogan = {};
       this.partials[symbol].base = template;
 
       if (partial.subs) {
-        template = createSpecializedPartial(template, partial.subs, partial.partials);
-      }
-
+        // Make sure we consider parent template now
+        if (this.activeSub === undefined) {
+          // Store parent template text in partials.stackText to perform substitutions in child templates correctly
+          partials.stackText  = this.text;
+        }
+         template = createSpecializedPartial(template, partial.subs, partial.partials, partials.stackText || this.text);
+       }
       this.partials[symbol].instance = template;
       return template;
     },
 
-    // tries to find a partial in the curent scope and render it
+    // tries to find a partial in the current scope and render it
     rp: function(symbol, context, partials, indent) {
       var partial = this.ep(symbol, partials);
       if (!partial) {
@@ -118,7 +122,7 @@ var Hogan = {};
         val = this.ms(val, ctx, partials, inverted, start, end, tags);
       }
 
-      pass = (val === '') || !!val;
+      pass = !!val;
 
       if (!inverted && pass && ctx) {
         ctx.push((typeof val == 'object') ? val : ctx[ctx.length - 1]);
@@ -129,20 +133,23 @@ var Hogan = {};
 
     // find values with dotted names
     d: function(key, ctx, partials, returnFound) {
-      var names = key.split('.'),
+      var found,
+          names = key.split('.'),
           val = this.f(names[0], ctx, partials, returnFound),
+          doModelGet = this.options.modelGet,
           cx = null;
 
       if (key === '.' && isArray(ctx[ctx.length - 2])) {
-        return ctx[ctx.length - 1];
-      }
-
-      for (var i = 1; i < names.length; i++) {
-        if (val && typeof val == 'object' && val[names[i]] != null) {
-          cx = val;
-          val = val[names[i]];
-        } else {
-          val = '';
+        val = ctx[ctx.length - 1];
+      } else {
+        for (var i = 1; i < names.length; i++) {
+          found = findInScope(names[i], val, doModelGet);
+          if (found != null) {
+            cx = val;
+            val = found;
+          } else {
+            val = '';
+          }
         }
       }
 
@@ -163,12 +170,13 @@ var Hogan = {};
     f: function(key, ctx, partials, returnFound) {
       var val = false,
           v = null,
-          found = false;
+          found = false,
+          doModelGet = this.options.modelGet;
 
       for (var i = ctx.length - 1; i >= 0; i--) {
         v = ctx[i];
-        if (v && typeof v == 'object' && v[key] != null) {
-          val = v[key];
+        val = findInScope(key, v, doModelGet);
+        if (val != null) {
           found = true;
           break;
         }
@@ -217,14 +225,16 @@ var Hogan = {};
 
     // method replace section
     ms: function(func, ctx, partials, inverted, start, end, tags) {
-      var cx = ctx[ctx.length - 1],
+      var textSource,
+          cx = ctx[ctx.length - 1],
           result = func.call(cx);
 
       if (typeof result == 'function') {
         if (inverted) {
           return true;
         } else {
-          return this.ls(result, cx, partials, this.text.substring(start, end), tags);
+          textSource = (this.activeSub && this.subsText[this.activeSub]) ? this.subsText[this.activeSub] : this.text;
+          return this.ls(result, cx, partials, textSource.substring(start, end), tags);
         }
       }
 
@@ -246,13 +256,33 @@ var Hogan = {};
     sub: function(name, context, partials, indent) {
       var f = this.subs[name];
       if (f) {
+        this.activeSub = name;
         f(context, partials, this, indent);
+        this.activeSub = false;
       }
     }
 
   };
 
-  function createSpecializedPartial(instance, subs, partials) {
+  //Find a key in an object
+  function findInScope(key, scope, doModelGet) {
+    var val, checkVal;
+
+    if (scope && typeof scope == 'object') {
+
+      if (scope[key] != null) {
+        val = scope[key];
+
+      // try lookup with get for backbone or similar model data
+      } else if (doModelGet && scope.get && typeof scope.get == 'function') {
+        val = scope.get(key);
+      }
+    }
+
+    return val;
+  }
+
+  function createSpecializedPartial(instance, subs, partials, childText) {
     function PartialTemplate() {};
     PartialTemplate.prototype = instance;
     function Substitutions() {};
@@ -260,10 +290,12 @@ var Hogan = {};
     var key;
     var partial = new PartialTemplate();
     partial.subs = new Substitutions();
+    partial.subsText = {};  //hehe. substext.
     partial.ib();
 
     for (key in subs) {
       partial.subs[key] = subs[key];
+      partial.subsText[key] = childText;
     }
 
     for (key in partials) {
@@ -276,9 +308,9 @@ var Hogan = {};
   var rAmp = /&/g,
       rLt = /</g,
       rGt = />/g,
-      rApos =/\'/g,
+      rApos = /\'/g,
       rQuot = /\"/g,
-      hChars =/[&<>\"\']/;
+      hChars = /[&<>\"\']/;
 
   function coerceToString(val) {
     return String((val === null || val === undefined) ? '' : val);
@@ -288,10 +320,10 @@ var Hogan = {};
     str = coerceToString(str);
     return hChars.test(str) ?
       str
-        .replace(rAmp,'&amp;')
-        .replace(rLt,'&lt;')
-        .replace(rGt,'&gt;')
-        .replace(rApos,'&#39;')
+        .replace(rAmp, '&amp;')
+        .replace(rLt, '&lt;')
+        .replace(rGt, '&gt;')
+        .replace(rApos, '&#39;')
         .replace(rQuot, '&quot;') :
       str;
   }
@@ -385,7 +417,7 @@ var Hogan = {};
           ).split(' ');
 
       otag = delimiters[0];
-      ctag = delimiters[1];
+      ctag = delimiters[delimiters.length - 1];
 
       return closeIndex + close.length - 1;
     }
@@ -671,7 +703,7 @@ var Hogan = {};
     return 't.b(' + s + ');';
   }
 
-  Hogan.walk = function (nodelist, context) {
+  Hogan.walk = function(nodelist, context) {
     var func;
     for (var i = 0, l = nodelist.length; i < l; i++) {
       func = Hogan.codegen[nodelist[i].tag];
@@ -683,13 +715,13 @@ var Hogan = {};
   Hogan.parse = function(tokens, text, options) {
     options = options || {};
     return buildTree(tokens, '', [], options.sectionTags || []);
-  },
+  }
 
   Hogan.cache = {};
 
   Hogan.cacheKey = function(text, options) {
-    return [text, !!options.asString, !!options.disableLambda].join('||');
-  },
+    return [text, !!options.asString, !!options.disableLambda, options.delimiters, !!options.modelGet].join('||');
+  }
 
   Hogan.compile = function(text, options) {
     options = options || {};
@@ -702,6 +734,6 @@ var Hogan = {};
 
     template = this.generate(this.parse(this.scan(text, options.delimiters), text, options), text, options);
     return this.cache[key] = template;
-  };
+  }
 })(typeof exports !== 'undefined' ? exports : Hogan);
 

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: hogan_assets
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.9
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: tilt
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.2.9
+- !ruby/object:Gem::Dependency
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: sprockets
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: debugger
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: haml
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: slim
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use compiled hogan.js (mustache) JavaScript templates with sprockets
   and the Rails asset pipeline.
 email:
@@ -137,27 +124,26 @@ files:
 - vendor/assets/javascripts/hogan.js
 homepage: https://github.com/leshill/hogan_assets
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use compiled hogan.js (mustache) JavaScript templates with sprockets and
   the Rails asset pipeline.
 test_files:
@@ -165,3 +151,4 @@ test_files:
 - test/hogan_assets/config_test.rb
 - test/hogan_assets/tilt_test.rb
 - test/test_helper.rb
+has_rdoc: