haml 2.2.20 → 2.2.21

data/.yardopts

@@ -2,6 +2,7 @@
 --markup          markdown
 --markup-provider maruku
 --default-return  ""
+--title           "Haml/Sass Documentation"
 --hide-void-return
 --protected
 --no-private

data/REMEMBER

@@ -0,0 +1,6 @@
+Deprecate .foo& in stable
+Make .#{} work in extend
+Test newly-invalid selectors, including post-resolution parse errors in Sass
+Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
+Don't conflict with Object#extend.
+http://camendesign.com/design/ provides some interesting formatting and nesting issues for sass-convert

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'rake'
 
+# ----- Utility Functions -----
+
+def scope(path)
+  File.join(File.dirname(__FILE__), path)
+end
+
 # ----- Benchmarking -----
 
 desc <<END
@@ -23,10 +29,10 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << 'lib'
-  test_files = FileList['test/**/*_test.rb']
-  test_files.exclude('test/rails/*')
-  test_files.exclude('test/plugins/*')
-  test_files.exclude('test/haml/spec/*')
+  test_files = FileList[scope('test/**/*_test.rb')]
+  test_files.exclude(scope('test/rails/*'))
+  test_files.exclude(scope('test/plugins/*'))
+  test_files.exclude(scope('test/haml/spec/*'))
   t.test_files = test_files
   t.verbose = true
 end
@@ -37,7 +43,7 @@ END
 # ----- Packaging -----
 
 require 'rake/gempackagetask'
-load    'haml.gemspec'
+load scope('haml.gemspec')
 
 Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
   if Rake.application.top_level_tasks.include?('release')
@@ -50,31 +56,31 @@ end
 task :revision_file do
   require 'lib/haml'
 
-  release = Rake.application.top_level_tasks.include?('release') || File.exist?('EDGE_GEM_VERSION')
+  release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Haml.version[:rev] && !release
-    File.open('REVISION', 'w') { |f| f.puts Haml.version[:rev] }
+    File.open(scope('REVISION'), 'w') { |f| f.puts Haml.version[:rev] }
   elsif release
-    File.open('REVISION', 'w') { |f| f.puts "(release)" }
+    File.open(scope('REVISION'), 'w') { |f| f.puts "(release)" }
   else
-    File.open('REVISION', 'w') { |f| f.puts "(unknown)" }
+    File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
   end
 end
 Rake::Task[:package].prerequisites.insert(0, :revision_file)
 
 # We also need to get rid of this file after packaging.
-at_exit { File.delete('REVISION') rescue nil }
+at_exit { File.delete(scope('REVISION')) rescue nil }
 
 desc "Install Haml as a gem."
 task :install => [:package] do
   sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
-  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read('VERSION').strip}}
+  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
 
 desc "Release a new Haml package to Rubyforge."
-task :release => [:check_release, :release_elpa, :package] do
-  name = File.read("VERSION_NAME").strip
-  version = File.read("VERSION").strip
+task :release => [:check_release, :package] do
+  name = File.read(scope("VERSION_NAME")).strip
+  version = File.read(scope("VERSION")).strip
   sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
@@ -86,24 +92,20 @@ end
 task :release_elpa do
   require 'tlsmail'
   require 'time'
+  require scope('lib/haml')
 
-  version = File.read("VERSION").strip
+  version = Haml.version[:number]
 
   haml_unchanged = mode_unchanged?(:haml, version)
   sass_unchanged = mode_unchanged?(:sass, version)
   next if haml_unchanged && sass_unchanged
   raise "haml-mode.el and sass-mode.el are out of sync." if haml_unchanged ^ sass_unchanged
 
-  if sass_unchanged && File.read("extra/sass-mode.el").
+  if sass_unchanged && File.read(scope("extra/sass-mode.el")).
       include?(";; Package-Requires: ((haml-mode #{sass_unchanged.inspect}))")
     raise "sass-mode.el doesn't require the same version of haml-mode."
   end
 
-  rev = File.read('.git/HEAD').strip
-  if rev =~ /^ref: (.*)$/
-    rev = File.read(".git/#{$1}").strip
-  end
-
   from = `git config user.email`.strip
   raise "Don't know how to send emails except via Gmail" unless from =~ /@gmail.com$/
 
@@ -119,17 +121,17 @@ Date: #{Time.now.rfc2822}
 haml-mode and sass-mode #{version} are packaged and ready to be included in ELPA.
 They can be downloaded from:
 
