mustache 0.99.1 → 0.99.2

data/lib/mustache/parser.rb

@@ -139,6 +139,8 @@ EOF
       error "Illegal content in tag" if content.empty?
 
       fetch = [:mustache, :fetch, content.split('.')]
+      prev = @result
+      last_index = @result.size
 
       # Based on the sigil, do what needs to be done.
       case type
@@ -147,13 +149,11 @@ EOF
         @result << [:mustache, :section, fetch, block]
         @sections << [content, position, @result]
         @result = block
-        last_index = 1
       when '^'
         block = [:multi]
         @result << [:mustache, :inverted_section, fetch, block]
         @sections << [content, position, @result]
         @result = block
-        last_index = 1
       when '/'
         section, pos, result = @sections.pop
         raw = @scanner.pre_match[pos[3]...pre_match_position] + padding
@@ -193,10 +193,10 @@ EOF
       # the remaining whitespace.  If not, but we've been hanging on to padding
       # from the beginning of the line, re-insert the padding as static text.
       if start_of_line
-        if @scanner.peek(1) == "\n" && SKIP_WHITESPACE.include?(type)
-          @scanner.skip(/[ \t]*\n/)
+        if @scanner.peek(2) =~ /\r?\n/ && SKIP_WHITESPACE.include?(type)
+          @scanner.skip(/\r?\n/)
         else
-          @result.insert(last_index, [:static, padding]) unless padding.empty?
+          prev.insert(last_index, [:static, padding]) unless padding.empty?
         end
       end
 

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.99.1'
+  Version = VERSION = '0.99.2'
 end

data/test/mustache_test.rb

@@ -74,6 +74,20 @@ end_complex
     assert_equal "\n full time\n", instance.render
   end
 
+  def test_sassier_single_line_sections
+    instance = Mustache.new
+    instance.template = "\t{{#list}}\r\n\t{{/list}}"
+
+    assert_equal "", instance.render
+  end
+
+  def test_padding_before_section
+    instance = Mustache.new
+    instance.template = "\t{{#list}}a{{/list}}"
+
+    assert_equal "\taa", instance.render(:list => [1, 2])
+  end
+
   def test_two_line_sections
     html = %(<p class="flash-notice" {{# no_flash }}style="display: none;"\n{{/ no_flash }}>)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  hash: 401
+  hash: 407
   prerelease: false
   segments: 
   - 0
   - 99
-  - 1
-  version: 0.99.1
+  - 2
+  version: 0.99.2
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: []