handlebars_assets 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## On master
+
+## 0.7.2 (2012-12-25)
+
+* Note use of `rake assets:precompile` in README
+* Strip leading whitespace from compiled templates - @trkoch
+
 ## 0.7.1 (2012-12-4)
 
 * Use edge version of `handlebars.js` ([this commit](https://github.com/wycats/handlebars.js/commit/bd0490145438e8f9df05abd2f4c25687bac81326)) to fix regression with context functions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    handlebars_assets (0.7.1)
+    handlebars_assets (0.7.2)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt
@@ -15,7 +15,7 @@ GEM
     hike (1.2.1)
     multi_json (1.4.0)
     rack (1.4.1)
-    rake (0.9.2.2)
+    rake (10.0.3)
     sprockets (2.8.1)
       hike (~> 1.2)
       multi_json (~> 1.0)

data/README.md

@@ -52,6 +52,10 @@ If you need to compile your JavaScript templates in the browser as well, you sho
 
 `handlebars_assets` also works when you are precompiling your assets.
 
+### `rake assets:precompile`
+
+If you are using `rake assets:precompile`, you have to re-run the `rake` command to rebuild any changed templates. See the [Rails guide](http://guides.rubyonrails.org/asset_pipeline.html#precompiling-assets) for more details.
+
 ### Heroku
 
 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:
@@ -170,6 +174,7 @@ Follow me on [Github](https://github.com/leshill) and [Twitter](https://twitter.
 * Ken Mayer          (@kmayer)        : Quick fix for template\_namespace option
 * Brad Murray        (@wyaeld)        : Generic options support
 * Blake Williams     (@BlakeWilliams) : .handlebars extension
+* Tristan Koch       (@trkoch)        : Strip leading whitespace from compiled templates
 
 # Contributing
 

data/lib/handlebars_assets/tilt_handlebars.rb

@@ -1,8 +1,20 @@
 require 'tilt'
 
 module HandlebarsAssets
+  module Unindent
+    # http://bit.ly/aze9FV
+    # Strip leading whitespace from each line that is the same as the
+    # amount of whitespace on the first line of the string.
+    # Leaves _additional_ indentation on later lines intact.
+    def unindent(heredoc)
+      heredoc.gsub /^#{heredoc[/\A\s*/]}/, ''
+    end
+  end
+
   class TiltHandlebars < Tilt::Template
 
+    include Unindent
+
     def self.default_mime_type
       'application/javascript'
     end
@@ -21,13 +33,13 @@ module HandlebarsAssets
       template_namespace = HandlebarsAssets::Config.template_namespace
 
       if template_path.is_partial?
-        <<-PARTIAL
+        unindent <<-PARTIAL
           (function() {
             Handlebars.registerPartial(#{template_path.name}, Handlebars.template(#{compiled_hbs}));
           }).call(this);
         PARTIAL
       else
-        <<-TEMPLATE
+        unindent <<-TEMPLATE
           (function() {
             this.#{template_namespace} || (this.#{template_namespace} = {});
             this.#{template_namespace}[#{template_path.name}] = Handlebars.template(#{compiled_hbs});

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/handlebars_assets/hamlbars_test.rb

@@ -1,32 +1,14 @@
 require 'test_helper'
 
 module HandlebarsAssets
-  class TiltHandlebarsTest < Test::Unit::TestCase
+  class HamlbarsTest < Test::Unit::TestCase
     include SprocketsScope
+    include CompilerSupport
 
-    def expected_haml_compiled(source)
+    def compile_haml(source)
       Haml::Engine.new(source, HandlebarsAssets::Config.haml_options).render
     end
 
-    def expected_hbs_compiled(source)
-      compiler_src = Pathname(HandlebarsAssets::Config.compiler_path).join(HandlebarsAssets::Config.compiler).read
-      ExecJS.compile(compiler_src).call('Handlebars.precompile', source, HandlebarsAssets::Config.options)
-    end
-
-    def haml_compiled(template_name, source)
-      compiled_haml = expected_haml_compiled(source)
-      compiled_hbs = expected_hbs_compiled(compiled_haml)
-      template_namespace = HandlebarsAssets::Config.template_namespace
-
-      <<END_EXPECTED
-          (function() {
-            this.#{template_namespace} || (this.#{template_namespace} = {});
-            this.#{template_namespace}[#{template_name.dump}] = Handlebars.template(#{compiled_hbs});
-            return this.#{template_namespace}[#{template_name.dump}];
-          }).call(this);
-END_EXPECTED
-    end
-
     def teardown
       HandlebarsAssets::Config.reset!
       HandlebarsAssets::Handlebars.reset!
@@ -40,7 +22,7 @@ END_EXPECTED
 
       template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
 
-      assert_equal haml_compiled('test_render', source), template.render(scope, {})
+      assert_equal hbs_compiled('test_render', compile_haml(source)), template.render(scope, {})
     end
   end
 end

data/test/handlebars_assets/tilt_edge_test.rb

@@ -1,28 +1,9 @@
 require 'test_helper'
 
 module HandlebarsAssets
-  class TiltHandlebarsTest < Test::Unit::TestCase
+  class TiltEdgeTest < Test::Unit::TestCase
     include SprocketsScope
-
-    def hbs_edge_compiled(template_name)
-      <<END_EXPECTED
-          (function() {
-            this.HandlebarsTemplates || (this.HandlebarsTemplates = {});
-            this.HandlebarsTemplates[\"#{template_name}\"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  helpers = helpers || Handlebars.helpers;
-  var buffer = \"\", stack1, foundHelper, functionType=\"function\", escapeExpression=this.escapeExpression;
-
-
-  buffer += \"This is \";
-  foundHelper = helpers.handlebars;
-  if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{}}); }
-  else { stack1 = depth0.handlebars; stack1 = typeof stack1 === functionType ? stack1() : stack1; }
-  buffer += escapeExpression(stack1);
-  return buffer;});
-            return this.HandlebarsTemplates[\"#{template_name}\"];
-          }).call(this);
-END_EXPECTED
-    end
+    include CompilerSupport
 
     def teardown
       HandlebarsAssets::Config.reset!
@@ -33,12 +14,13 @@ END_EXPECTED
       root = '/myapp/app/assets/templates'
       file = 'test_render.hbs'
       scope = make_scope root, file
+      source = "This is {{handlebars}}"
 
       HandlebarsAssets::Config.compiler_path = File.expand_path '../../edge', __FILE__
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { "This is {{handlebars}}" }
+      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
 
-      assert_equal hbs_edge_compiled('test_render'), template.render(scope, {})
+      assert_equal hbs_compiled('test_render', source), template.render(scope, {})
     end
   end
 end

data/test/handlebars_assets/tilt_handlebars_test.rb

@@ -2,36 +2,9 @@ require 'test_helper'
 
 module HandlebarsAssets
   class TiltHandlebarsTest < Test::Unit::TestCase
+    include CompilerSupport
     include SprocketsScope
 
-    def expected_compiled(source)
-      compiler_src = Pathname(HandlebarsAssets::Config.compiler_path).join(HandlebarsAssets::Config.compiler).read
-      ExecJS.compile(compiler_src).call('Handlebars.precompile', source, HandlebarsAssets::Config.options)
-    end
-
-    def hbs_compiled(template_name, source)
-      compiled_hbs = expected_compiled(source)
-      template_namespace = HandlebarsAssets::Config.template_namespace
-
-      <<END_EXPECTED
-          (function() {
-            this.#{template_namespace} || (this.#{template_namespace} = {});
-            this.#{template_namespace}[#{template_name.dump}] = Handlebars.template(#{compiled_hbs});
-            return this.#{template_namespace}[#{template_name.dump}];
-          }).call(this);
-END_EXPECTED
-    end
-
-    def hbs_compiled_partial(partial_name, source)
-      compiled_hbs = expected_compiled(source)
-
-      <<END_EXPECTED
-          (function() {
-            Handlebars.registerPartial(#{partial_name.dump}, Handlebars.template(#{compiled_hbs}));
-          }).call(this);
-END_EXPECTED
-    end
-
     def teardown
       HandlebarsAssets::Config.reset!
       HandlebarsAssets::Handlebars.reset!

data/test/test_helper.rb

@@ -18,6 +18,38 @@ module SprocketsScope
   end
 end
 
+module CompilerSupport
+  include HandlebarsAssets::Unindent
+
+  def compile_hbs(source)
+    compiler_src = Pathname(HandlebarsAssets::Config.compiler_path).join(HandlebarsAssets::Config.compiler).read
+    ExecJS.compile(compiler_src).call('Handlebars.precompile', source, HandlebarsAssets::Config.options)
+  end
+
+  def hbs_compiled(template_name, source)
+    compiled_hbs = compile_hbs(source)
+    template_namespace = HandlebarsAssets::Config.template_namespace
+
+    unindent <<-END_EXPECTED
+      (function() {
+        this.#{template_namespace} || (this.#{template_namespace} = {});
+        this.#{template_namespace}[#{template_name.dump}] = Handlebars.template(#{compiled_hbs});
+        return this.#{template_namespace}[#{template_name.dump}];
+      }).call(this);
+    END_EXPECTED
+  end
+
+  def hbs_compiled_partial(partial_name, source)
+    compiled_hbs = compile_hbs(source)
+
+    unindent <<-END_EXPECTED
+      (function() {
+        Handlebars.registerPartial(#{partial_name.dump}, Handlebars.template(#{compiled_hbs}));
+      }).call(this);
+    END_EXPECTED
+  end
+end
+
 module HandlebarsAssets
   module Config
     extend self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,88 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-25 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
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
   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
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+    none: false
   prerelease: false
+  type: :development
   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'
-  type: :development
+    none: false
   prerelease: false
+  type: :development
   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
@@ -127,17 +127,17 @@ 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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: handlebars_assets
 rubygems_version: 1.8.24