-  http://github.com/nex3/haml/raw/#{rev}/extra/haml-mode.el
-  http://github.com/nex3/haml/raw/#{rev}/extra/sass-mode.el
+  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/haml-mode.el
+  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/sass-mode.el
 CONTENT
   end
 end
 
 # Ensures that the version have been updated for a new release.
 task :check_release do
-  version = File.read("VERSION").strip
-  raise "There have been changes since current version (#{version})" if changed_since?(version)
-  raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read("VERSION_NAME") == "Bleeding Edge"
+  version = File.read(scope("VERSION")).strip
+  #raise "There have been changes since current version (#{version})" if changed_since?(version)
+  raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read(scope("VERSION_NAME")) == "Bleeding Edge"
 end
 
 # Reads a password from the command line.
@@ -162,7 +164,7 @@ end
 # @param version [String] The version number
 # @return [String, nil] The version number if the version has changed
 def mode_unchanged?(mode, version)
-  mode_version = File.read("extra/#{mode}-mode.el").scan(/^;; Version: (.*)$/).first.first
+  mode_version = File.read(scope("extra/#{mode}-mode.el")).scan(/^;; Version: (.*)$/).first.first
   return false if mode_version == version
   return mode_version unless changed_since?(mode_version, "extra/#{mode}-mode.el")
   raise "#{mode}-mode.el version is #{version.inspect}, but it has changed as of #{version.inspect}"
@@ -178,13 +180,13 @@ task :release_edge do
     sh %{git merge origin/master}
 
     # Get the current master branch version
-    version = File.read('VERSION').strip.split('.').map {|n| n.to_i}
+    version = File.read(scope('VERSION')).strip.split('.').map {|n| n.to_i}
     unless version[1] % 2 == 1 && version[2] == 0
       raise "#{version.join('.')} is not a development version" 
     end
 
     # Bump the edge gem version
-    edge_version = File.read('EDGE_GEM_VERSION').strip.split('.').map {|n| n.to_i}
+    edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
     if edge_version[0..1] != version[0..1]
       # A new master branch version was released, reset the edge gem version
       edge_version[0..1] = version[0..1]
@@ -194,12 +196,12 @@ task :release_edge do
       edge_version[2] += 1
     end
     edge_version = edge_version.join('.')
-    File.open('EDGE_GEM_VERSION', 'w') {|f| f.puts(edge_version)}
+    File.open(scope('EDGE_GEM_VERSION'), 'w') {|f| f.puts(edge_version)}
     sh %{git commit -m "Bump edge gem version to #{edge_version}." EDGE_GEM_VERSION}
     sh %{git push origin edge-gem}
 
     # Package the edge gem with the proper version
-    File.open('VERSION', 'w') {|f| f.puts(edge_version)}
+    File.open(scope('VERSION'), 'w') {|f| f.puts(edge_version)}
     sh %{rake package}
     sh %{git checkout VERSION}
 
@@ -226,8 +228,8 @@ begin
 
   namespace :yard do
     task :sass do
-      require File.dirname(__FILE__) + '/lib/sass'
-      Dir[File.dirname(__FILE__) + "/yard/default/**/*.sass"].each do |sass|
+      require scope('lib/sass')
+      Dir[scope("yard/default/**/*.sass")].each do |sass|
         File.open(sass.gsub(/sass$/, 'css'), 'w') do |f|
           f.write(Sass::Engine.new(File.read(sass)).render)
         end
@@ -236,15 +238,16 @@ begin
   end
 
   YARD::Rake::YardocTask.new do |t|
-    t.files = FileList.new('lib/**/*.rb') do |list|
+    t.files = FileList.new(scope('lib/**/*.rb')) do |list|
       list.exclude('lib/haml/template/*.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
-    t.options += FileList.new('yard/*.rb').to_a.map {|f| ['-e', f]}.flatten
-    files = FileList.new('doc-src/*').to_a.sort_by {|s| s.size} + %w[MIT-LICENSE VERSION]
+    t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
+    files = FileList.new(scope('doc-src/*')).to_a.sort_by {|s| s.size} + %w[MIT-LICENSE VERSION]
     t.options << '--files' << files.join(',')
-    t.options << '--template-path' << File.dirname(__FILE__) + '/yard'
+    t.options << '--template-path' << scope('yard')
+    t.options << '--title' << ENV["YARD_TITLE"] if ENV["YARD_TITLE"]
   end
   Rake::Task['yard'].prerequisites.insert(0, 'yard:sass')
   Rake::Task['yard'].instance_variable_set('@comment', nil)
@@ -276,7 +279,7 @@ begin
   require 'rcov/rcovtask'
 
   Rcov::RcovTask.new do |t|
-    t.test_files = FileList['test/**/*_test.rb']
+    t.test_files = FileList[scope('test/**/*_test.rb')]
     t.rcov_opts << '-x' << '"^\/"'
     if ENV['NON_NATIVE']
       t.rcov_opts << "--no-rcovrt"
@@ -307,12 +310,12 @@ END
     if engine == 'sass'
       require 'lib/sass'
 
-      file = File.read("#{File.dirname(__FILE__)}/test/sass/templates/#{file || 'complex'}.sass")
+      file = File.read(scope("test/sass/templates/#{file || 'complex'}.sass"))
       result = RubyProf.profile { times.times { Sass::Engine.new(file).render } }
     else
       require 'lib/haml'
 
-      file = File.read("#{File.dirname(__FILE__)}/test/haml/templates/#{file || 'standard'}.haml")
+      file = File.read(scope("test/haml/templates/#{file || 'standard'}.haml"))
       obj = Object.new
       Haml::Engine.new(file).def_method(obj, :render)
       result = RubyProf.profile { times.times { obj.render } }
@@ -325,29 +328,36 @@ rescue LoadError; end
 # ----- Testing Multiple Rails Versions -----
 
 rails_versions = [
-  "v2.3.4",
-  "v2.2.2",
+  "v2.3.5",
+  "v2.2.3",
   "v2.1.2",
 ]
 rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 
+def test_rails_version(version)
+  Dir.chdir "test/rails" do
+    `git checkout #{version}`
+  end
+  puts "Testing Rails #{version}"
+  Rake::Task['test'].reenable
+  Rake::Task['test'].execute
+end
+
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."
   task :rails_compatibility do
     `rm -rf test/rails`
     puts "Checking out rails. Please wait."
-    `git clone git://github.com/rails/rails.git test/rails` rescue nil
+    system("git clone git://github.com/rails/rails.git test/rails") rescue nil
     begin
-      rails_versions.each do |version|
-        Dir.chdir "test/rails" do
-          `git checkout #{version}`
-        end
-        puts "Testing Rails #{version}"
-        Rake::Task['test'].reenable
-        Rake::Task['test'].execute
-      end
+      rails_versions.each {|version| test_rails_version version}
+
+      puts "Checking out rails_xss. Please wait."
+      system("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 @@
-2.2.20
+2.2.21

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html
@@ -30,6 +30,7 @@
 (require 'textile-mode nil t)
 (require 'markdown-mode nil t)
 (require 'javascript-mode "javascript" t)
+(require 'js nil t)
 
 
 ;; User definable variables
@@ -172,13 +173,15 @@ This requires that `css-mode' is available.
 (defun haml-highlight-js-filter-block (limit)
   "If a :javascript filter is found within LIMIT, highlight it.
 
-This requires that Karl Landström's \"javascript.el\" be available."
-  (if (boundp 'js-font-lock-keywords-3)
-      (haml-fontify-filter-region "javascript"
-                                  limit
-                                  js-font-lock-keywords-3
-                                  javascript-mode-syntax-table
-                                  nil)))
+This requires that Karl Landström's javascript mode be available, either as the
+\"js.el\" bundled with Emacs 23, or as \"javascript.el\" found in ELPA and
+elsewhere."
+  (let ((keywords (or (and (featurep 'js) js--font-lock-keywords-3)
+                      (and (featurep 'javascript-mode) js-font-lock-keywords-3)))
+        (syntax-table (or (and (featurep 'js) js-mode-syntax-table)
+                          (and (featurep 'javascript-mode) javascript-mode-syntax-table))))
+    (when keywords
+      (haml-fontify-filter-region "javascript" limit keywords syntax-table nil))))
 
 (defun haml-highlight-textile-filter-block (limit)
   "If a :textile filter is found within LIMIT, highlight it.

data/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "2.2.20"))
+;; Package-Requires: ((haml-mode "2.2.21"))
 
 ;;; Commentary:
 

data/lib/haml/helpers.rb

@@ -234,6 +234,33 @@ MESSAGE
       haml_buffer.tabulation -= i
     end
 
+    # Sets the number of tabs the buffer automatically adds
+    # to the lines of the template,
+    # but only for the duration of the block.
+    # For example:
+    #
+    #     %h1 foo
+    #     - with_tabs(2) do
+    #       %p bar
+    #     %strong baz
+    #
+    # Produces:
+    #
+    #     <h1>foo</h1>
+    #         <p>bar</p>
+    #     <strong>baz</strong>
+    #
+    #
+    # @param i [Fixnum] The number of tabs to use
+    # @yield [] A block in which the indentation will be `i` spaces
+    def with_tabs(i)
+      old_tabs = haml_buffer.tabulation
+      haml_buffer.tabulation = i
+      yield
+    ensure
+      haml_buffer.tabulation = old_tabs
+    end
+
     # Surrounds a block of Haml code with strings,
     # with no whitespace in between.
     # For example:

data/lib/haml/helpers/action_view_mods.rb

@@ -131,48 +131,87 @@ module ActionView
       end
     end
 
-    module FormTagHelper
-      def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
-        if is_haml?
-          if block_given?
+    if Haml::Util.ap_geq_3?
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                with_tabs(1) {oldproc.call(*args)}
+              end
+            end
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            res << "\n" if block_given?
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
+          end
+        end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
+      end
+
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
             oldproc = proc
             proc = haml_bind_proc do |*args|
-              concat "\n"
-              tab_up
-              oldproc.call(*args)
-              tab_down
-              concat haml_indent
+              with_tabs(1) {oldproc.call(*args)}
             end
-            concat haml_indent
           end
-          res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
-          concat "\n" if block_given?
+          res = form_for_without_haml(object_name, *args, &proc)
+          res << "\n" if block_given? && is_haml?
           res
-        else
-          form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
         end
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
+      end
+    else
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                tab_up
+                oldproc.call(*args)
+                tab_down
+                concat haml_indent
+              end
+              concat haml_indent
+            end
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            concat "\n" if block_given?
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
+          end
+        end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
       end
-      alias_method :form_tag_without_haml, :form_tag
-      alias_method :form_tag, :form_tag_with_haml
-    end
 
-    module FormHelper
-      def form_for_with_haml(object_name, *args, &proc)
-        if block_given? && is_haml?
-          oldproc = proc
-          proc = haml_bind_proc do |*args|
-            tab_up
-            oldproc.call(*args)
-            tab_down
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
+            oldproc = proc
+            proc = haml_bind_proc do |*args|
+              tab_up
+              oldproc.call(*args)
+              tab_down
+              concat haml_indent
+            end
             concat haml_indent
           end
-          concat haml_indent
+          form_for_without_haml(object_name, *args, &proc)
+          concat "\n" if block_given? && is_haml?
         end
-        form_for_without_haml(object_name, *args, &proc)
-        concat "\n" if block_given? && is_haml?
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
       end
-      alias_method :form_for_without_haml, :form_for
-      alias_method :form_for, :form_for_with_haml
     end
   end
 end

data/lib/haml/helpers/xss_mods.rb

@@ -97,6 +97,14 @@ end
 
 module ActionView
   module Helpers
+    module CaptureHelper
+      def with_output_buffer_with_haml_xss(*args, &block)
+        Haml::Util.html_safe(with_output_buffer_without_haml_xss(*args, &block))
+      end
+      alias_method :with_output_buffer_without_haml_xss, :with_output_buffer
+      alias_method :with_output_buffer, :with_output_buffer_with_haml_xss
+    end
+
     module FormTagHelper
       def form_tag_with_haml_xss(*args, &block)
         Haml::Util.html_safe(form_tag_without_haml_xss(*args, &block))
@@ -105,6 +113,14 @@ module ActionView
       alias_method :form_tag, :form_tag_with_haml_xss
     end
 
+    module FormHelper
+      def form_for_with_haml_xss(*args, &block)
+        Haml::Util.html_safe(form_for_without_haml_xss(*args, &block))
+      end
+      alias_method :form_for_without_haml_xss, :form_for
+      alias_method :form_for, :form_for_with_haml_xss
+    end
+
     module TextHelper
       def concat_with_haml_xss(string)
         if is_haml?

data/lib/haml/html.rb

@@ -68,7 +68,7 @@ module Haml
   #
   # Example usage:
   #
-  #     Haml::Engine.new("<a href='http://google.com'>Blat</a>").render
+  #     Haml::HTML.new("<a href='http://google.com'>Blat</a>").render
   #       #=> "%a{:href => 'http://google.com'} Blat"
   class HTML
     # @param template [String, Hpricot::Node] The HTML template to convert

data/lib/haml/precompiler.rb

@@ -245,11 +245,12 @@ END
         return start_haml_comment if text[1] == SILENT_COMMENT
 
         raise SyntaxError.new(<<END.rstrip, index) if text[1..-1].strip == "end"
-You don't need to use "- end" in Haml. Use indentation instead:
+You don't need to use "- end" in Haml. Un-indent to close a block:
 - if foo?
   %strong Foo!
 - else
   Not foo.
+%p This line is un-indented, so it isn't part of the "if" block
 END
 
         push_silent(text[1..-1], true)

data/lib/haml/util.rb

@@ -157,6 +157,31 @@ module Haml
       return nil
     end
 
+    # Returns whether this environment is using ActionPack
+    # version 3.0.0 or greater.
+    #
+    # @return [Boolean]
+    def ap_geq_3?
+      # The ActionPack module is always loaded automatically in Rails >= 3
+      return false unless defined?(ActionPack) && defined?(ActionPack::VERSION)
+
+      version =
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        else
+          # Rails 1.2
+          ActionPack::VERSION::Major
+        end
+
+      # 3.0.0.beta1 acts more like ActionPack 2
+      # for purposes of this method
+      # (checking whether block helpers require = or -).
+      # This extra check can be removed when beta2 is out.
+      version >= 3 &&
+        !(defined?(ActionPack::VERSION::TINY) &&
+          ActionPack::VERSION::TINY == "0.beta")
+    end
+
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,

data/lib/haml/version.rb

@@ -38,27 +38,42 @@ module Haml
       @@version[:number] = [:major, :minor, :teeny].map { |comp| @@version[comp] }.compact.join('.')
       @@version[:string] = @@version[:number].dup
 
-      if File.exists?(scope('REVISION'))
-        rev = File.read(scope('REVISION')).strip
-        rev = nil if rev !~ /^([a-f0-9]+|\(.*\))$/
-      end
-
-      if (rev.nil? || rev == '(unknown)') && File.exists?(scope('.git/HEAD'))
-        rev = File.read(scope('.git/HEAD')).strip
-        if rev =~ /^ref: (.*)$/
-          rev = File.read(scope(".git/#{$1}")).strip
-        end
-      end
-
-      if rev
+      if rev = revision_number
         @@version[:rev] = rev
         unless rev[0] == ?(
           @@version[:string] << "." << rev[0...7]
         end
-        @@version[:string] << " (#{name})"
       end
 
+      @@version[:string] << " (#{name})"
       @@version
     end
+
+    private
+
+    def revision_number
+      if File.exists?(scope('REVISION'))
+        rev = File.read(scope('REVISION')).strip
+        return rev unless rev =~ /^([a-f0-9]+|\(.*\))$/ || rev == '(unknown)'
+      end
+
+      return unless File.exists?(scope('.git/HEAD'))
+      rev = File.read(scope('.git/HEAD')).strip
+      return rev unless rev =~ /^ref: (.*)$/
+
+      ref_name = $1
+      ref_file = scope(".git/#{ref_name}")
+      info_file = scope(".git/info/refs")
+      return File.read(ref_file).strip if File.exists?(ref_file)
+      return unless File.exists?(info_file)
+      File.open(info_file) do |f|
+        f.each do |l|
+          sha, ref = l.strip.split("\t", 2)
+          next unless ref == ref_name
+          return sha
+        end
+      end
+      return nil
+    end
   end
 end

data/test/haml/engine_test.rb

@@ -36,7 +36,14 @@ class EngineTest < Test::Unit::TestCase
     "%p{:a => 'b',\n:c => 'd',\n:e => raise('foo')}" => ["foo", 3],
     " %p foo" => "Indenting at the beginning of the document is illegal.",
     "  %p foo" => "Indenting at the beginning of the document is illegal.",
-    "- end" => "You don't need to use \"- end\" in Haml. Use indentation instead:\n- if foo?\n  %strong Foo!\n- else\n  Not foo.",
+    "- end" => <<MESSAGE.rstrip,
+You don't need to use "- end" in Haml. Un-indent to close a block:
+- if foo?
+  %strong Foo!
+- else
+  Not foo.
+%p This line is un-indented, so it isn't part of the "if" block
+MESSAGE
     " \n\t\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "\n\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "%p\n  foo\n foo" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],

data/test/haml/helper_test.rb

@@ -65,7 +65,21 @@ class HelperTest < Test::Unit::TestCase
     assert_equal("foo\n  bar\nbaz\n", render("foo\n- tab_up\nbar\n- tab_down\nbaz"))
     assert_equal("          <p>tabbed</p>\n", render("- buffer.tabulation=5\n%p tabbed"))
   end
-  
+
+  def test_with_tabs
+    assert_equal(<<HTML, render(<<HAML))
+Foo
+    Bar
+    Baz
+Baz
+HTML
+Foo
+- with_tabs 2 do
+  = "Bar\\nBaz"
+Baz
+HAML
+  end
+
   def test_helpers_dont_leak
     # Haml helpers shouldn't be accessible from ERB
     render("foo")
@@ -93,9 +107,16 @@ class HelperTest < Test::Unit::TestCase
   def test_form_tag
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
-    result = render("- form_tag 'foo' do\n  %p bar\n  %strong baz", :action_view)
-    should_be = "<form action=\"foo\" method=\"post\">\n  <p>bar</p>\n  <strong>baz</strong>\n</form>\n"
-    assert_equal(should_be, result)
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form action="foo" method="post">
+  <p>bar</p>
+  <strong>baz</strong>
+</form>
+HTML
+#{rails_block_helper_char} form_tag 'foo' do
+  %p bar
+  %strong baz
+HAML
   end
 
   def test_text_area
@@ -114,12 +135,12 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_content_tag_block
-    assert_equal(<<HTML.strip, render(<<HAML, :action_view))
+    assert_equal(<<HTML.strip, render(<<HAML, :action_view).strip)
 <div><p>bar</p>
 <strong>bar</strong>
 </div>
 HTML
-- content_tag :div do
+#{rails_block_helper_char} content_tag :div do
   %p bar
   %strong bar
 HAML

data/test/haml/template_test.rb

@@ -70,8 +70,9 @@ class TemplateTest < Test::Unit::TestCase
     end
     
     if Haml::Util.has?(:private_method, base, :evaluate_assigns)
+      # Rails < 3.0
       base.send(:evaluate_assigns)
-    else
+    elsif Haml::Util.has?(:private_method, base, :_evaluate_assigns_and_ivars)
       # Rails 2.2
       base.send(:_evaluate_assigns_and_ivars)
     end
@@ -80,7 +81,13 @@ class TemplateTest < Test::Unit::TestCase
     # It's usually provided by ActionController::Base.
     def base.protect_against_forgery?; false; end
 
-    base.controller = DummyController.new
+    # In Rails <= 2.1, a fake controller object was needed
+    # to provide the controller path.
+    if ActionPack::VERSION::MAJOR < 2 ||
+        (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
+      base.controller = DummyController.new
+    end
+
     base
   end
 
@@ -332,7 +339,7 @@ HAML
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 HTML
-- form_for :article, @article, :url => '' do |f|
+#{rails_block_helper_char} form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:

data/test/haml/templates/helpers.haml

@@ -62,6 +62,19 @@ click
         <input id="article_body" name="article[body]" size="30" type="text" value="World" />
       </form>
     </div>
+- elsif Haml::Util.ap_geq_3?
+  %p
+    = form_tag ''
+  %div
+    = form_tag '' do
+      %div= submit_tag 'save'
+      - @foo = 'value one'
+      = test_partial 'partial'
+    = form_for :article, @article, :url => '' do |f|
+      Title:
+      = f.text_field :title
+      Body:
+      = f.text_field :body
 - else
   %p
     = form_tag ''

data/test/test_helper.rb

@@ -32,4 +32,9 @@ class Test::Unit::TestCase
   def silence_warnings(&block)
     Haml::Util.silence_warnings(&block)
   end
+
+  def rails_block_helper_char
+    return '=' if Haml::Util.ap_geq_3?
+    return '-'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.20
+  version: 2.2.21
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -08:00
+date: 2010-03-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,201 +43,203 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- VERSION_NAME
-- CONTRIBUTING
-- README.md
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- CONTRIBUTING
+- REMEMBER
 files: 
 - rails/init.rb
 - lib/sass.rb
-- lib/sass/css.rb
-- lib/sass/script/node.rb
-- lib/sass/script/number.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/functions.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/color.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/string.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/unary_operation.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/rack.rb
+- lib/sass/plugin/merb.rb
 - lib/sass/script.rb
 - lib/sass/error.rb
-- lib/sass/repl.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/for_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/if_node.rb
 - lib/sass/tree/mixin_node.rb
-- lib/sass/tree/directive_node.rb
-- lib/sass/tree/rule_node.rb
+- lib/sass/tree/if_node.rb
 - lib/sass/tree/prop_node.rb
+- lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/merb.rb
-- lib/sass/environment.rb
+- lib/sass/tree/debug_node.rb
+- lib/sass/tree/directive_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/rule_node.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/while_node.rb
 - lib/sass/files.rb
-- lib/sass/engine.rb
 - lib/sass/plugin.rb
-- lib/haml/filters.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/color.rb
+- lib/sass/script/string.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/number.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/node.rb
+- lib/sass/script/literal.rb
+- lib/sass/css.rb
+- lib/sass/engine.rb
+- lib/sass/repl.rb
+- lib/sass/environment.rb
+- lib/haml/util.rb
 - lib/haml/exec.rb
+- lib/haml/html.rb
 - lib/haml/error.rb
+- lib/haml/buffer.rb
 - lib/haml/template.rb
-- lib/haml/shared.rb
-- lib/haml/engine.rb
-- lib/haml/version.rb
-- lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
+- lib/haml/template/patch.rb
 - lib/haml/helpers.rb
-- lib/haml/buffer.rb
-- lib/haml/html.rb
+- lib/haml/version.rb
+- lib/haml/filters.rb
+- lib/haml/engine.rb
 - lib/haml/precompiler.rb
-- lib/haml/util.rb
+- lib/haml/shared.rb
+- lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
-- lib/haml/helpers/action_view_extensions.rb
 - lib/haml.rb
-- bin/sass
 - bin/css2sass
-- bin/html2haml
+- bin/sass
 - bin/haml
-- test/linked_rails.rb
-- test/benchmark.rb
+- bin/html2haml
 - test/sass/script_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/results/units.css
-- test/sass/results/parent_ref.css
-- test/sass/results/compressed.css
-- test/sass/results/complex.css
-- test/sass/results/compact.css
-- test/sass/results/mixins.css
-- test/sass/results/line_numbers.css
-- test/sass/results/alt.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/nested.css
-- test/sass/results/import.css
-- test/sass/results/multiline.css
-- test/sass/results/script.css
-- test/sass/results/basic.css
-- test/sass/results/expanded.css
-- test/sass/more_results/more_import.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more1.css
-- test/sass/templates/basic.sass
-- test/sass/templates/bork.sass
+- test/sass/more_results/more_import.css
+- test/sass/templates/bork2.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/import.sass
-- test/sass/templates/script.sass
 - test/sass/templates/expanded.sass
-- test/sass/templates/nested.sass
+- test/sass/templates/import.sass
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/basic.sass
 - test/sass/templates/_partial.sass
+- test/sass/templates/units.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/line_numbers.sass
+- test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/parent_ref.sass
 - test/sass/templates/alt.sass
+- test/sass/templates/script.sass
 - test/sass/templates/importee.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/units.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/bork.sass
 - test/sass/templates/complex.sass
-- test/sass/templates/bork2.sass
-- test/sass/more_templates/_more_partial.sass
+- test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
+- test/sass/more_templates/_more_partial.sass
 - test/sass/functions_test.rb
+- test/sass/results/nested.css
+- test/sass/results/units.css
+- test/sass/results/script.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/subdir/subdir.css
+- test/sass/results/import.css
+- test/sass/results/compact.css
+- test/sass/results/expanded.css
+- test/sass/results/alt.css
+- test/sass/results/mixins.css
+- test/sass/results/complex.css
+- test/sass/results/compressed.css
+- test/sass/results/parent_ref.css
+- test/sass/results/line_numbers.css
+- test/sass/results/multiline.css
+- test/sass/results/basic.css
 - test/sass/engine_test.rb
-- test/sass/plugin_test.rb
 - test/haml/mocks/article.rb
-- test/haml/rhtml/_av_partial_2.rhtml
-- test/haml/rhtml/standard.rhtml
-- test/haml/rhtml/_av_partial_1.rhtml
-- test/haml/rhtml/action_view.rhtml
 - test/haml/util_test.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/spec/README.md
-- test/haml/spec/lua_haml_spec.lua
-- test/haml/spec/tests.json
-- test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/html2haml_test.rb
+- test/haml/rhtml/_av_partial_1.rhtml
+- test/haml/rhtml/standard.rhtml
+- test/haml/rhtml/action_view.rhtml
+- test/haml/rhtml/_av_partial_2.rhtml
 - test/haml/helper_test.rb
-- test/haml/results/tag_parsing.xhtml
-- test/haml/results/content_for_layout.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/original_engine.xhtml
-- test/haml/results/very_basic.xhtml
-- test/haml/results/helpful.xhtml
-- test/haml/results/list.xhtml
-- test/haml/results/partials.xhtml
-- test/haml/results/eval_suppressed.xhtml
-- test/haml/results/nuke_inner_whitespace.xhtml
-- test/haml/results/whitespace_handling.xhtml
-- test/haml/results/render_layout.xhtml
-- test/haml/results/silent_script.xhtml
-- test/haml/results/standard.xhtml
-- test/haml/results/just_stuff.xhtml
-- test/haml/results/partial_layout.xhtml
-- test/haml/results/filters.xhtml
-- test/haml/results/nuke_outer_whitespace.xhtml
-- test/haml/markaby/standard.mab
-- test/haml/templates/tag_parsing.haml
-- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/action_view_ugly.haml
+- test/haml/templates/list.haml
+- test/haml/templates/_text_area.haml
+- test/haml/templates/_partial.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/render_layout.haml
+- test/haml/templates/_av_partial_2.haml
 - test/haml/templates/partial_layout.haml
-- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/_av_partial_1_ugly.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/standard_ugly.haml
+- test/haml/templates/silent_script.haml
+- test/haml/templates/very_basic.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/whitespace_handling.haml
 - test/haml/templates/partials.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/partialize.haml
 - test/haml/templates/_layout_for_partial.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/helpers.haml
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/filters.haml
 - test/haml/templates/_layout.erb
-- test/haml/templates/action_view_ugly.haml
 - test/haml/templates/content_for_layout.haml
-- test/haml/templates/silent_script.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/render_layout.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/standard_ugly.haml
-- test/haml/templates/_partial.haml
-- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/helpers.haml
+- test/haml/templates/original_engine.haml
 - test/haml/templates/breakage.haml
-- test/haml/templates/list.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/eval_suppressed.haml
 - test/haml/templates/action_view.haml
-- test/haml/templates/_av_partial_2.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/helpful.haml
-- test/haml/templates/_av_partial_1_ugly.haml
-- test/haml/templates/_text_area.haml
+- test/haml/spec/tests.json
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/ruby_haml_test.rb
+- test/haml/spec/README.md
+- test/haml/results/content_for_layout.xhtml
+- test/haml/results/just_stuff.xhtml
+- test/haml/results/whitespace_handling.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
+- test/haml/results/silent_script.xhtml
+- test/haml/results/filters.xhtml
+- test/haml/results/standard.xhtml
+- test/haml/results/nuke_inner_whitespace.xhtml
+- test/haml/results/helpful.xhtml
+- test/haml/results/very_basic.xhtml
+- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/partials.xhtml
+- test/haml/results/render_layout.xhtml
+- test/haml/results/original_engine.xhtml
+- test/haml/results/helpers.xhtml
+- test/haml/results/list.xhtml
+- test/haml/results/partial_layout.xhtml
+- test/haml/results/tag_parsing.xhtml
+- test/haml/markaby/standard.mab
 - test/haml/engine_test.rb
+- test/linked_rails.rb
+- test/benchmark.rb
 - test/test_helper.rb
-- extra/haml-mode.el
 - extra/sass-mode.el
+- extra/haml-mode.el
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- VERSION_NAME
-- CONTRIBUTING
-- README.md
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- CONTRIBUTING
+- REMEMBER
 has_rdoc: true
 homepage: http://haml-lang.com/
 licenses: []
@@ -276,12 +278,12 @@ summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a
 test_files: 
 - test/sass/script_test.rb
 - test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/functions_test.rb
 - test/sass/engine_test.rb
-- test/sass/plugin_test.rb
 - test/haml/util_test.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/html2haml_test.rb
 - test/haml/helper_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/engine_test.rb