haml 3.1.1 → 3.1.2

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/lib/haml/compiler.rb

@@ -379,7 +379,7 @@ END
         value = Haml::Helpers.preserve(escaped)
         if escape_attrs
           # We want to decide whether or not to escape quotes
-          value.gsub!('"', '"')
+          value = value.gsub('"', '"')
           this_attr_wrapper = attr_wrapper
           if value.include? attr_wrapper
             if value.include? other_quote_char

data/lib/haml/exec.rb

@@ -9,7 +9,7 @@ module Haml
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         @args = args
-        @options = {}
+        @options = {:for_engine => {}}
       end
 
       # Parses the command-line arguments and runs the executable.

data/lib/haml/helpers.rb

@@ -107,7 +107,9 @@ MESSAGE
     #   @yield The block within which to escape newlines
     def find_and_preserve(input = nil, tags = haml_buffer.options[:preserve], &block)
       return find_and_preserve(capture_haml(&block), input || tags) if block
-      input.to_s.gsub(/<(#{tags.map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im) do
+      re = /<(#{tags.map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im
+      input.to_s.gsub(re) do |s|
+        s =~ re # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
         "<#{$1}#{$2}>#{preserve($3)}</#{$1}>"
       end
     end
@@ -170,10 +172,10 @@ MESSAGE
         result = capture_haml(i, &block)
 
         if result.count("\n") > 1
-          result.gsub!("\n", "\n  ")
+          result = result.gsub("\n", "\n  ")
           result = "\n  #{result.strip}\n"
         else
-          result.strip!
+          result = result.strip
         end
 
         "<li>#{result}</li>"

data/lib/haml/helpers/action_view_mods.rb

@@ -51,7 +51,10 @@ module ActionView
           # We've got to do the same thing for compatibility.
 
           if is_haml? && block_is_haml?(block)
-            capture_haml(*args, &block)
+            value = nil
+            buffer = capture_haml(*args) { value = yield(*args) }
+            return buffer unless buffer.empty?
+            return value if value.is_a?(String)
           else
             capture_without_haml(*args, &block)
           end
@@ -85,7 +88,16 @@ module ActionView
       module CaptureHelper
         def capture_with_haml(*args, &block)
           if Haml::Helpers.block_is_haml?(block)
-            str = capture_haml(*args, &block)
+            value = nil
+            buffer = capture_haml(*args) { value = yield(*args) }
+            str =
+              if !buffer.empty?
+                buffer
+              elsif value.is_a?(String)
+                value
+              else
+                ''
+              end
             return ActionView::NonConcattingString.new(str) if defined?(ActionView::NonConcattingString)
             return str
           else

data/lib/haml/parser.rb

@@ -146,7 +146,7 @@ END
 
         @tab_up = nil
         process_line(@line.text, @line.index) unless @line.text.empty? || @haml_comment
-        if block_opened? || @tab_up
+        if @parent.type != :haml_comment && (block_opened? || @tab_up)
           @template_tabs += 1
           @parent = @parent.children.last
         end

data/test/haml/engine_test.rb

@@ -382,6 +382,20 @@ SOURCE
     assert_equal("<p foo='bar'></p>\n", render('%p{:foo => "bar"}', :attr_wrapper => nil))
   end
 
+  def test_comment_with_crazy_nesting
+    assert_equal(<<HTML, render(<<HAML))
+foo
+bar
+HTML
+foo
+-#
+  ul
+    %li{
+  foo
+bar
+HAML
+  end
+
   # Regression tests
 
   def test_whitespace_nuke_with_both_newlines

data/test/haml/helper_test.rb

@@ -357,6 +357,10 @@ HAML
     assert_equal("1\n\n2\n\n3\n\n", render("- trc([1, 2, 3]) do |i|\n  = i.inspect"))
   end
 
+  def test_capture_with_string_block
+    assert_equal("foo\n", render("= capture { 'foo' }", :action_view))
+  end
+
   def test_find_and_preserve_with_block
     assert_equal("<pre>Foo&#x000A;Bar</pre>\nFoo\nBar\n",
                  render("= find_and_preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency