handlebars_assets 0.3.1 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    handlebars_assets (0.3.1)
+    handlebars_assets (0.4.0)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt
@@ -9,28 +9,19 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
     execjs (1.2.9)
       multi_json (~> 1.0)
     hike (1.2.1)
-    libv8 (3.3.10.2)
     multi_json (1.0.3)
     rack (1.3.5)
-    rake (0.9.2.2)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.8)
-      libv8 (~> 3.3.10)
     tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.1.0)
   handlebars_assets!
-  rake
-  therubyracer

data/README.md

@@ -1,6 +1,8 @@
-# Use handlebars.js templates with the asset pipeline and sprockets
+# BREAKING CHANGE
+
+`handlebars.vm.js` was renamed to `handlebars.runtime.js`, please update your Javascript manifest.
 
-**ALPHA**
+# Use handlebars.js templates with the asset pipeline and sprockets
 
 Are your `handlebars.js` templates littering your Rails views with `script` tags? Wondering why the nifty Rails 3.1 asset pipeline streamlines all your Javascript except for your Handlebars templates? Wouldn't it be nice to have your Handlebars templates compiled, compressed, and cached like your other Javascript?
 
@@ -8,7 +10,11 @@ Yea, I think so too. That is why I wrote **handlebars_assets**. Give your Handle
 
 Using `sprockets` with Sinatra or another framework? **handlebars_assets** works outside of Rails too (as of v0.2.0)
 
-## Installation
+## handlebars.js
+
+`handlebars_assets` is packaged with `v1.0.beta.5` of `handlebars.js`.
+
+## Installation with Rails 3.1+
 
 Load `handlebars_assets` in your `Gemfile` as part of the `assets` group
 
@@ -16,11 +22,18 @@ Load `handlebars_assets` in your `Gemfile` as part of the `assets` group
       gem 'handlebars_assets'
     end
 
+## Installation without Rails 3.1+
+
+Load `handlebars_assets` in your `Gemfile`
+
+    gem 'handlebars_assets'
+
+
 # Compiling your Javascript templates in the Rails asset pipeline
 
-Require `handlebars.vm.js` in your Javascript manifest (i.e. `application.js`)
+Require `handlebars.runtime.js` in your Javascript manifest (i.e. `application.js`)
 
-    //= require handlebars.vm
+    //= require handlebars.runtime
 
 If you need to compile your Javascript templates in the browser as well, you should instead require `handlebars.js` (which is significantly larger)
 
@@ -46,20 +59,29 @@ For example, if you have new, edit, and show templates for a Contact model
 
     templates/
       contacts/
-        new.jst.hbs
-        edit.jst.hbs
-        show.jst.hbs
+        new.hbs
+        edit.hbs
+        show.hbs
 
 Your file extensions tell the asset pipeline how to process the file. Use `.hbs` to compile the template with Handlebars. Combine it with `.jst` to add the compiled template to the `JST` global variable.
 
-If your file is `templates/contacts/new.jst.hbs`, the asset pipeline will generate Javascript code
+If your file is `templates/contacts/new.hbs`, the asset pipeline will generate Javascript code
 
 1. Compile the Handlebars template to Javascript code
-1. Add the template code to the `JST` global under the name `contacts/new`
+1. Add the template code to the `HandlebarsTemplates` global under the name `contacts/new`
 
 You can then invoke the resulting template in your application's Javascript
 
-    JST['contacts/new'](context);
+    HandlebarsTemplates['contacts/new'](context);
+
+## JST
+
+`sprockets` ships with a simple JavaScript template wrapper called `JST` for
+use with the `ejs` and other gems.
+
+`handlebars_assets` is compatible with `JST`. If you name your template files
+`name.jst.hbs`, you will have access to your templates through the `JST` global
+just like your `ejs` templates.
 
 ## Partials
 

data/handlebars_assets.gemspec

@@ -21,8 +21,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "execjs", ">= 1.2.9"
   s.add_runtime_dependency "tilt"
   s.add_runtime_dependency "sprockets", ">= 2.0.3"
-
-  s.add_development_dependency "activesupport", "~> 3.1.0"
-  s.add_development_dependency "therubyracer"
-  s.add_development_dependency "rake"
 end

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/starts_ends_with'
-
 require 'handlebars_assets/tilt_handlebars'
 require 'handlebars_assets/handlebars'
 

data/vendor/assets/javascripts/handlebars.js

@@ -1,7 +1,7 @@
 // lib/handlebars/base.js
 var Handlebars = {};
 
-Handlebars.VERSION = "1.0.beta.4";
+Handlebars.VERSION = "1.0.beta.5";
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
@@ -23,16 +23,16 @@ Handlebars.registerHelper('helperMissing', function(arg) {
   }
 });
 
