mustache 0.12.0 → 0.12.1

data/lib/mustache/context.rb

@@ -29,11 +29,11 @@ class Mustache
       # Look for the first Mustache in the stack.
       mustache = mustache_in_stack
 
-      # Call its `partial` method and render the result.
-      result = mustache.render(mustache.partial(name), self)
+      # Indent the partial template by the given indentation.
+      part = mustache.partial(name).to_s.gsub(/^/, indentation)
 
-      # Indent the rendered partial by the given indentation.
-      result.gsub(/^/, indentation)
+      # Call the Mustache's `partial` method and render the result.
+      result = mustache.render(part, self)
     end
 
     # Find the first Mustache in the stack. If we're being rendered

data/lib/mustache/parser.rb

@@ -108,6 +108,7 @@ EOF
       # Scan until we hit an opening delimiter.
       start_of_line = @scanner.beginning_of_line?
       pre_match_position = @scanner.pos
+      last_index = @result.length
 
       return unless x = @scanner.scan(/([ \t]*)?#{Regexp.escape(otag)}/)
       padding = @scanner[1] || ''
@@ -144,11 +145,13 @@ EOF
         @result << [:mustache, :section, content, block]
         @sections << [content, position, @result]
         @result = block
+        last_index = 1
       when '^'
         block = [:multi]
         @result << [:mustache, :inverted_section, content, 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
@@ -188,18 +191,18 @@ 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 SKIP_WHITESPACE.include?(type)
+        if @scanner.peek(1) == "\n" && SKIP_WHITESPACE.include?(type)
           @scanner.skip(/[ \t]*\n/)
         else
-          @result.insert(-2, [:static, padding]) unless padding.empty?
+          @result.insert(last_index, [:static, padding]) unless padding.empty?
         end
       end
 
-      return unless @result == [:multi]
-
       # Store off the current scanner position now that we've closed the tag
       # and consumed any irrelevant whitespace.
       @sections.last[1] << @scanner.pos unless @sections.empty?
+
+      return unless @result == [:multi]
     end
 
     # Try to find static text, e.g. raw HTML with no {{mustaches}}.

data/lib/mustache/sinatra.rb

@@ -70,19 +70,18 @@ class Mustache
           else
             layout = layout.new
           end
-
         end
 
         # Find and cache the view class we want. This ensures the
         # compiled template is cached, too - no looking up and
         # compiling templates on each page load.
         klass = mustache_class(template, options)
-        
+
         # Does the view subclass the layout? If so we'll use the
         # view to render the layout so you can override layout
         # methods in your view - tricky.
         view_subclasses_layout = klass < layout.class if layout
-        
+
         # Create a new instance for playing with.
         instance = klass.new
 

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.12.0'
+  Version = VERSION = '0.12.1'
 end

data/test/mustache_test.rb

@@ -57,6 +57,14 @@ end_complex
     assert_equal %Q'<p class="flash-notice" style="display: none;">', instance.render
   end
 
+  def test_sassy_single_line_sections
+    instance = Mustache.new
+    instance[:full_time] = true
+    instance.template = "\n {{#full_time}}full time{{/full_time}}\n"
+
+    assert_equal "\n full time\n", instance.render
+  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: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: []