handlebars_assets 0.10.0 → 0.11.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## On master
 
+## 0.11.0 (2013-02-15)
+
+* Update to handlebars.js 1.0.0-rc.3 - @akshayrawat
+* Add github markdown to README - @phlipper
+
 ## 0.10.0 (2013-01-29)
 
 * Support `.slimbars` extension for Slim templates - @davidlee

data/Gemfile.lock

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

data/README.md

@@ -6,23 +6,23 @@ 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)
 
-# BREAKING CHANGE IN v0.9.0
+# BREAKING CHANGE AS OF v0.9.0
 
-My pull request to allow `/` in partials was pulled into Handlebars. The hack that converted partial names to underscored paths (`shared/_time` -> `_shared_time`) is no longer necessary and has been removed. You should change all the partial references in your app when going to v0.9.x.
+My pull request to allow `/` in partials was pulled into Handlebars. The hack that converted partial names to underscored paths (`shared/_time` -> `_shared_time`) is no longer necessary and has been removed. You should change all the partial references in your app when upgrading from a version prior to v0.9.0.
 
-## Edge version of handlebars.js
+## Version of handlebars.js
 
-*Please read*
-
-`handlebars_assets` is packaged with an edge build of `handlebars.js` (this [commit](https://github.com/wycats/handlebars.js/commit/a3376e24b1a25f72cf86d1d999bd2ea93fa4dc39)). See the section on using another version if that does not work for you.
+`handlebars_assets` is packaged with an 1.0.0-rc3 of `handlebars.js`. See the section on using another version if that does not work for you.
 
 ## Installation with Rails 3.1+
 
 Load `handlebars_assets` in your `Gemfile` as part of the `assets` group
 
-    group :assets do
-      gem 'handlebars_assets'
-    end
+```ruby
+group :assets do
+  gem 'handlebars_assets'
+end
+```
 
 ## Installation without Rails 3.1+
 
@@ -30,27 +30,34 @@ Load `handlebars_assets` in your `Gemfile` as part of the `assets` group
 
 Load `handlebars_assets` in your `Gemfile`
 
-    gem 'handlebars_assets'
+```ruby
+gem 'handlebars_assets'
+```
 
 Add the `HandlebarsAssets.path` to your `Sprockets::Environment` instance. This
 lets Sprockets know where the Handlebars JavaScript files are and is required
 for the next steps to work.
 
-    env = Sprockets::Environment.new
-
-    require 'handlebars_assets'
-    env.append_path HandlebarsAssets.path
+```ruby
+env = Sprockets::Environment.new
 
+require 'handlebars_assets'
+env.append_path HandlebarsAssets.path
+```
 
 # Compiling your JavaScript templates in the Rails asset pipeline
 
 Require `handlebars.runtime.js` in your JavaScript manifest (i.e. `application.js`)
 
-    //= require handlebars.runtime
+```javascript
+//= 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)
 
-    //= require handlebars
+```javascript
+//= require handlebars
+```
 
 ## Precompiling
 
@@ -64,13 +71,17 @@ If you are using `rake assets:precompile`, you have to re-run the `rake` command
 
 If you are deploying to Heroku, be sure to read the [Rails guide](http://guides.rubyonrails.org/asset_pipeline.html#precompiling-assets) and in your `config/application.rb` set:
 
-    config.assets.initialize_on_precompile = false
+```ruby
+config.assets.initialize_on_precompile = false
+```
 
 This avoids running your initializers when compiling assets (see the [guide](http://guides.rubyonrails.org/asset_pipeline.html#precompiling-assets) for why you would want that).
 
 However, that does mean that you cannot set your configuration in an initializer. This [issue](https://github.com/leshill/handlebars_assets/issues/34) has a workaround, or you can set:
 
-    config.assets.initialize_on_precompile = true
+```ruby
+config.assets.initialize_on_precompile = true
+```
 
 This will run all your initializers before precompiling assets.
 
@@ -78,7 +89,9 @@ This will run all your initializers before precompiling assets.
 
 You should locate your templates with your other assets, for example `app/assets/javascripts/templates`. In your JavaScript manifest file, use `require_tree` to pull in the templates
 
-    //= require_tree ./templates
+```javascripts
+//= require_tree ./templates
+```
 
 ## The template file
 
@@ -86,11 +99,13 @@ Write your Handlebars templates as standalone files in your templates directory.
 
 For example, if you have new, edit, and show templates for a Contact model
 
-    templates/
-      contacts/
-        new.hbs
-        edit.hbs
-        show.hbs
+```
+templates/
+  contacts/
+    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.
 
@@ -101,7 +116,9 @@ If your file is `templates/contacts/new.hbs`, the asset pipeline will generate J
 
 You can then invoke the resulting template in your application's JavaScript
 
-    HandlebarsTemplates['contacts/new'](context);
+```javascript
+HandlebarsTemplates['contacts/new'](context);
+```
 
 ## The template namespace
 
@@ -109,14 +126,18 @@ By default, the global JavaScript object that holds the compiled templates is `H
 be easily renamed. Another common template namespace is `JST`.  Just change the `template_namespace` configuration option
 when you initialize your application.
 
-    HandlebarsAssets::Config.template_namespace = 'JST'
+```ruby
+HandlebarsAssets::Config.template_namespace = 'JST'
+```
 
 ## Ember
 
 To compile your templates for use with [Ember.js](http://emberjs.com)
 simply turn on the config option
 
-    HandlebarsAssets::Config.ember = true
+```ruby
+HandlebarsAssets::Config.ember = true
+```
 
 ## `.hamlbars` and `.slimbars`
 
@@ -124,13 +145,17 @@ If you name your templates with the extension `.hamlbars`, you can use Haml synt
 
 For example, if you have a file `widget.hamlbars` that looks like this:
 
-    %h1 {{title}}
-    %p {{body}}
+```haml
+%h1 {{title}}
+%p {{body}}
+```
 
 The Haml will be pre-processed so that the Handlebars template is basically this:
 
-    <h1> {{title}} </h1>
-    <p> {{body}} </p>
+```html
+<h1> {{title}} </h1>
+<p> {{body}} </p>
+```
 
 The same applies to `.slimbars` and the Slim gem. Use `HandlebarsAssets::Config.slim_options` to pass custom options to the Slim rendering engine.
 
@@ -138,14 +163,18 @@ The same applies to `.slimbars` and the Slim gem. Use `HandlebarsAssets::Config.
 
 If you begin the name of the template with an underscore, it will be recognized as a partial. You can invoke partials inside a template using the Handlebars partial syntax:
 
-    Invoke a {{> path/to/_partial }}
+```
+Invoke a {{> path/to/_partial }}
+```
 
 ## Using another version of `handlebars.js`
 
 Occasionally you might need to use a version of `handlebars.js` other than the included version. You can set the `compiler_path` and `compiler` options to use a custom version of `handlebars.js`.
 
-    HandlebarsAssets::Config.compiler = 'my_handlebars.js' # Change the name of the compiler file
-    HandlebarsAssets::Config.compiler_path = Rails.root.join('app/assets/javascripts') # Change the location of the compiler file
+```ruby
+HandlebarsAssets::Config.compiler = 'my_handlebars.js' # Change the name of the compiler file
+HandlebarsAssets::Config.compiler_path = Rails.root.join('app/assets/javascripts') # Change the location of the compiler file
+```
 
 # Thanks
 
@@ -179,6 +208,8 @@ Follow me on [Github](https://github.com/leshill) and [Twitter](https://twitter.
 * Tristan Koch       (@trkoch)        : Strip leading whitespace from compiled templates
 * Brian Cardarella   (@bcardarella)   : Ember support
 * David Lee          (@davidlee)      : Slim support
+* Phil Cohen         (@phlipper)      : README cleanup
+* Akshay Rawat       (@akshayrawat)   : Update to handlebars.js 1.0.0-rc.3
 
 # Contributing
 

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/vendor/assets/javascripts/handlebars.js

@@ -29,7 +29,13 @@ this.Handlebars = {};
 
 (function(Handlebars) {
 
-Handlebars.VERSION = "1.0.rc.2";
+Handlebars.VERSION = "1.0.0-rc.3";
+Handlebars.COMPILER_REVISION = 2;
+
+Handlebars.REVISION_CHANGES = {
+  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+  2: '>= 1.0.0-rc.3'
+};
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
@@ -642,9 +648,13 @@ return new Parser;
 // lib/handlebars/compiler/base.js
 Handlebars.Parser = handlebars;
 
-Handlebars.parse = function(string) {
+Handlebars.parse = function(input) {
+
+  // Just return if an already-compile AST was passed in.
+  if(input.constructor === Handlebars.AST.ProgramNode) { return input; }
+
   Handlebars.Parser.yy = Handlebars.AST;
-  return Handlebars.Parser.parse(string);
+  return Handlebars.Parser.parse(input);
 };
 
 Handlebars.print = function(ast) {
@@ -1380,6 +1390,12 @@ Handlebars.JavaScriptCompiler = function() {};
       // Perform a second pass over the output to merge content when possible
       var source = this.mergeSource();
 
+      if (!this.isChild) {
+        var revision = Handlebars.COMPILER_REVISION,
+            versions = Handlebars.REVISION_CHANGES[revision];
+        source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
+      }
+
       if (asObject) {
         params.push(source);
 
@@ -2059,23 +2075,23 @@ Handlebars.JavaScriptCompiler = function() {};
 
 })(Handlebars.Compiler, Handlebars.JavaScriptCompiler);
 
-Handlebars.precompile = function(string, options) {
-  if (typeof string !== 'string') {
-    throw new Handlebars.Exception("You must pass a string to Handlebars.compile. You passed " + string);
+Handlebars.precompile = function(input, options) {
+  if (!input || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
+    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
   }
 
   options = options || {};
   if (!('data' in options)) {
     options.data = true;
   }
-  var ast = Handlebars.parse(string);
+  var ast = Handlebars.parse(input);
   var environment = new Handlebars.Compiler().compile(ast, options);
   return new Handlebars.JavaScriptCompiler().compile(environment, options);
 };
 
-Handlebars.compile = function(string, options) {
-  if (typeof string !== 'string') {
-    throw new Handlebars.Exception("You must pass a string to Handlebars.compile. You passed " + string);
+Handlebars.compile = function(input, options) {
+  if (!input || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
+    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
   }
 
   options = options || {};
@@ -2084,7 +2100,7 @@ Handlebars.compile = function(string, options) {
   }
   var compiled;
   function compile() {
-    var ast = Handlebars.parse(string);
+    var ast = Handlebars.parse(input);
     var environment = new Handlebars.Compiler().compile(ast, options);
     var templateSpec = new Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
     return Handlebars.template(templateSpec);
@@ -2119,12 +2135,32 @@ Handlebars.VM = {
         }
       },
       programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop
+      noop: Handlebars.VM.noop,
+      compilerInfo: null
     };
 
     return function(context, options) {
       options = options || {};
-      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+
+      var compilerInfo = container.compilerInfo || [],
+          compilerRevision = compilerInfo[0] || 1,
+          currentRevision = Handlebars.COMPILER_REVISION;
+
+      if (compilerRevision !== currentRevision) {
+        if (compilerRevision < currentRevision) {
+          var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
+              compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
+          throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
+                "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
+        } else {
+          // Use the embedded version info since the runtime doesn't know about this revision yet
+          throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
+                "Please update your runtime to a newer version ("+compilerInfo[1]+").";
+        }
+      }
+
+      return result;
     };
   },
 

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

@@ -29,7 +29,13 @@ this.Handlebars = {};
 
 (function(Handlebars) {
 
-Handlebars.VERSION = "1.0.rc.2";
+Handlebars.VERSION = "1.0.0-rc.3";
+Handlebars.COMPILER_REVISION = 2;
+
+Handlebars.REVISION_CHANGES = {
+  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+  2: '>= 1.0.0-rc.3'
+};
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
@@ -249,12 +255,32 @@ Handlebars.VM = {
         }
       },
       programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop
+      noop: Handlebars.VM.noop,
+      compilerInfo: null
     };
 
     return function(context, options) {
       options = options || {};
-      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+
+      var compilerInfo = container.compilerInfo || [],
+          compilerRevision = compilerInfo[0] || 1,
+          currentRevision = Handlebars.COMPILER_REVISION;
+
+      if (compilerRevision !== currentRevision) {
+        if (compilerRevision < currentRevision) {
+          var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
+              compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
+          throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
+                "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
+        } else {
+          // Use the embedded version info since the runtime doesn't know about this revision yet
+          throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
+                "Please update your runtime to a newer version ("+compilerInfo[1]+").";
+        }
+      }
+
+      return result;
     };
   },
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.9
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.9
-    none: false
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
-    none: false
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Compile Handlebars templates in the Rails asset pipeline.
 email:
 - leshill@gmail.com
@@ -144,20 +144,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: handlebars_assets
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Compile Handlebars templates in the Rails asset pipeline.