handlebars_assets 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    handlebars_assets (0.3.0)
+    handlebars_assets (0.3.1)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt

data/lib/handlebars_assets/tilt_handlebars.rb

@@ -23,9 +23,7 @@ module HandlebarsAssets
           (function() {
             this.HandlebarsTemplates || (this.HandlebarsTemplates = {});
             this.HandlebarsTemplates[#{template_name}] = Handlebars.template(#{compiled_hbs});
-            return function(context) {
-              return HandlebarsTemplates[#{template_name}](context);
-            };
+            return HandlebarsTemplates[#{template_name}];
           }).call(this);
         TEMPLATE
       end

data/lib/handlebars_assets/version.rb

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

data/test/handlebars_assets/tilt_handlebars_test.rb

@@ -23,9 +23,7 @@ module HandlebarsAssets
   else if(stack1=== undef) { stack1 = helperMissing.call(depth0, "handlebars", { hash: {} }); }
   buffer += escapeExpression(stack1);
   return buffer;});
-            return function(context) {
-              return HandlebarsTemplates["x11"](context);
-            };
+            return HandlebarsTemplates["x11"];
           }).call(this);
 END_EXPECTED
     end

data/vendor/assets/javascripts/handlebars.js

@@ -1,7 +1,7 @@
 // lib/handlebars/base.js
 var Handlebars = {};
 
-Handlebars.VERSION = "1.0.beta.2";
+Handlebars.VERSION = "1.0.beta.4";
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
@@ -545,7 +545,7 @@ case 25: 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.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;})()
 parser.lexer = lexer;
 return parser;
@@ -1087,6 +1087,8 @@ Handlebars.JavaScriptCompiler = function() {};
     initializeBuffer: function() {
       return this.quotedString("");
     },
+
+    namespace: "Handlebars",
     // END PUBLIC API
 
     compile: function(environment, options, context, asObject) {
@@ -1157,8 +1159,9 @@ Handlebars.JavaScriptCompiler = function() {};
       var out = [];
 
       if (!this.isChild) {
-        var copies = "helpers = helpers || Handlebars.helpers;";
-        if(this.environment.usePartial) { copies = copies + " partials = partials || Handlebars.partials;"; }
+        var namespace = this.namespace;
+        var copies = "helpers = helpers || " + namespace + ".helpers;";
+        if(this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; }
         out.push(copies);
       } else {
         out.push('');
@@ -1213,8 +1216,6 @@ Handlebars.JavaScriptCompiler = function() {};
         params.push("depth" + this.environment.depths.list[i]);
       }
 
-      if(params.length === 4 && !this.environment.usePartial) { params.pop(); }
-
       if (asObject) {
         params.push(this.source.join("\n  "));
 
@@ -1274,7 +1275,7 @@ Handlebars.JavaScriptCompiler = function() {};
               + " || "
               + this.nameLookup('depth' + this.lastContext, name, 'context');
         }
-        
+
         toPush += ';';
         this.source.push(toPush);
       } else {
@@ -1479,7 +1480,7 @@ Handlebars.JavaScriptCompiler = function() {};
   };
 
   var reservedWords = ("break case catch continue default delete do else finally " +
-                       "for function if in instanceof new return switch this throw " + 
+                       "for function if in instanceof new return switch this throw " +
                        "try typeof var void while with null true false").split(" ");
 
   var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};

data/vendor/assets/javascripts/handlebars.vm.js

@@ -1,7 +1,7 @@
 // lib/handlebars/base.js
 var Handlebars = {};
 
-Handlebars.VERSION = "1.0.beta.2";
+Handlebars.VERSION = "1.0.beta.4";
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70153366989600 !ruby/object:Gem::Requirement
+  requirement: &70121416196800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70153366989600
+  version_requirements: *70121416196800
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70153366988980 !ruby/object:Gem::Requirement
+  requirement: &70121416182660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70153366988980
+  version_requirements: *70121416182660
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70153366988440 !ruby/object:Gem::Requirement
+  requirement: &70121416181800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70153366988440
+  version_requirements: *70121416181800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70153366987940 !ruby/object:Gem::Requirement
+  requirement: &70121416181240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70153366987940
+  version_requirements: *70121416181240
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70153366987520 !ruby/object:Gem::Requirement
+  requirement: &70121416180860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153366987520
+  version_requirements: *70121416180860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70153366985780 !ruby/object:Gem::Requirement
+  requirement: &70121416180380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153366985780
+  version_requirements: *70121416180380
 description: Compile Handlebars templates in the Rails asset pipeline.
 email:
 - leshill@gmail.com