handlebars_assets 0.4.4 → 0.5.0

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.5.0 (2012-07-10)
+
+* #24 - Remove "templates/" from template names - @cw-moshe

data/Gemfile.lock

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

data/README.md

@@ -1,7 +1,3 @@
-# BREAKING CHANGE
-
-`handlebars.vm.js` was renamed to `handlebars.runtime.js`, please update your Javascript manifest.
-
 # 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?
@@ -58,9 +54,9 @@ If you need to compile your Javascript templates in the browser as well, you sho
 
 ## Templates directory
 
-You should locate your templates with your other assets, for example `app/assets/templates`. In your Javascript manifest file, use `require_tree` to pull in the templates
+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
+    //= require_tree ./templates
 
 ## The template file
 
@@ -74,7 +70,7 @@ For example, if you have new, edit, and show templates for a Contact model
         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.
+Your file extensions tell the asset pipeline how to process the file. Use `.hbs` to compile the template with Handlebars.
 
 If your file is `templates/contacts/new.hbs`, the asset pipeline will generate Javascript code
 
@@ -85,15 +81,6 @@ You can then invoke the resulting template in your application's Javascript
 
     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
 
 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:
@@ -116,19 +103,12 @@ Thank you Yehuda Katz (@wycats) for [handlebars.js](https://github.com/wycats/ha
 
 Thank you Charles Lowell (@cowboyd) for [therubyracer](https://github.com/cowboyd/therubyracer) and [handlebars.rb](https://github.com/cowboyd/handlebars.rb).
 
-# Contributing
+# Author
 
-Once you've made your great commits
+Hi, I'm Les Hill and I make things go.
 
-1. Fork
-1. Create a topic branch - git checkout -b my_branch
-1. Push to your branch - git push origin my_branch
-1. Create a Pull Request from your branch
-1. That's it!
+Follow me on [Github](https://github.com/leshill) and [Twitter](https://twitter.com/leshill).
 
-# Author
-
-* Les Hill (@leshill)
 
 # Contributors
 
@@ -139,3 +119,14 @@ Once you've made your great commits
 * Brendan Loudermilk (@bloudermilk) : HandlebarsAssets.path
 * Dan Evans          (@danevans)    : Rails 2 support
 * Ben Woosley        (@empact)      : Update to handlebars.js 1.0.0.beta.6
+*                    (@cw-moshe)    : Remove 'templates/' from names
+
+# Contributing
+
+Once you've made your great commits
+
+1. Fork
+1. Create a topic branch - git checkout -b my_branch
+1. Push to your branch - git push origin my_branch
+1. Create a Pull Request from your branch
+1. That's it!

data/lib/handlebars_assets/tilt_handlebars.rb

@@ -8,17 +8,18 @@ module HandlebarsAssets
 
     def evaluate(scope, locals, &block)
       name = basename(scope.logical_path)
+      relative_path = scope.logical_path.gsub(/^templates\/(.*)$/i, "\\1")
       compiled_hbs = Handlebars.precompile(data)
 
       if name.start_with?('_')
-        partial_name = name[1..-1].inspect
+        partial_name = relative_path.gsub(/\//, '_').gsub(/__/, '_').dump
         <<-PARTIAL
           (function() {
             Handlebars.registerPartial(#{partial_name}, Handlebars.template(#{compiled_hbs}));
           }).call(this);
         PARTIAL
       else
-        template_name = scope.logical_path.inspect
+        template_name = relative_path.dump
         <<-TEMPLATE
           (function() {
             this.HandlebarsTemplates || (this.HandlebarsTemplates = {});

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/test/handlebars_assets/tilt_handlebars_test.rb

@@ -2,23 +2,29 @@ require 'test_helper'
 
 module HandlebarsAssets
   class TiltHandlebarsTest < Test::Unit::TestCase
-    def test_render
-      # Try to act like sprockets.
-      scope = Object.new
-      class << scope
-        def logical_path ; 'x11' ; end
-      end
-      template = HandlebarsAssets::TiltHandlebars.new('/myapp/app/assets/templates/x11.jst.hbs') { "This is {{handlebars}}" }
-      assert_equal <<END_EXPECTED, template.render(scope, {})
+    # Try to act like sprockets.
+    def make_scope(root, file)
+      Class.new do
+        define_method(:logical_path) { pathname.to_s.gsub(root + '/', '').gsub(/\..*/, '') }
+
+        define_method(:pathname) { Pathname.new(root) + file }
+
+        define_method(:root_path) { root }
+      end.new
+    end
+
+    def hbs_compiled
+      <<END_EXPECTED
           (function() {
             this.HandlebarsTemplates || (this.HandlebarsTemplates = {});
             this.HandlebarsTemplates["x11"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   helpers = helpers || Handlebars.helpers;
-  var buffer = "", stack1, self=this, functionType="function", helperMissing=helpers.helperMissing, undef=void 0, escapeExpression=this.escapeExpression;
+  var buffer = "", stack1, foundHelper, self=this, functionType="function", helperMissing=helpers.helperMissing, undef=void 0, escapeExpression=this.escapeExpression;
 
 
   buffer += "This is ";
-  stack1 = helpers.handlebars || depth0.handlebars;
+  foundHelper = helpers.handlebars;
+  stack1 = foundHelper || depth0.handlebars;
   if(typeof stack1 === functionType) { stack1 = stack1.call(depth0, { hash: {} }); }
   else if(stack1=== undef) { stack1 = helperMissing.call(depth0, "handlebars", { hash: {} }); }
   buffer += escapeExpression(stack1);
@@ -27,5 +33,27 @@ module HandlebarsAssets
           }).call(this);
 END_EXPECTED
     end
+
+    def test_render
+      root = '/myapp/app/assets/templates'
+      file = 'x11.hbs'
+      scope = make_scope root, file
+
+      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { "This is {{handlebars}}" }
+
+      assert_equal hbs_compiled, template.render(scope, {})
+    end
+
+    # Sprockets does not add nested root paths (i.e.
+    # app/assets/javascripts/templates is rooted at app/assets/javascripts)
+    def test_template_misnaming
+      root = '/myapp/app/assets/javascripts'
+      file = 'templates/x11.hbs'
+      scope = make_scope root, file
+
+      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { "This is {{handlebars}}" }
+
+      assert_equal hbs_compiled, template.render(scope, {})
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70241519231440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70241519231440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70241519230900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241519230900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70241519230320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70241519230320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241519229840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241519229840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Compile Handlebars templates in the Rails asset pipeline.
 email:
 - leshill@gmail.com
@@ -64,6 +84,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
@@ -100,11 +121,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: handlebars_assets
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Compile Handlebars templates in the Rails asset pipeline.
 test_files:
 - test/handlebars_assets/tilt_handlebars_test.rb
 - test/test_helper.rb
-has_rdoc: