haml 3.1.8 → 3.2.0.alpha.2

data/CONTRIBUTING

@@ -1,3 +1,3 @@
 Contributions are welcomed. Please see the following sites for guidelines:
 
-  http://haml.info/development.html#contributing
+  http://haml-lang.com/development.html#contributing

data/README.md

@@ -31,7 +31,7 @@ and both Haml and Sass will be installed.
 Views with the `.html.haml` extension will automatically use Haml.
 
 To use Haml programatically,
-check out the [YARD documentation](http://haml.info/docs/yardoc/).
+check out the [YARD documentation](http://haml-lang.com/docs/yardoc/).
 
 ## Formatting
 
@@ -98,7 +98,7 @@ like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here.
-Check out the [reference documentation](http://haml.info/docs/yardoc/file.HAML_REFERENCE.html)
+Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
 for full details.
 
 ### Indentation

data/REVISION

@@ -1 +1 @@
-c167370cafd8555106d8b35a7cc6d25a2f83ec7c
+5f04bbda570a41acfb1d5d8ac971ae99c1ae7046

data/Rakefile

@@ -69,7 +69,7 @@ task :permissions do
 end
 
 task :revision_file do
-  require scope('lib/haml')
+  require 'lib/haml'
 
   release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Haml.version[:rev] && !release
@@ -304,9 +304,7 @@ rescue LoadError; end
 # ----- Testing Multiple Rails Versions -----
 
 rails_versions = [
-  "v3.1.0",
-  "v3.0.10",
-  "v2.3.14",
+  "v2.3.5",
   "v2.2.3",
   "v2.1.2",
 ]
@@ -321,45 +319,22 @@ def test_rails_version(version)
   Rake::Task['test'].execute
 end
 
-def gemfiles
-  @gemfiles ||=
-    begin
-      raise 'Must install bundler to run Rails compatibility tests' if `which bundle`.empty?
-      Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].
-        reject {|f| f =~ /\.lock$/}.
-        reject {|f| RUBY_VERSION !~ /^1\.8/ && f =~ /Gemfile\.rails-2\.[0-2]/}
-    end
-end
-
-def with_each_gemfile
-  old_env = ENV['BUNDLE_GEMFILE']
-  gemfiles.each do |gemfile|
-    puts "Using gemfile: #{gemfile}"
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    yield
-  end
-ensure
-  ENV['BUNDLE_GEMFILE'] = old_env
-end
-
 namespace :test do
-  namespace :bundles do
-    desc "Install all dependencies necessary to test Haml."
-    task :install do
-      with_each_gemfile {sh "bundle install"}
-    end
-
-    desc "Update all dependencies for testing Haml."
-    task :update do
-      with_each_gemfile {sh "bundle update"}
-    end
-  end
-
   desc "Test all supported versions of rails. This takes a while."
-  task :rails_compatibility => 'test:bundles:install' do
-    `rm -rf test/rails`
-    `rm -rf test/plugins`
-    with_each_gemfile {sh "bundle exec rake test"}
+  task :rails_compatibility do
+    sh %{rm -rf test/rails}
+    puts "Checking out rails. Please wait."
+    sh %{git clone git://github.com/rails/rails.git test/rails}
+    begin
+      rails_versions.each {|version| test_rails_version version}
+
+      puts "Checking out rails_xss. Please wait."
+      sh %{git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss}
+      test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
+    ensure
+      `rm -rf test/rails`
+      `rm -rf test/plugins`
+    end
   end
 end
 

data/VERSION

@@ -1 +1 @@
-3.1.8
+3.2.0.alpha.2

data/VERSION_NAME

@@ -1 +1 @@
-Separated Sally
+Bleeding Edge

data/lib/haml/buffer.rb

@@ -97,8 +97,6 @@ module Haml
       # The number of tabs that Engine thinks we should have
       # @real_tabs + @tabulation is the number of tabs actually output
       @real_tabs = 0
-
-      @preserve_pattern = /<[\s]*#{@options[:preserve].join("|")}/i
     end
 
     # Appends text to the buffer, properly tabulated.
@@ -159,9 +157,7 @@ module Haml
         return result
       <% else %>
 
-        return result if self.instance_variable_get(:@preserve_pattern).match(result)
-
-        has_newline = result.include?("\\n")
+        has_newline = result.include?("\\n") 
         <% if in_tag && !nuke_inner_whitespace %>
           <% unless preserve_tag %> if !has_newline <% end %>
           @real_tabs -= 1

data/lib/haml/compiler.rb

@@ -18,7 +18,7 @@ END
       postamble = <<END.gsub("\n", ";")
 #{precompiled_method_return_value}
 ensure
-@haml_buffer = @haml_buffer.upper if @haml_buffer
+@haml_buffer = @haml_buffer.upper
 end
 END
       preamble + locals_code(local_names) + precompiled + postamble
@@ -156,8 +156,8 @@ END
 
         if value && !parse
           concat_merged_text("#{value}</#{t[:name]}>#{t[:nuke_outer_whitespace] ? "" : "\n"}")
-        elsif !t[:nuke_inner_whitespace] && !t[:self_closing]
-          @to_merge << [:text, '', 1]
+        else
+          @to_merge << [:text, '', 1] unless t[:nuke_inner_whitespace]
         end
 
         @dont_indent_next_line = dont_indent_next_line
@@ -251,9 +251,8 @@ END
     def push_silent(text, can_suppress = false)
       flush_merged_text
       return if can_suppress && options[:suppress_eval]
-      newline = (text == "end") ? ";" : "\n"
-      @precompiled << "#{resolve_newlines}#{text}#{newline}"
-      @output_line += (text + newline).count("\n")
+      @precompiled << "#{resolve_newlines}#{text}\n"
+      @output_line += text.count("\n") + 1
     end
 
     # Adds `text` to `@buffer` with appropriate tabulation
@@ -373,14 +372,14 @@ END
           if escape_attrs == :once
             Haml::Helpers.escape_once(value.to_s)
           elsif escape_attrs
-            Haml::Helpers.html_escape(value.to_s)
+            CGI.escapeHTML(value.to_s)
           else
             value.to_s
           end
         value = Haml::Helpers.preserve(escaped)
         if escape_attrs
           # We want to decide whether or not to escape quotes
-          value = value.gsub('&quot;', '"')
+          value.gsub!('&quot;', '"')
           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 = {:for_engine => {}}
+        @options = {}
       end
 
       # Parses the command-line arguments and runs the executable.

data/lib/haml/helpers.rb

@@ -107,9 +107,7 @@ 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
-      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
+      input.to_s.gsub(/<(#{tags.map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im) do
         "<#{$1}#{$2}>#{preserve($3)}</#{$1}>"
       end
     end
@@ -172,10 +170,10 @@ MESSAGE
         result = capture_haml(i, &block)
 
         if result.count("\n") > 1
-          result = result.gsub("\n", "\n  ")
+          result.gsub!("\n", "\n  ")
           result = "\n  #{result.strip}\n"
         else
-          result = result.strip
+          result.strip!
         end
 
         "<li>#{result}</li>"

data/lib/haml/helpers/action_view_mods.rb

@@ -51,10 +51,7 @@ module ActionView
           # We've got to do the same thing for compatibility.
 
           if is_haml? && block_is_haml?(block)
-            value = nil
-            buffer = capture_haml(*args) { value = yield(*args) }
-            return buffer unless buffer.empty?
-            return value if value.is_a?(String)
+            capture_haml(*args, &block)
           else
             capture_without_haml(*args, &block)
           end
@@ -88,17 +85,7 @@ module ActionView
       module CaptureHelper
         def capture_with_haml(*args, &block)
           if Haml::Helpers.block_is_haml?(block)
-            _hamlout = eval('_hamlout', block.binding) # Necessary since capture_haml checks _hamlout
-            value = nil
-            buffer = capture_haml(*args) { value = yield(*args) }
-            str =
-              if !buffer.empty?
-                buffer
-              elsif value.is_a?(String)
-                value
-              else
-                ''
-              end
+            str = capture_haml(*args, &block)
             return ActionView::NonConcattingString.new(str) if defined?(ActionView::NonConcattingString)
             return str
           else
@@ -130,8 +117,7 @@ module ActionView
     end
 
     class InstanceTag
-      # Already includes TagHelper
-      include Haml::Helpers
+      # Includes TagHelper
 
       def haml_buffer
         @template_object.send :haml_buffer
@@ -141,8 +127,8 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      def content_tag(*args, &block)
-        html_tag = content_tag_with_haml(*args, &block)
+      def content_tag(*args)
+        html_tag = content_tag_with_haml(*args)
         return html_tag unless respond_to?(:error_wrapping)
         return error_wrapping(html_tag) if method(:error_wrapping).arity == 1
         return html_tag unless object.respond_to?(:errors) && object.errors.respond_to?(:on)
@@ -256,5 +242,3 @@ module ActionView
     end
   end
 end
-
-require "haml/helpers/rails_323_textarea_fix" if Haml::Util.ap_geq?("3.2.3")

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 @parent.type != :haml_comment && (block_opened? || @tab_up)
+        if block_opened? || @tab_up
           @template_tabs += 1
           @parent = @parent.children.last
         end

data/lib/haml/template.rb

@@ -54,9 +54,7 @@ end
 # Patching was necessary for versions <= 2.0.1,
 # but we can make it a normal handler for higher versions.
 if defined?(ActionView::TemplateHandler) ||
-    (defined?(ActionView::Template) && defined?(ActionView::Template::Handler)) ||
-    # Rails >= 3.2.0 uses Handlers instead of Handler
-    (defined?(ActionView::Template) && defined?(ActionView::Template::Handlers))
+    (defined?(ActionView::Template) && defined?(ActionView::Template::Handler))
   require 'haml/template/plugin'
 else
   require 'haml/template/patch'

data/lib/haml/util.rb

@@ -347,7 +347,7 @@ module Haml
         require 'sass/version'
         loaded = Sass.respond_to?(:version) && Sass.version[:major] &&
           Sass.version[:minor] && ((Sass.version[:major] > 3 && Sass.version[:minor] > 1) ||
-          ((Sass.version[:major] == 3 && Sass.version[:minor] >= 1) &&
+          ((Sass.version[:major] == 3 && Sass.version[:minor] == 1) &&
             (Sass.version[:prerelease] || Sass.version[:name] != "Bleeding Edge")))
       rescue LoadError => e
         loaded = false

data/test/haml/engine_test.rb

@@ -87,9 +87,6 @@ MESSAGE
     "foo\n:plain\n  1\n  2\n  \#{raise 'foo'}" => ["foo", 5],
     "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
     "- case 1\n\n- when 1\n  - raise 'foo'" => ["foo", 4],
-    "- tap do\n  - tap do\n    text\n- raise 'foo'" => ["foo", 4],
-    "- tap do\n  - tap do\n    text\n  - raise 'foo'" => ["foo", 4],
-    "- tap do\n  - tap do\n    text\n  text\n- raise 'foo'" => ["foo", 5],
   }
 
   User = Struct.new('User', :id)
@@ -191,11 +188,11 @@ MESSAGE
   def test_dynamic_attributes_with_no_content
     assert_equal(<<HTML, render(<<HAML))
 <p>
-  <a href='http://haml.info'></a>
+  <a href='http://haml-lang.com'></a>
 </p>
 HTML
 %p
-  %a{:href => "http://" + "haml.info"}
+  %a{:href => "http://" + "haml-lang.com"}
 HAML
   end
 
@@ -385,41 +382,8 @@ 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
 
-  unless Haml::Util.ruby1_8?
-    def test_indentation_after_dynamic_attr_hash
-      assert_equal(<<HTML, render(<<HAML))
-<html>
-  <body>
-    <img src='test' />
-    foo
-    bar
-  </body>
-</html>
-HTML
-%html
-  %body
-    %img{:src => 'te'+'st'}
-    = "foo\\nbar"
-HAML
-    end
-  end
-
   def test_whitespace_nuke_with_both_newlines
     assert_equal("<p>foo</p>\n", render('%p<= "\nfoo\n"'))
     assert_equal(<<HTML, render(<<HAML))
@@ -1215,20 +1179,17 @@ HAML
           assert_equal(expected_message, err.message, "Line: #{key}")
         end
 
-        if expected_message == :compile && err.message.include?("\n")
-          if Haml::Util.ruby1_8?
-            # Sometimes, the first backtrace entry is *only* in the message.
-            # No idea why.
-            bt = err.message.split("\n", 2)[1]
-          else
-            bt = err.message.split("\n", 2)[0]
-          end
-        else
-          bt = err.backtrace[0]
+        if Haml::Util.ruby1_8?
+          # Sometimes, the first backtrace entry is *only* in the message.
+          # No idea why.
+          bt =
+            if expected_message == :compile && err.message.include?("\n")
+              err.message.split("\n", 2)[1]
+            else
+              err.backtrace[0]
+            end
+          assert_match(/^#{Regexp.escape(__FILE__)}:#{line_no}/, bt, "Line: #{key}")
         end
-
-        source_location = bt.split(":", 3).first(2).join(":")
-        assert_equal("#{__FILE__}:#{line_no}", source_location, "Line: #{key}")
       else
         assert(false, "Exception not raised for\n#{key}")
       end

data/test/haml/helper_test.rb

@@ -133,30 +133,17 @@ HTML
 HAML
   end
 
-  if Haml::Util.ap_geq?("3.2.3")
-    def test_text_area
-      assert_equal(%(<textarea id="body" name="body">\nFoo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
-                   render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
+  def test_text_area
+    assert_equal(%(<textarea id="body" name="body">Foo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
+                 render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
 
-      assert_equal(%(<textarea cols="40" id="post_body" name="post[body]" rows="20">\nFoo bar&#x000A;baz</textarea>\n),
-                   render('= text_area :post, :body', :action_view))
+    assert_equal(%(<textarea cols="40" id="post_body" name="post[body]" rows="20">Foo bar&#x000A;baz</textarea>\n),
+                 render('= text_area :post, :body', :action_view))    
 
-      assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
-                   render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
-    end
-  else
-    def test_text_area
-      assert_equal(%(<textarea id="body" name="body">Foo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
-                   render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
-
-      assert_equal(%(<textarea cols="40" id="post_body" name="post[body]" rows="20">Foo bar&#x000A;baz</textarea>\n),
-                   render('= text_area :post, :body', :action_view))
-
-      assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
-                   render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
-    end
+    assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
+                 render('= content_tag "pre", "Foo bar\n   baz"', :action_view))    
   end
-
+  
   def test_capture_haml
     assert_equal(<<HTML, render(<<HAML))
 "<p>13</p>\\n"
@@ -370,10 +357,6 @@ 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"))