+var toString = Object.prototype.toString, functionType = "[object Function]";
+
 Handlebars.registerHelper('blockHelperMissing', function(context, options) {
   var inverse = options.inverse || function() {}, fn = options.fn;
 
 
   var ret = "";
-  var type = Object.prototype.toString.call(context);
+  var type = toString.call(context);
 
-  if(type === "[object Function]") {
-    context = context();
-  }
+  if(type === functionType) { context = context.call(this); }
 
   if(context === true) {
     return fn(this);
@@ -67,6 +67,9 @@ Handlebars.registerHelper('each', function(context, options) {
 });
 
 Handlebars.registerHelper('if', function(context, options) {
+  var type = toString.call(context);
+  if(type === functionType) { context = context.call(this); }
+
   if(!context || Handlebars.Utils.isEmpty(context)) {
     return options.inverse(this);
   } else {
@@ -491,62 +494,68 @@ lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_STA
 
 var YYSTATE=YY_START
 switch($avoiding_name_collisions) {
-case 0: this.begin("mu"); if (yy_.yytext) return 14; 
+case 0:
+                                   if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
+                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
+                                   if(yy_.yytext) return 14;
+                                 
 break;
 case 1: return 14; 
 break;
-case 2: return 24; 
+case 2: this.popState(); return 14; 
 break;
-case 3: return 16; 
+case 3: return 24; 
 break;
-case 4: return 20; 
+case 4: return 16; 
 break;
-case 5: return 19; 
+case 5: return 20; 
 break;
 case 6: return 19; 
 break;
-case 7: return 23; 
+case 7: return 19; 
 break;
 case 8: return 23; 
 break;
-case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); return 15; 
+case 9: return 23; 
 break;
-case 10: return 22; 
+case 10: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15; 
 break;
-case 11: return 34; 
+case 11: return 22; 
 break;
-case 12: return 33; 
+case 12: return 34; 
 break;
 case 13: return 33; 
 break;
-case 14: return 36; 
+case 14: return 33; 
 break;
-case 15: /*ignore whitespace*/ 
+case 15: return 36; 
 break;
-case 16: this.begin("INITIAL"); return 18; 
+case 16: /*ignore whitespace*/ 
 break;
-case 17: this.begin("INITIAL"); return 18; 
+case 17: this.popState(); return 18; 
 break;
-case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28; 
+case 18: this.popState(); return 18; 
 break;
-case 19: return 30; 
+case 19: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28; 
 break;
 case 20: return 30; 
 break;
-case 21: return 29; 
+case 21: return 30; 
 break;
-case 22: return 33; 
+case 22: return 29; 
 break;
-case 23: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33; 
+case 23: return 33; 
 break;
-case 24: return 'INVALID'; 
+case 24: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33; 
 break;
-case 25: return 5; 
+case 25: return 'INVALID'; 
+break;
+case 26: return 5; 
 break;
 }
 };
-lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s\/.])/,/^\[.*\]/,/^./,/^$/];
-lexer.conditions = {"mu":{"rules":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25],"inclusive":false},"INITIAL":{"rules":[0,1,25],"inclusive":true}};return lexer;})()
+lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^[^\x00]{2,}?(?=(\{\{))/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[\/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s\/.])/,/^\[[^\]]*\]/,/^./,/^$/];
+lexer.conditions = {"mu":{"rules":[3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"INITIAL":{"rules":[0,1,26],"inclusive":true}};return lexer;})()
 parser.lexer = lexer;
 return parser;
 })();
@@ -696,6 +705,8 @@ Handlebars.Exception = function(message) {
   for (var p in tmp) {
     if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
   }
+
+  this.message = tmp.message;
 };
 Handlebars.Exception.prototype = new Error;
 
@@ -932,6 +943,7 @@ Handlebars.JavaScriptCompiler = function() {};
       this.declare('inverse', programGuid);
 
       this.opcode('invokeProgram', null, params.length, !!block.mustache.hash);
+      this.declare('inverse', null);
       this.opcode('append');
     },
 
@@ -972,7 +984,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
       this.opcode('invokeMustache', params.length, mustache.id.original, !!mustache.hash);
 
