hogan_assets 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1 (2012-06-21)
+
+* #11 - Fix **hamstache** support, broken in 1.3.0
+
 ## 1.3.0 (2012-06-18)
 
 * #9 - Support lambda construct in **mustache**, set via `config.lambda_support = true`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hogan_assets (1.3.0)
+    hogan_assets (1.3.1)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -11,6 +11,7 @@ GEM
   specs:
     execjs (1.4.0)
       multi_json (~> 1.0)
+    haml (3.1.6)
     hike (1.2.1)
     multi_json (1.3.5)
     rack (1.4.1)
@@ -25,4 +26,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  haml
   hogan_assets!

data/README.md

@@ -91,10 +91,11 @@ I made this because I <3 **mustache** and want to use it in Rails. Follow me on
 
 # Contributors
 
-* @mdavidn     (Matthew Nelson) : Remove unnecessary template source
-* @ajacksified (Jack Lawson)    : Configurable file extension
-* @mikesmullin (Mike Smullin)   : hamstache support
-* @gleuch      (Greg Leuch)     : Mustache lambdas
+* @mdavidn     (Matthew Nelson)  :  Remove unnecessary template source
+* @ajacksified (Jack Lawson)     :  Configurable file extension
+* @mikesmullin (Mike Smullin)    :  hamstache support
+* @gleuch      (Greg Leuch)      :  Mustache lambdas
+* @lautis      (Ville Lautanala) :  hamstache fix
 
 ## Contributing
 

data/hogan_assets.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "execjs", ">= 1.2.9"
   gem.add_runtime_dependency "tilt", ">= 1.3.3"
   gem.add_runtime_dependency "sprockets", ">= 2.0.3"
+
+  gem.add_development_dependency "haml"
 end

data/lib/hogan_assets/tilt.rb

@@ -11,16 +11,14 @@ module HoganAssets
     end
 
     def evaluate(scope, locals, &block)
-      text = data # Ugly, yes, but to not taint data variable
-
-      if scope.pathname.extname == '.hamstache'
+      text = if scope.pathname.extname == '.hamstache'
         raise "Unable to complile #{scope.pathname} because haml is not available. Did you add the haml gem?" unless HoganAssets::Config.haml_available?
-        text = Haml::Engine.new(data, @options).render
-        compiled_template = Hogan.compile(source)
+        Haml::Engine.new(data, @options).render
       else
-        compiled_template = Hogan.compile(data)
+        data
       end
 
+      compiled_template = Hogan.compile(text)
       template_name = scope.logical_path.inspect
 
       # Only emit the source template if we are using lambdas

data/lib/hogan_assets/version.rb

@@ -1,3 +1,3 @@
 module HoganAssets
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/test/hogan_assets/tilt_test.rb

@@ -2,12 +2,16 @@ require 'test_helper'
 
 module HoganAssets
   class TiltTest < Test::Unit::TestCase
-    def scope
-      Class.new do
-        def logical_path ; 'path/to/template' ; end
+    def scope(path)
+      instance = Class.new do
+        attr_accessor :_path
 
-        def pathname ; Pathname.new logical_path ; end
+        def logical_path ; _path.gsub /\..*/, '' ; end
+
+        def pathname ; Pathname.new _path ; end
       end.new
+      instance._path = path
+      instance
     end
 
     def test_mime_type
@@ -15,17 +19,28 @@ module HoganAssets
     end
 
     def test_render
-      template = HoganAssets::Tilt.new('/myapp/app/assets/templates/path/to/template.mustache') { "This is {{mustache}}" }
-      assert_equal <<-END_EXPECTED, template.render(scope, {})
+      path = 'path/to/template.mustache'
+      template = HoganAssets::Tilt.new(path) { "This is {{mustache}}" }
+      assert_equal <<-END_EXPECTED, template.render(scope(path), {})
         this.HoganTemplates || (this.HoganTemplates = {});
         this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "", Hogan, {});
       END_EXPECTED
     end
 
+    def test_hamstache_render
+      path = 'path/to/template.hamstache'
+      template = HoganAssets::Tilt.new(path) { "%p This is {{hamstache}}" }
+      assert_equal <<-END_EXPECTED, template.render(scope(path), {})
+        this.HoganTemplates || (this.HoganTemplates = {});
+        this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"<p>This is \");t.b(t.v(t.f(\"hamstache\",c,p,0)));t.b(\"</p>\");t.b(\"\\n\");return t.fl(); },partials: {}, subs: {  }}, \"\", Hogan, {});
+      END_EXPECTED
+    end
+
     def test_render_with_lambdas
+      path = 'path/to/template.mustache'
       HoganAssets::Config.lambda_support = true
-      template = HoganAssets::Tilt.new('/myapp/app/assets/templates/path/to/template.mustache') { "This is {{mustache}}" }
-      assert_equal <<-END_EXPECTED, template.render(scope, {})
+      template = HoganAssets::Tilt.new(path) { "This is {{mustache}}" }
+      assert_equal <<-END_EXPECTED, template.render(scope(path), {})
         this.HoganTemplates || (this.HoganTemplates = {});
         this.HoganTemplates[\"path/to/template\"] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||\"\");t.b(\"This is \");t.b(t.v(t.f(\"mustache\",c,p,0)));return t.fl(); },partials: {}, subs: {  }}, "This is {{mustache}}", Hogan, {});
       END_EXPECTED

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hogan_assets
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use compiled hogan.js (mustache) JavaScript templates with sprockets
   and the Rails asset pipeline.
 email: