mustache 0.3.0 → 0.3.1

data/HISTORY.md

@@ -1,4 +1,16 @@
-## 0.3.0 (2009-??-??)
+## 0.3.2 (2009-10-19)
+
+* Bugfix: Partials in Sinatra were using the wrong path.
+
+## 0.3.1 (2009-10-19)
+
+* Added mustache.vim to contrib/ (Thanks Juvenn Woo!)
+* Support string keys in contexts (not just symbol keys).
+* Bugfix: # and / were not permitted in tag names. Now they are.
+* Bugfix: Partials in Sinatra needed to know their extension and path
+* Bugfix: Using the same boolean section twice was failing
+
+## 0.3.0 (2009-10-14)
 
 * Set Delimiter tags are now supported. See the README
 * Improved error message when an enumerable section did not return all

data/README.md

@@ -364,6 +364,13 @@ An example Sinatra application is also provided:
 <http://github.com/defunkt/mustache-sinatra-example>
 
 
+Vim
+---
+
+Thanks to [Juvenn Woo](http://github.com/juvenn) for mustache.vim. It
+is included under the contrib/ directory.
+
+
 Installation
 ------------
 

data/Rakefile

@@ -9,6 +9,9 @@ Rake::TestTask.new do |t|
   t.verbose = false
 end
 
+desc "Build a gem"
+task :gem => [ :gemspec, :build ]
+
 desc "Launch Kicker (like autotest)"
 task :kicker do
   puts "Kicking... (ctrl+c to cancel)"
@@ -40,7 +43,7 @@ rescue LoadError
 end
 
 desc "Push a new version to Gemcutter"
-task :publish => [ :gemspec, :build ] do
+task :publish => [ :test, :gemspec, :build ] do
   system "git tag v#{Mustache::Version}"
   system "git push origin v#{Mustache::Version}"
   system "gem push pkg/mustache-#{Mustache::Version}.gem"

data/benchmarks/complex.haml

@@ -0,0 +1,10 @@
+%h1= header
+- item.each do |i|
+  %ul
+    - if i[:current]
+      %li= i[:name]
+    - else
+      %li
+        %a{:href => i[:url]}= i[:name]
+- if item.empty?
+  %p= The list is empty.

data/benchmarks/speed.rb

@@ -11,17 +11,40 @@ template = File.read(File.dirname(__FILE__) + '/complex.erb')
 
 unless ENV['NOERB']
   erb =  ERB.new(template)
-  bench 'ERB w/ caching' do
-    erb.result(ComplexView.new.send(:binding))
+  scope = ComplexView.new.send(:binding)
+  bench 'ERB  w/ caching' do
+    erb.result(scope)
   end
 
   unless ENV['CACHED']
-    bench 'ERB w/o caching' do
-      ERB.new(template).result(ComplexView.new.send(:binding))
+    scope = ComplexView.new.send(:binding)
+    bench 'ERB  w/o caching' do
+      ERB.new(template).result(scope)
     end
   end
 end
 
+
+## haml
+require 'haml'
+template = File.read(File.dirname(__FILE__) + '/complex.haml')
+
+unless ENV['NOHAML']
+  haml = Haml::Engine.new(template)
+  scope = ComplexView.new.send(:binding)
+  bench 'HAML w/ caching' do
+    haml.render(scope)
+  end
+
+  unless ENV['CACHED']
+    scope = ComplexView.new.send(:binding)
+    bench 'HAML w/o caching' do
+      Haml::Engine.new(template).render(scope)
+    end
+  end
+end
+
+
 ## mustache
 tpl = ComplexView.new
 tpl.template
@@ -37,14 +60,14 @@ items << { :name => 'blue', :current => false, :url => '#Blue' }
 
 tpl[:item] = items
 
-bench '{   w/ caching' do
+bench '{{   w/ caching' do
   tpl.to_html
 end
 
 content = File.read(ComplexView.template_file)
 
 unless ENV['CACHED']
-  bench '{   w/o caching' do
+  bench '{{   w/o caching' do
     ctpl = ComplexView.new
     ctpl.template = content
     ctpl[:item] = items

data/contrib/mustache.vim

@@ -0,0 +1,69 @@
+" Vim syntax file
+" Language:	Mustache
+" Maintainer:	Juvenn Woo <machese@gmail.com>
+" Screenshot:   http://imgur.com/6F408
+" Version:	1
+" Last Change:  2009 Oct 15
+" Remark:       
+"   It lexically hilights embedded mustaches (exclusively) in html file. 
+"   While it was written for Ruby-based Mustache template system, it should work for Google's C-based *ctemplate* as well as Erlang-based *et*. All of them are, AFAIK, based on the idea of ctemplate.
+" References:	
+"   [Mustache](http://github.com/defunkt/mustache)
+"   [ctemplate](http://code.google.com/p/google-ctemplate/)
+"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
+"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
+" TODO: Feedback is welcomed.
+
+
+" Read the HTML syntax to start with
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+  unlet b:current_syntax
+endif
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Standard HiLink will not work with included syntax files
+if version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syntax match mustacheError '}}}\?'
+syntax match mustacheInsideError '{{[{#<>=!\/]\?' containedin=@mustacheInside
+syntax region mustacheVariable matchgroup=mustacheMarker start=/{{/ end=/}}/ containedin=@htmlMustacheContainer 
+syntax region mustacheVariableUnescape matchgroup=mustacheMarker start=/{{{/ end=/}}}/ containedin=@htmlMustacheContainer
+syntax region mustacheSection matchgroup=mustacheMarker start='{{[#/]' end=/}}/ containedin=@htmlMustacheContainer
+syntax region mustachePartial matchgroup=mustacheMarker start=/{{[<>]/ end=/}}/
+syntax region mustacheMarkerSet matchgroup=mustacheMarker start=/{{=/ end=/=}}/
+syntax region mustacheComment start=/{{!/ end=/}}/ contains=Todo containedin=htmlHead
+
+
+" Clustering
+syntax cluster mustacheInside add=mustacheVariable,mustacheVariableUnescape,mustacheSection,mustachePartial,mustacheMarkerSet
+syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6
+
+
+" Hilighting
+" mustacheInside hilighted as Number, which is rarely used in html
+" you might like change it to Function or Identifier
+HtmlHiLink mustacheVariable Number
+HtmlHiLink mustacheVariableUnescape Number
+HtmlHiLink mustachePartial Number
+HtmlHiLink mustacheSection Number
+HtmlHiLink mustacheMarkerSet Number
+
+HtmlHiLink mustacheComment Comment
+HtmlHiLink mustacheMarker Identifier
+HtmlHiLink mustacheError Error
+HtmlHiLink mustacheInsideError Error
+
+let b:current_syntax = "mustache"
+delcommand HtmlHiLink

data/examples/comments.html

@@ -1 +1 @@
-<h1>{{title}}{{! just something interesting... or not... }}</h1>
+<h1>{{title}}{{! just something interesting... #or not... }}</h1>

data/examples/double_section.html

@@ -0,0 +1,7 @@
+{{#t}}
+  * first
+{{/t}}
+* {{two}}
+{{#t}}
+  * third
+{{/t}}

data/examples/double_section.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'mustache'
+
+class DoubleSection < Mustache
+  self.path = File.dirname(__FILE__)
+
+  def t
+    true
+  end
+
+  def two
+    "second"
+  end
+end

data/lib/mustache/context.rb

@@ -10,6 +10,8 @@ class Mustache
     def [](name)
       if has_key?(name)
         super
+      elsif has_key?(name.to_s)
+        super(name.to_s)
       elsif @mustache.respond_to?(name)
         @mustache.send(name)
       else

data/lib/mustache/sinatra.rb

@@ -76,6 +76,18 @@ class Mustache
 
         end
 
+        # Tell the view class its extension and path so finding partials
+        # works as expected.
+        if klass.template_extension != 'mustache'
+          klass.template_extension = 'mustache'
+        end
+
+        # Confusingly Sinatra's `views` setting tells Mustache where the
+        # templates are found. It's fine, blame Chris.
+        if klass.template_path != options.views
+          klass.template_path = options.views
+        end
+
         # Create a new instance for playing with
         instance = klass.new
 

data/lib/mustache/template.rb

@@ -47,7 +47,7 @@ class Mustache
     # If enumerable, the return value is iterated over (a `for` loop).
     def compile_sections(src)
       res = ""
-      while src =~ /#{otag}\#(.+)#{ctag}\s*(.+)#{otag}\/\1#{ctag}\s*/m
+      while src =~ /#{otag}\#([^\}]*)#{ctag}\s*(.+?)#{otag}\/\1#{ctag}\s*/m
         # $` = The string to the left of the last successful match
         res << compile_tags($`)
         name = $1.strip.to_sym.inspect
@@ -85,7 +85,7 @@ class Mustache
     # 4. Partial tags - {{< partial_name }}
     def compile_tags(src)
       res = ""
-      while src =~ /#{otag}(=|!|<|\{)?([^\/#]+?)\1?#{ctag}+/
+      while src =~ /#{otag}(=|!|<|\{)?(.+?)\1?#{ctag}+/
         res << str($`)
         case $1
         when '!'

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.3.0'
+  Version = '0.3.1'
 end

data/test/mustache_test.rb

@@ -10,6 +10,7 @@ require 'unescaped'
 require 'comments'
 require 'passenger'
 require 'delimiters'
+require 'double_section'
 
 class MustacheTest < Test::Unit::TestCase
   def test_passenger
@@ -143,7 +144,6 @@ Welcome
 end_partial
   end
 
-
   def test_delimiters
     assert_equal <<-end_partial, Delimiters.render
 
@@ -155,6 +155,14 @@ end_partial
 end_partial
   end
 
+  def test_double_section
+    assert_equal <<-end_section.strip, DoubleSection.render.strip
+* first
+* second
+* third
+end_section
+  end
+
   def test_comments
     assert_equal "<h1>A Comedy of Errors</h1>\n", Comments.render
   end
@@ -224,6 +232,14 @@ data
     assert_equal '<li>1234</li>', instance.render.strip
   end
 
+  def test_enumerable_sections_accept_a_string_keyed_hash_as_a_context
+    instance = Mustache.new
+    instance[:list] = { 'item' => 1234 }
+    instance.template = '{{#list}} <li>{{item}}</li> {{/list}}'
+
+    assert_equal '<li>1234</li>', instance.render.strip
+  end
+
   def test_knows_when_its_been_compiled_when_set_with_string
     klass = Class.new(Mustache)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -07:00
+date: 2009-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,15 +31,19 @@ files:
 - README.md
 - Rakefile
 - benchmarks/complex.erb
+- benchmarks/complex.haml
 - benchmarks/helper.rb
 - benchmarks/simple.erb
 - benchmarks/speed.rb
+- contrib/mustache.vim
 - examples/comments.html
 - examples/comments.rb
 - examples/complex_view.html
 - examples/complex_view.rb
 - examples/delimiters.html
 - examples/delimiters.rb
+- examples/double_section.html
+- examples/double_section.rb
 - examples/escaped.html
 - examples/escaped.rb
 - examples/inner_partial.html
@@ -94,6 +98,7 @@ test_files:
 - examples/comments.rb
 - examples/complex_view.rb
 - examples/delimiters.rb
+- examples/double_section.rb
 - examples/escaped.rb
 - examples/passenger.rb
 - examples/simple.rb