-      if(mustache.escaped) {
+      if(mustache.escaped && !this.options.noEscape) {
         this.opcode('appendEscaped');
       } else {
         this.opcode('append');
@@ -1388,7 +1400,13 @@ Handlebars.JavaScriptCompiler = function() {};
     },
 
     invokePartial: function(context) {
-      this.pushStack("self.invokePartial(" + this.nameLookup('partials', context, 'partial') + ", '" + context + "', " + this.popStack() + ", helpers, partials);");
+      params = [this.nameLookup('partials', context, 'partial'), "'" + context + "'", this.popStack(), "helpers", "partials"];
+
+      if (this.options.data) {
+        params.push("data");
+      }
+
+      this.pushStack("self.invokePartial(" + params.join(", ") + ");");
     },
 
     assignToHash: function(key) {
@@ -1526,7 +1544,7 @@ Handlebars.compile = function(string, options) {
   };
 };
 ;
-// lib/handlebars/vm.js
+// lib/handlebars/runtime.js
 Handlebars.VM = {
   template: function(templateSpec) {
     // Just add water
@@ -1572,16 +1590,18 @@ Handlebars.VM = {
     };
   },
   noop: function() { return ""; },
-  invokePartial: function(partial, name, context, helpers, partials) {
+  invokePartial: function(partial, name, context, helpers, partials, data) {
+    options = { helpers: helpers, partials: partials, data: data };
+
     if(partial === undefined) {
       throw new Handlebars.Exception("The partial " + name + " could not be found");
     } else if(partial instanceof Function) {
-      return partial(context, {helpers: helpers, partials: partials});
+      return partial(context, options);
     } else if (!Handlebars.compile) {
-      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in vm mode");
+      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
     } else {
       partials[name] = Handlebars.compile(partial);
-      return partials[name](context, {helpers: helpers, partials: partials});
+      return partials[name](context, options);
     }
   }
 };

data/vendor/assets/javascripts/{handlebars.vm.js → handlebars.runtime.js}

@@ -1,7 +1,7 @@
 // lib/handlebars/base.js
 var Handlebars = {};
 
-Handlebars.VERSION = "1.0.beta.4";
+Handlebars.VERSION = "1.0.beta.5";
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
@@ -23,16 +23,16 @@ Handlebars.registerHelper('helperMissing', function(arg) {
   }
 });
 
+var toString = Object.prototype.toString, functionType = "[object Function]";
+
 Handlebars.registerHelper('blockHelperMissing', function(context, options) {
   var inverse = options.inverse || function() {}, fn = options.fn;
 
 
   var ret = "";
-  var type = Object.prototype.toString.call(context);
+  var type = toString.call(context);
 
-  if(type === "[object Function]") {
-    context = context();
-  }
+  if(type === functionType) { context = context.call(this); }
 
   if(context === true) {
     return fn(this);
@@ -67,6 +67,9 @@ Handlebars.registerHelper('each', function(context, options) {
 });
 
 Handlebars.registerHelper('if', function(context, options) {
+  var type = toString.call(context);
+  if(type === functionType) { context = context.call(this); }
+
   if(!context || Handlebars.Utils.isEmpty(context)) {
     return options.inverse(this);
   } else {
@@ -97,6 +100,8 @@ Handlebars.Exception = function(message) {
   for (var p in tmp) {
     if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
   }
+
+  this.message = tmp.message;
 };
 Handlebars.Exception.prototype = new Error;
 
@@ -152,7 +157,7 @@ Handlebars.SafeString.prototype.toString = function() {
     }
   };
 })();;
-// lib/handlebars/vm.js
+// lib/handlebars/runtime.js
 Handlebars.VM = {
   template: function(templateSpec) {
     // Just add water
@@ -198,16 +203,18 @@ Handlebars.VM = {
     };
   },
   noop: function() { return ""; },
-  invokePartial: function(partial, name, context, helpers, partials) {
+  invokePartial: function(partial, name, context, helpers, partials, data) {
+    options = { helpers: helpers, partials: partials, data: data };
+
     if(partial === undefined) {
       throw new Handlebars.Exception("The partial " + name + " could not be found");
     } else if(partial instanceof Function) {
-      return partial(context, {helpers: helpers, partials: partials});
+      return partial(context, options);
     } else if (!Handlebars.compile) {
-      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in vm mode");
+      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
     } else {
       partials[name] = Handlebars.compile(partial);
-      return partials[name](context, {helpers: helpers, partials: partials});
+      return partials[name](context, options);
     }
   }
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70121416196800 !ruby/object:Gem::Requirement
+  requirement: &70164826032720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70121416196800
+  version_requirements: *70164826032720
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70121416182660 !ruby/object:Gem::Requirement
+  requirement: &70164826032300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121416182660
+  version_requirements: *70164826032300
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70121416181800 !ruby/object:Gem::Requirement
+  requirement: &70164826031760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,40 +43,7 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70121416181800
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70121416181240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70121416181240
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &70121416180860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121416180860
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70121416180380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121416180380
+  version_requirements: *70164826031760
 description: Compile Handlebars templates in the Rails asset pipeline.
 email:
 - leshill@gmail.com
@@ -101,7 +68,7 @@ files:
 - test/handlebars_assets/tilt_handlebars_test.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/handlebars.js
-- vendor/assets/javascripts/handlebars.vm.js
+- vendor/assets/javascripts/handlebars.runtime.js
 homepage: ''
 licenses: []
 post_install_message: