mustache 0.2.1 → 0.2.2

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.2.2 (2009-10-11)
+
+* Improved documentation
+* Fixed single line sections
+* Broke preserved indentation (issue #2)
+
 ## 0.2.1 (2009-10-11)
 
 * Mustache.underscore can now be called without an argument

data/README.md

@@ -169,20 +169,20 @@ Dict-Style Views
 ----------------
 
 ctemplate and friends want you to hand a dictionary to the template
-processor. Naturally Mustache supports a similar concept. Feel free
-to mix the class-based and this more procedural style at your leisure.
+processor. Mustache supports a similar concept. Feel free to mix the
+class-based and this more procedural style at your leisure.
 
-Given this template (dict.html):
+Given this template (winner.html):
 
     Hello {{name}}
     You have just won ${{value}}!
 
 We can fill in the values at will:
 
-    dict = Dict.new
-    dict[:name] = 'George'
-    dict[:value] = 100
-    dict.render
+    view = Winner.new
+    view[:name] = 'George'
+    view[:value] = 100
+    view.render
 
 Which returns:
 
@@ -191,8 +191,8 @@ Which returns:
 
 We can re-use the same object, too:
 
-    dict[:name] = 'Tony'
-    dict.render
+    view[:name] = 'Tony'
+    view.render
     Hello Tony
     You have just won $100!
 

data/benchmarks/speed.rb

@@ -15,8 +15,10 @@ unless ENV['NOERB']
     erb.result(ComplexView.new.send(:binding))
   end
 
-  bench 'ERB w/o caching' do
-    ERB.new(template).result(ComplexView.new.send(:binding))
+  unless ENV['CACHED']
+    bench 'ERB w/o caching' do
+      ERB.new(template).result(ComplexView.new.send(:binding))
+    end
   end
 end
 
@@ -35,14 +37,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/examples/passenger.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'mustache'
 
 class Passenger < Mustache
-
   self.path = File.dirname(__FILE__)
   self.template_extension = 'conf'
 
@@ -21,9 +20,8 @@ class Passenger < Mustache
   def timestamp
     Time.now.strftime('%Y%m%d%H%M%S')
   end
-
 end
 
 if $0 == __FILE__
   puts Passenger.to_text
-end
+end

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 =~ /^\s*\{\{\#(.+)\}\}\n*(.+)^\s*\{\{\/\1\}\}\n*/m
+      while src =~ /\{\{\#(.+)\}\}\s*(.+)\{\{\/\1\}\}\s*/m
         # $` = The string to the left of the last successful match
         res << compile_tags($`)
         name = $1.strip.to_sym.inspect

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.2.1'
+  Version = '0.2.2'
 end

data/test/mustache_test.rb

@@ -11,7 +11,6 @@ require 'comments'
 require 'passenger'
 
 class MustacheTest < Test::Unit::TestCase
-
   def test_passenger
     assert_equal <<-end_passenger, Passenger.to_text
 <VirtualHost *>
@@ -33,6 +32,28 @@ end_passenger
 end_complex
   end
 
+  def test_single_line_sections
+    html = %(<p class="flash-notice" {{# no_flash }}style="display: none;"{{/ no_flash }}>)
+
+    instance = Mustache.new
+    instance.template = html
+    instance[:no_flash] = true
+    assert_equal <<-rendered.strip, instance.render
+<p class="flash-notice" style="display: none;">
+rendered
+  end
+
+  def test_two_line_sections
+    html = %(<p class="flash-notice" {{# no_flash }}style="display: none;"\n{{/ no_flash }}>)
+
+    instance = Mustache.new
+    instance.template = html
+    instance[:no_flash] = true
+    assert_equal <<-rendered.strip, instance.render
+<p class="flash-notice" style="display: none;"\n>
+rendered
+  end
+
   def test_simple
     assert_equal <<-end_simple, Simple.render
 Hello Chris

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Wanstrath