haml 2.2.8 → 2.2.9

data/Rakefile

@@ -25,6 +25,7 @@ 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/*')
   t.test_files = test_files
   t.verbose = true

data/VERSION

@@ -1 +1 @@
-2.2.8
+2.2.9

data/lib/haml/buffer.rb

@@ -130,6 +130,8 @@ module Haml
     Haml::Util.def_static_method(self, :format_script, [:result],
                                  :preserve_script, :in_tag, :preserve_tag, :escape_html,
                                  :nuke_inner_whitespace, :interpolated, :ugly, <<RUBY)
+      <% # Escape HTML here so that the safety of the string is preserved in Rails
+         result_name = escape_html ? "html_escape(result.to_s)" : "result.to_s" %>
       <% unless ugly %>
         # If we're interpolated,
         # then the custom tabulation is handled in #push_text.
@@ -140,13 +142,11 @@ module Haml
         <% end %>
 
         tabulation = @real_tabs
-        result = result.to_s.<% if nuke_inner_whitespace %>strip<% else %>rstrip<% end %>
+        result = <%= result_name %>.<% if nuke_inner_whitespace %>strip<% else %>rstrip<% end %>
       <% else %>
-        result = result.to_s<% if nuke_inner_whitespace %>.strip<% end %>
+        result = <%= result_name %><% if nuke_inner_whitespace %>.strip<% end %>
       <% end %>
 
-      <% if escape_html %> result = html_escape(result) <% end %>
-
       <% if preserve_tag %>
         result = Haml::Helpers.preserve(result)
       <% elsif preserve_script %>

data/lib/haml/engine.rb

@@ -284,6 +284,7 @@ module Haml
         :ugly => @options[:ugly],
         :format => @options[:format],
         :encoding => @options[:encoding],
+        :escape_html => @options[:escape_html],
       }
     end
 

data/lib/haml/helpers.rb

@@ -113,9 +113,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
-
-      input = input.to_s
-      input.gsub(/<(#{tags.map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im) do
+      input.to_s.gsub(/<(#{tags.map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im) do
         "<#{$1}#{$2}>#{preserve($3)}</#{$1}>"
       end
     end
@@ -132,10 +130,9 @@ MESSAGE
     #   Escapes newlines within a block of Haml code.
     #
     #   @yield The block within which to escape newlines
-    def preserve(input = '', &block)
+    def preserve(input = nil, &block)
       return preserve(capture_haml(&block)) if block
-
-      input.chomp("\n").gsub(/\n/, '&#x000A;').gsub(/\r/, '')
+      input.to_s.chomp("\n").gsub(/\n/, '&#x000A;').gsub(/\r/, '')
     end
     alias_method :flatten, :preserve
 
@@ -470,6 +467,10 @@ END
     # Returns a copy of `text` with ampersands, angle brackets and quotes
     # escaped into HTML entities.
     #
+    # Note that if ActionView is loaded and XSS protection is enabled
+    # (as is the default for Rails 3.0+, and optional for version 2.3.5+),
+    # this won't escape text declared as "safe".
+    #
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def html_escape(text)

data/lib/haml/helpers/action_view_extensions.rb

@@ -35,6 +35,21 @@ module Haml
         controller.controller_name + " " + controller.action_name
       end
       alias_method :generate_content_class_names, :page_class
+
+      # Treats all input to \{Haml::Helpers#haml\_concat} within the block
+      # as being HTML safe for Rails' XSS protection.
+      # This is useful for wrapping blocks of code that concatenate HTML en masse.
+      #
+      # This has no effect if Rails' XSS protection isn't enabled.
+      #
+      # @yield A block in which all input to `#haml_concat` is treated as raw.
+      # @see Haml::Util#rails_xss_safe?
+      def with_raw_haml_concat
+        @_haml_concat_raw = true
+        yield
+      ensure
+        @_haml_concat_raw = false
+      end
     end
   end
 end

data/lib/haml/helpers/action_view_mods.rb

@@ -26,6 +26,7 @@ module ActionView
 
       def set_output_buffer_with_haml(new)
         if is_haml?
+          new = String.new(new) if Haml::Util.rails_xss_safe? && new.is_a?(ActionView::SafeBuffer)
           haml_buffer.buffer = new
         else
           set_output_buffer_without_haml new

data/lib/haml/helpers/xss_mods.rb

@@ -0,0 +1,94 @@
+module Haml
+  module Helpers
+    # This module overrides Haml helpers to work properly
+    # in the context of ActionView.
+    # Currently it's only used for modifying the helpers
+    # to work with Rails' XSS protection methods.
+    module XssMods
+      def self.included(base)
+        %w[html_escape find_and_preserve preserve list_of surround
+           precede succeed capture_haml haml_concat haml_indent
+           haml_tag escape_once].each do |name|
+          base.send(:alias_method, "#{name}_without_haml_xss", name)
+          base.send(:alias_method, name, "#{name}_with_haml_xss")
+        end
+      end
+
+      # Don't escape text that's already safe,
+      # output is always HTML safe
+      def html_escape_with_haml_xss(text)
+        return text if text.html_safe?
+        html_escape_without_haml_xss(text).html_safe!
+      end
+
+      # Output is always HTML safe
+      def find_and_preserve_with_haml_xss(*args, &block)
+        find_and_preserve_without_haml_xss(*args, &block).html_safe!
+      end
+
+      # Output is always HTML safe
+      def preserve_with_haml_xss(*args, &block)
+        preserve_without_haml_xss(*args, &block).html_safe!
+      end
+
+      # Output is always HTML safe
+      def list_of_with_haml_xss(*args, &block)
+        list_of_without_haml_xss(*args, &block).html_safe!
+      end
+
+      # Input is escaped, output is always HTML safe
+      def surround_with_haml_xss(front, back = front, &block)
+        surround_without_haml_xss(
+          haml_xss_html_escape(front),
+          haml_xss_html_escape(back),
+          &block).html_safe!
+      end
+
+      # Input is escaped, output is always HTML safe
+      def precede_with_haml_xss(str, &block)
+        precede_without_haml_xss(haml_xss_html_escape(str), &block).html_safe!
+      end
+
+      # Input is escaped, output is always HTML safe
+      def succeed_with_haml_xss(str, &block)
+        succeed_without_haml_xss(haml_xss_html_escape(str), &block).html_safe!
+      end
+
+      # Output is always HTML safe
+      def capture_haml_with_haml_xss(*args, &block)
+        capture_haml_without_haml_xss(*args, &block).html_safe!
+      end
+
+      # Input is escaped
+      def haml_concat_with_haml_xss(text = "")
+        haml_concat_without_haml_xss(@_haml_concat_raw ? text : haml_xss_html_escape(text))
+      end
+
+      # Output is always HTML safe
+      def haml_indent_with_haml_xss
+        haml_indent_without_haml_xss.html_safe!
+      end
+
+      # Input is escaped, haml_concat'ed output is always HTML safe
+      def haml_tag_with_haml_xss(name, *rest, &block)
+        name = haml_xss_html_escape(name.to_s)
+        rest.unshift(haml_xss_html_escape(rest.shift.to_s)) unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
+        with_raw_haml_concat {haml_tag_without_haml_xss(name, *rest, &block)}
+      end
+
+      # Output is always HTML safe
+      def escape_once_with_haml_xss(*args)
+        escape_once_without_haml_xss(*args).html_safe!
+      end
+
+      private
+
+      # Escapes the HTML in the text if and only if
+      # Rails XSS protection is enabled *and* the `:escape_html` option is set.
+      def haml_xss_html_escape(text)
+        return text unless Haml::Util.rails_xss_safe? && haml_buffer.options[:escape_html]
+        html_escape(text)
+      end
+    end
+  end
+end

data/lib/haml/precompiler.rb

@@ -313,7 +313,7 @@ END
 
       @precompiled <<
         if @options[:ugly]
-          "_erbout << \"#{text}\";"
+          "_hamlout.buffer << \"#{text}\";"
         else
           "_hamlout.push_text(\"#{text}\", #{tab_change}, #{@dont_tab_up_next_text.inspect});"
         end
@@ -329,7 +329,10 @@ END
       end
 
       if contains_interpolation?(text)
-        push_script unescape_interpolation(text), :escape_html => options[:escape_html]
+        options[:escape_html] = self.options[:escape_html] if options[:escape_html].nil?
+        push_script(
+          unescape_interpolation(text, :escape_html => options[:escape_html]),
+          :escape_html => false)
       else
         push_text text
       end
@@ -375,7 +378,7 @@ END
 
       push_silent "haml_temp = #{text}"
       newline_now
-      push_and_tabulate([:loud, "_erbout << #{no_format ? "#{output_temp}.to_s;" : out}",
+      push_and_tabulate([:loud, "_hamlout.buffer << #{no_format ? "#{output_temp}.to_s;" : out}",
         !(opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly])])
     end
 
@@ -665,30 +668,37 @@ END
       nuke_inner_whitespace ||= preserve_tag
       preserve_tag &&= !options[:ugly]
 
+      escape_html = (action == '&' || (action != '!' && @options[:escape_html]))
+
       case action
       when '/'; self_closing = true
       when '~'; parse = preserve_script = true
       when '='
         parse = true
-        value = unescape_interpolation(value[1..-1].strip) if value[0] == ?=
+        if value[0] == ?=
+          value = unescape_interpolation(value[1..-1].strip, :escape_html => escape_html)
+          escape_html = false
+        end
       when '&', '!'
         if value[0] == ?= || value[0] == ?~
           parse = true
           preserve_script = (value[0] == ?~)
-          value =
-            if value[1] == ?=
-              unescape_interpolation(value[2..-1].strip)
-            else
-              value[1..-1].strip
-            end
+          if value[1] == ?=
+            value = unescape_interpolation(value[2..-1].strip, :escape_html => escape_html)
+            escape_html = false
+          else
+            value = value[1..-1].strip
+          end
         elsif contains_interpolation?(value)
+          value = unescape_interpolation(value, :escape_html => escape_html)
           parse = true
-          value = unescape_interpolation(value)
+          escape_html = false
         end
       else
         if contains_interpolation?(value)
+          value = unescape_interpolation(value, :escape_html => escape_html)
           parse = true
-          value = unescape_interpolation(value)
+          escape_html = false
         end
       end
 
@@ -697,8 +707,6 @@ END
         value = ''
       end
 
-      escape_html = (action == '&' || (action != '!' && @options[:escape_html]))
-
       object_ref = "nil" if object_ref.nil? || @options[:suppress_eval]
 
       attributes = parse_class_and_id(attributes)
@@ -936,7 +944,7 @@ END
       str.include?('#{')
     end
 
-    def unescape_interpolation(str)
+    def unescape_interpolation(str, opts = {})
       res = ''
       rest = Haml::Shared.handle_interpolation str.dump do |scan|
         escapes = (scan[2].size - 1) / 2
@@ -944,7 +952,9 @@ END
         if escapes % 2 == 1
           res << '#{'
         else
-          res << '#{' + eval('"' + balance(scan, ?{, ?}, 1)[0][0...-1] + '"') + "}"# Use eval to get rid of string escapes
+          content = eval('"' + balance(scan, ?{, ?}, 1)[0][0...-1] + '"')
+          content = "Haml::Helpers.html_escape(#{content})" if opts[:escape_html]
+          res << '#{' + content + "}"# Use eval to get rid of string escapes
         end
       end
       res + rest

data/lib/haml/template.rb

@@ -27,6 +27,21 @@ else
   require 'haml/template/patch'
 end
 
+if ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
+  Haml::Template.options[:escape_html] = true
+
+  module Haml::Util
+    def rails_xss_safe?
+      true
+    end
+  end
+
+  require 'haml/helpers/xss_mods'
+  module Haml::Helpers
+    include XssMods
+  end
+end
+
 if defined?(RAILS_ROOT)
   # Update init.rb to the current version
   # if it's out of date.

data/lib/haml/util.rb

@@ -122,6 +122,28 @@ module Haml
       end
     end
 
+    ## Rails XSS Safety
+
+    # Whether or not ActionView's XSS protection is available and enabled,
+    # as is the default for Rails 3.0+, and optional for version 2.3.5+.
+    # Overridden in haml/template.rb if this is the case.
+    #
+    # @return [Boolean]
+    def rails_xss_safe?
+      false
+    end
+
+    # Assert that a given object (usually a String) is HTML safe
+    # according to Rails' XSS handling, if it's loaded.
+    #
+    # @param text [Object]
+    def assert_html_safe!(text)
+      return unless rails_xss_safe? && text && !text.to_s.html_safe?
+      raise Haml::Error.new("Expected #{text.inspect} to be HTML-safe.")
+    end
+
+    ## Cross-Ruby-Version Compatibility
+
     # Whether or not this is running under Ruby 1.8 or lower.
     #
     # @return [Boolean]
@@ -155,6 +177,8 @@ module Haml
       ruby1_8? ? enum.enum_with_index : enum.each_with_index
     end
 
+    ## Static Method Stuff
+
     # The context in which the ERB for \{#def\_static\_method} will be run.
     class StaticConditionalContext
       # @param set [#include?] The set of variables that are defined for this context.

data/lib/sass/tree/rule_node.rb

@@ -1,6 +1,9 @@
 require 'pathname'
 
 module Sass::Tree
+  # A static node reprenting a CSS rule.
+  #
+  # @see Sass::Tree
   class RuleNode < Node
     # The character used to include the parent selector
     PARENT = '&'

data/test/haml/engine_test.rb

@@ -163,6 +163,10 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p>\n  2\n</p>\n", render("%p\n  \#{1 + 1}"))
   end
 
+  def test_escaped_interpolation
+    assert_equal("<p>Foo &amp; Bar & Baz</p>\n", render('%p& Foo #{"&"} Bar & Baz'))
+  end
+
   def test_nil_tag_value_should_render_as_empty
     assert_equal("<p></p>\n", render("%p= nil"))
   end
@@ -598,53 +602,53 @@ HAML
   end
 
   def test_string_double_equals_should_be_esaped
-    assert_equal("<p>4&amp;3</p>\n", render("%p== \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&3</p>\n", render("%p== \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&&lt;</p>\n", render("%p== \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&<</p>\n", render("%p== \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_escaped_inline_string_double_equals
-    assert_equal("<p>4&amp;3</p>\n", render("%p&== \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&amp;3</p>\n", render("%p&== \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&&lt;</p>\n", render("%p&== \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&&lt;</p>\n", render("%p&== \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_unescaped_inline_string_double_equals
-    assert_equal("<p>4&3</p>\n", render("%p!== \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&3</p>\n", render("%p!== \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&<</p>\n", render("%p!== \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&<</p>\n", render("%p!== \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_escaped_string_double_equals
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&&lt;\n</p>\n", render("%p\n  &== \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>\n  4&&lt;\n</p>\n", render("%p\n  &== \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_unescaped_string_double_equals
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&<\n</p>\n", render("%p\n  !== \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>\n  4&<\n</p>\n", render("%p\n  !== \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_string_interpolation_should_be_esaped
-    assert_equal("<p>4&amp;3</p>\n", render("%p \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&3</p>\n", render("%p \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&&lt;</p>\n", render("%p \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&<</p>\n", render("%p \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_escaped_inline_string_interpolation
-    assert_equal("<p>4&amp;3</p>\n", render("%p& \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&amp;3</p>\n", render("%p& \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&&lt;</p>\n", render("%p& \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&&lt;</p>\n", render("%p& \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_unescaped_inline_string_interpolation
-    assert_equal("<p>4&3</p>\n", render("%p! \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>4&3</p>\n", render("%p! \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>4&<</p>\n", render("%p! \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>4&<</p>\n", render("%p! \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_escaped_string_interpolation
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  & \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  & \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&&lt;\n</p>\n", render("%p\n  & \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>\n  4&&lt;\n</p>\n", render("%p\n  & \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_unescaped_string_interpolation
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  ! \#{2+2}&\#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  ! \#{2+2}&\#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&<\n</p>\n", render("%p\n  ! \#{2+2}&\#{'<'}", :escape_html => true))
+    assert_equal("<p>\n  4&<\n</p>\n", render("%p\n  ! \#{2+2}&\#{'<'}", :escape_html => false))
   end
 
   def test_scripts_should_respect_escape_html_option

data/test/haml/template_test.rb

@@ -84,8 +84,9 @@ class TemplateTest < Test::Unit::TestCase
     base
   end
 
-  def render(text)
-    Haml::Engine.new(text).to_html(@base)
+  def render(text, opts = {})
+    return @base.render(:inline => text, :type => :haml) if opts == :action_view
+    Haml::Engine.new(text, opts).to_html(@base)
   end
 
   def load_result(name)
@@ -95,6 +96,8 @@ class TemplateTest < Test::Unit::TestCase
   end
 
   def assert_renders_correctly(name, &render_method)
+    old_options = Haml::Template.options.dup
+    Haml::Template.options[:escape_html] = false
     if ActionPack::VERSION::MAJOR < 2 ||
         (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
       render_method ||= proc { |name| @base.render(name) }
@@ -112,6 +115,8 @@ class TemplateTest < Test::Unit::TestCase
     else
       raise e
     end
+  ensure
+    Haml::Template.options = old_options
   end
 
   def test_empty_render_should_remain_empty
@@ -176,12 +181,31 @@ class TemplateTest < Test::Unit::TestCase
   end
 
   def test_haml_options
-    Haml::Template.options = { :suppress_eval => true }
-    assert_equal({ :suppress_eval => true }, Haml::Template.options)
+    old_options = Haml::Template.options.dup
+    Haml::Template.options[:suppress_eval] = true
     old_base, @base = @base, create_base
     assert_renders_correctly("eval_suppressed")
+  ensure
     @base = old_base
-    Haml::Template.options = {}
+    Haml::Template.options = old_options
+  end
+
+  def test_with_output_buffer_with_ugly
+    return unless Haml::Util.has?(:instance_method, ActionView::Base, :with_output_buffer)
+    assert_equal(<<HTML, render(<<HAML, :ugly => true))
+<p>
+foo
+baz
+</p>
+HTML
+%p
+  foo
+  - with_output_buffer do
+    bar
+    = "foo".gsub(/./) do |s|
+      - s.ord
+  baz
+HAML
   end
 
   def test_exceptions_should_work_correctly
@@ -213,5 +237,41 @@ END
     else
       assert false
     end
-  end  
+  end
+
+  ## XSS Protection Tests
+
+  if Haml::Util.rails_xss_safe?
+    def test_escape_html_option_set
+      assert Haml::Template.options[:escape_html]
+    end
+
+    def test_xss_protection
+      assert_equal("Foo &amp; Bar\n", render('= "Foo & Bar"', :action_view))
+    end
+
+    def test_xss_protection_with_safe_strings
+      assert_equal("Foo & Bar\n", render('= "Foo & Bar".html_safe!', :action_view))
+    end
+
+    def test_xss_protection_with_bang
+      assert_equal("Foo & Bar\n", render('!= "Foo & Bar"', :action_view))
+    end
+
+    def test_xss_protection_in_interpolation
+      assert_equal("Foo &amp; Bar\n", render('Foo #{"&"} Bar', :action_view))
+    end
+
+    def test_xss_protection_with_bang_in_interpolation
+      assert_equal("Foo & Bar\n", render('! Foo #{"&"} Bar', :action_view))
+    end
+
+    def test_xss_protection_with_safe_strings_in_interpolation
+      assert_equal("Foo & Bar\n", render('Foo #{"&".html_safe!} Bar', :action_view))
+    end
+
+    def test_xss_protection_with_mixed_strings_in_interpolation
+      assert_equal("Foo & Bar &amp; Baz\n", render('Foo #{"&".html_safe!} Bar #{"&"} Baz', :action_view))
+    end
+  end
 end

data/test/haml/util_test.rb

@@ -54,6 +54,11 @@ class UtilTest < Test::Unit::TestCase
       powerset([1, 2, 3]))
   end
 
+  def test_merge_adjacent_strings
+    assert_equal(["foo bar baz", :bang, "biz bop", 12],
+      merge_adjacent_strings(["foo ", "bar ", "baz", :bang, "biz", " bop", 12]))
+  end
+
   def test_has
     assert(has?(:instance_method, String, :chomp!))
     assert(has?(:private_instance_method, Haml::Engine, :set_locals))

data/test/linked_rails.rb

@@ -10,3 +10,13 @@ else
 end
 require 'action_controller'
 require 'action_view'
+
+ActionController::Base.logger = Logger.new(nil)
+
+# Load plugins from test/plugins.
+# This will only work with very basic plugins,
+# since we don't want to load the entirety of Rails.
+Dir[File.dirname(__FILE__) + '/plugins/*'].each do |plugin|
+  $: << plugin + '/lib'
+  Object.new.instance_eval(File.read(plugin + '/init.rb'))
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -07:00
+date: 2009-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,199 +43,200 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- VERSION_NAME
-- CONTRIBUTING
-- README.md
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- CONTRIBUTING
 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/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/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/helpers/action_view_mods.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.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
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 licenses: []
@@ -267,19 +268,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 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