haml 2.2.10 → 2.2.11

data/VERSION

@@ -1 +1 @@
-2.2.10
+2.2.11

data/init.rb

@@ -1,8 +1,16 @@
 begin
   require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
 rescue LoadError
-  require 'haml' # From gem
+  begin
+    require 'haml' # From gem
+  rescue LoadError => e
+    # gems:install may be run to install Haml with the skeleton plugin
+    # but not the gem itself installed.
+    # Don't die if this is the case.
+    raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
+  end
 end
 
-# Load Haml and Sass
-Haml.init_rails(binding)
+# Load Haml and Sass.
+# Haml may be undefined if we're running gems:install.
+Haml.init_rails(binding) if defined?(Haml)

data/lib/haml/engine.rb

@@ -108,7 +108,6 @@ module Haml
       @precompiled = ''
       @to_merge = []
       @tab_change  = 0
-      @temp_count = 0
 
       precompile
     rescue Haml::Error => e
@@ -175,15 +174,13 @@ module Haml
         @haml_buffer = buffer
       end
 
-      str = eval(precompiled + ";" + precompiled_method_return_value,
+      eval(precompiled + ";" + precompiled_method_return_value,
         scope, @options[:filename], @options[:line])
-
+    ensure
       # Get rid of the current buffer
       scope_object.instance_eval do
         @haml_buffer = buffer.upper
       end
-
-      str
     end
     alias_method :to_html, :render
 

data/lib/haml/helpers/xss_mods.rb

@@ -17,8 +17,9 @@ module Haml
       # 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!
+        str = text.to_s
+        return text if str.html_safe?
+        html_escape_without_haml_xss(str).html_safe!
       end
 
       # Output is always HTML safe

data/lib/haml/precompiler.rb

@@ -92,14 +92,17 @@ module Haml
     # Returns the precompiled string with the preamble and postamble
     def precompiled_with_ambles(local_names)
       preamble = <<END.gsub("\n", ";")
+begin
 extend Haml::Helpers
 _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer, #{options_for_buffer.inspect})
 _erbout = _hamlout.buffer
 __in_erb_template = true
 END
       postamble = <<END.gsub("\n", ";")
-@haml_buffer = @haml_buffer.upper
 #{precompiled_method_return_value}
+ensure
+@haml_buffer = @haml_buffer.upper
+end
 END
       preamble + locals_code(local_names) + precompiled + postamble
     end
@@ -999,29 +1002,31 @@ END
 
     def resolve_newlines
       return unless @newlines > 0
+      flush_merged_text unless @to_merge.all? {|type, *_| type == :text}
       @precompiled << "\n" * @newlines
       @newlines = 0
     end
 
     # Get rid of and whitespace at the end of the buffer
     # or the merged text
-    def rstrip_buffer!
-      if @to_merge.empty?
+    def rstrip_buffer!(index = -1)
+      last = @to_merge[index]
+      if last.nil?
         push_silent("_hamlout.rstrip!", false)
         @dont_tab_up_next_text = true
         return
       end
 
-      last = @to_merge.last
       case last.first
       when :text
         last[1].rstrip!
         if last[1].empty?
-          @to_merge.pop
-          rstrip_buffer!
+          @to_merge.slice! index
+          rstrip_buffer! index
         end
       when :script
         last[1].gsub!(/\(haml_temp, (.*?)\);$/, '(haml_temp.rstrip, \1);')
+        rstrip_buffer! index - 1
       else
         raise SyntaxError.new("[HAML BUG] Undefined entry in Haml::Precompiler@to_merge.")
       end

data/lib/haml/template.rb

@@ -61,14 +61,14 @@ else
   Haml::Template.try_enabling_xss_integration
 end
 
-if defined?(RAILS_ROOT)
+if Haml::Util.rails_root
   # Update init.rb to the current version
   # if it's out of date.
   #
   # We can probably remove this as of v1.9,
   # because the new init file is sufficiently flexible
   # to not need updating.
-  rails_init_file = File.join(RAILS_ROOT, 'vendor', 'plugins', 'haml', 'init.rb')
+  rails_init_file = File.join(Haml::Util.rails_root, 'vendor', 'plugins', 'haml', 'init.rb')
   haml_init_file = Haml::Util.scope('init.rb')
   begin
     if File.exists?(rails_init_file)
@@ -79,7 +79,7 @@ if defined?(RAILS_ROOT)
     warn <<END
 HAML WARNING:
 #{rails_init_file} is out of date and couldn't be automatically updated.
-Please run `haml --rails #{File.expand_path(RAILS_ROOT)}' to update it.
+Please run `haml --rails #{File.expand_path(Haml::Util.rails_root)}' to update it.
 END
   end
 end

data/lib/haml/util.rb

@@ -122,6 +122,19 @@ module Haml
       end
     end
 
+    ## Cross Rails Version Compatibility
+
+    # Returns the root of the Rails application,
+    # if this is running in a Rails context.
+    # Returns `nil` if no such root is defined.
+    #
+    # @return [String, nil]
+    def rails_root
+      return Rails.root.to_s if defined?(Rails.root)
+      return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
+      return nil
+    end
+
     ## Rails XSS Safety
 
     # Whether or not ActionView's XSS protection is available and enabled,

data/lib/sass/css.rb

@@ -24,7 +24,9 @@ module Sass
     class RuleNode
       # @see Node#to_sass
       def to_sass(tabs, opts = {})
-        str = "\n#{'  ' * tabs}#{rules.first}#{children.any? { |c| c.is_a? PropNode } ? "\n" : ''}"
+        name = rules.first
+        name = "\\" + name if name[0] == ?:
+        str = "\n#{'  ' * tabs}#{name}#{children.any? { |c| c.is_a? PropNode } ? "\n" : ''}"
 
         children.each do |child|
           str << "#{child.to_sass(tabs + 1, opts)}"

data/lib/sass/engine.rb

@@ -314,12 +314,16 @@ LONG
     def parse_line(parent, line, root)
       case line.text[0]
       when PROPERTY_CHAR
-        if line.text[1] != PROPERTY_CHAR
-          parse_property(line, PROPERTY_OLD)
-        else
+        if line.text[1] == PROPERTY_CHAR ||
+            (@options[:property_syntax] == :new &&
+             line.text =~ PROPERTY_OLD && $3.empty?)
           # Support CSS3-style pseudo-elements,
-          # which begin with ::
+          # which begin with ::,
+          # as well as pseudo-classes
+          # if we're using the new property syntax
           Tree::RuleNode.new(line.text)
+        else
+          parse_property(line, PROPERTY_OLD)
         end
       when Script::VARIABLE_CHAR
         parse_variable(line)

data/lib/sass/plugin/rails.rb

@@ -1,22 +1,30 @@
 unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location => RAILS_ROOT + '/public/stylesheets/sass',
-                              :css_location      => RAILS_ROOT + '/public/stylesheets',
-                              :cache_location    => RAILS_ROOT + '/tmp/sass-cache',
+  Sass::Plugin.options.merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
+                              :css_location      => Haml::Util.rails_root + '/public/stylesheets',
+                              :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
                               :always_check      => RAILS_ENV != "production",
                               :full_exception    => RAILS_ENV != "production")
 
-  module ActionController
-    class Base
-      alias_method :sass_old_process, :process
-      def process(*args)
-        if !Sass::Plugin.checked_for_updates ||
-            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-          Sass::Plugin.update_stylesheets
-        end
+  check = lambda do
+    if !Sass::Plugin.checked_for_updates ||
+        Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+      Sass::Plugin.update_stylesheets
+    end
+  end
 
-        sass_old_process(*args)
+  if defined?(ActionDispatch::Callbacks.to_prepare)
+    # Rails >= 3.0.0
+    ActionDispatch::Callbacks.to_prepare(&check)
+  else
+    module ActionController
+      class Base
+        alias_method :sass_old_process, :process
+        def process(*args)
+          check.call
+          sass_old_process(*args)
+        end
       end
     end
   end

data/lib/sass/tree/node.rb

@@ -123,7 +123,9 @@ module Sass
         result = String.new
         children.each do |child|
           if child.is_a? PropNode
-            raise Sass::SyntaxError.new('Properties aren\'t allowed at the root of a document.', child.line)
+            message = "Properties aren't allowed at the root of a document." +
+              child.pseudo_class_selector_message
+            raise Sass::SyntaxError.new(message, child.line)
           else
             next if child.invisible?
             child_str = child.to_s(1)

data/lib/sass/tree/prop_node.rb

@@ -54,7 +54,9 @@ module Sass::Tree
       real_name = "#{parent_name}-#{real_name}" if parent_name
       
       if value.empty? && children.empty?
-        raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value).", @line)
+        message = "Invalid property: #{declaration.dump} (no value)." +
+          pseudo_class_selector_message
+        raise Sass::SyntaxError.new(message, @line)
       end
       
       join_string = case style
@@ -76,6 +78,16 @@ module Sass::Tree
       (style == :compressed && parent_name) ? to_return : to_return[0...-1]
     end
 
+    # Returns a appropriate message indicating how to escape pseudo-class selectors.
+    # This only applies for old-style properties with no value,
+    # so returns the empty string if this is new-style.
+    #
+    # @return [String] The message
+    def pseudo_class_selector_message
+      return "" if @prop_syntax == :new || !value.empty?
+      "\nIf #{declaration.dump} should be a selector, use \"\\#{declaration}\" instead."
+    end
+
     protected
 
     # Runs any SassScript that may be embedded in the property.
@@ -103,7 +115,7 @@ module Sass::Tree
     private
 
     def declaration
-      @prop_syntax == :new ? "#{name}: #{value}" : ":#{name} #{value}"
+      (@prop_syntax == :new ? "#{name}: #{value}" : ":#{name} #{value}").strip
     end
   end
 end

data/test/haml/engine_test.rb

@@ -72,6 +72,7 @@ class EngineTest < Test::Unit::TestCase
     "/ foo\n\n  bar" => ["Illegal nesting: nesting within a tag that already has content is illegal.", 3],
     "!!!\n\n  bar" => ["Illegal nesting: nesting within a header command is illegal.", 3],
     "foo\n:ruby\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
   }
 
   User = Struct.new('User', :id)
@@ -321,6 +322,18 @@ HTML
 HAML
   end
 
+  def test_outer_whitespace_nuke_with_empty_script
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  foo<a></a></p>
+HTML
+%p
+  foo
+  = "  "
+  %a>
+HAML
+  end
+
   def test_both_case_indentation_work_with_deeply_nested_code
     result = <<RESULT
 <h2>
@@ -950,6 +963,32 @@ END
     assert_equal("FOO\n", engine("= upcase").render_proc("foo".instance_eval{binding}).call)
   end
 
+  def test_haml_buffer_gets_reset_even_with_exception
+    scope = Object.new
+    render("- raise Haml::Error", :scope => scope)
+    assert(false, "Expected exception")
+  rescue Exception
+    assert_nil(scope.send(:haml_buffer))
+  end
+
+  def test_def_method_haml_buffer_gets_reset_even_with_exception
+    scope = Object.new
+    engine("- raise Haml::Error").def_method(scope, :render)
+    scope.render
+    assert(false, "Expected exception")
+  rescue Exception
+    assert_nil(scope.send(:haml_buffer))
+  end
+
+  def test_render_proc_haml_buffer_gets_reset_even_with_exception
+    scope = Object.new
+    proc = engine("- raise Haml::Error").render_proc(scope)
+    proc.call
+    assert(false, "Expected exception")
+  rescue Exception
+    assert_nil(scope.send(:haml_buffer))
+  end
+
   def test_ugly_true
     assert_equal("<div id='outer'>\n<div id='inner'>\n<p>hello world</p>\n</div>\n</div>\n",
                  render("#outer\n  #inner\n    %p hello world", :ugly => true))

data/test/haml/template_test.rb

@@ -144,16 +144,20 @@ class TemplateTest < Test::Unit::TestCase
     end
   end
 
-  def test_action_view_templates_render_correctly
-    proc = lambda do
-      @base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
-      assert_renders_correctly 'content_for_layout'
-    end
-
-    if @base.respond_to?(:with_output_buffer)
-      @base.with_output_buffer("", &proc)
-    else
-      proc.call
+  if ActionPack::VERSION::MAJOR < 3
+    # Rails 3.0.0 deprecates the use of yield with a layout
+    # for calls to render :file
+    def test_action_view_templates_render_correctly
+      proc = lambda do
+        @base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
+        assert_renders_correctly 'content_for_layout'
+      end
+
+      if @base.respond_to?(:with_output_buffer)
+        @base.with_output_buffer("", &proc)
+      else
+        proc.call
+      end
     end
   end
 
@@ -203,7 +207,7 @@ HTML
   - with_output_buffer do
     bar
     = "foo".gsub(/./) do |s|
-      - s.ord
+      - "flup"
   baz
 HAML
   end
@@ -284,5 +288,9 @@ END
     def test_rendered_string_is_html_safe_with_action_view
       assert(render("Foo", :action_view).html_safe?)
     end
+
+    def test_xss_html_escaping_with_non_strings
+      assert_equal("4\n", render("= html_escape(4)"))
+    end
   end
 end

data/test/linked_rails.rb

@@ -5,9 +5,8 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
-else
-  require 'rubygems'
 end
+require 'rubygems'
 require 'action_controller'
 require 'action_view'
 

data/test/sass/css2sass_test.rb

@@ -230,6 +230,19 @@ SASS
 CSS
   end
 
+  def test_pseudo_classes_are_escaped
+    assert_equal(<<SASS, css2sass(<<CSS))
+\\:focus
+  a: b
+
+  \\:foo
+    bar: baz
+SASS
+:focus {a: b;}
+:focus :foo {bar: baz;}
+CSS
+  end
+
   private
 
   def css2sass(string, opts={})

data/test/sass/engine_test.rb

@@ -18,8 +18,11 @@ class SassEngineTest < Test::Unit::TestCase
     ":" => 'Invalid property: ":".',
     ": a" => 'Invalid property: ": a".',
     ":= a" => 'Invalid property: ":= a".',
-    "a\n  :b" => 'Invalid property: ":b " (no value).',
-    "a\n  b:" => 'Invalid property: "b: " (no value).',
+    "a\n  :b" => <<MSG,
+Invalid property: ":b" (no value).
+If ":b" should be a selector, use "\\:b" instead.
+MSG
+    "a\n  b:" => 'Invalid property: "b:" (no value).',
     "a\n  :b: c" => 'Invalid property: ":b: c".',
     "a\n  :b:c d" => 'Invalid property: ":b:c d".',
     "a\n  :b=c d" => 'Invalid property: ":b=c d".',
@@ -27,7 +30,12 @@ class SassEngineTest < Test::Unit::TestCase
     "a\n  b: c;" => 'Invalid property: "b: c;" (no ";" required at end-of-line).',
     "a\n  b : c" => 'Invalid property: "b : c".',
     "a\n  b=c: d" => 'Invalid property: "b=c: d".',
-    ":a" => 'Properties aren\'t allowed at the root of a document.',
+    ":a b" => 'Properties aren\'t allowed at the root of a document.',
+    "a:" => 'Properties aren\'t allowed at the root of a document.',
+    ":a" => <<MSG,
+Properties aren't allowed at the root of a document.
+If ":a" should be a selector, use "\\:a" instead.
+MSG
     "!" => 'Invalid variable: "!".',
     "!a" => 'Invalid variable: "!a".',
     "! a" => 'Invalid variable: "! a".',
@@ -134,7 +142,7 @@ class SassEngineTest < Test::Unit::TestCase
       rescue Sass::SyntaxError => err
         value = [value] unless value.is_a?(Array)
 
-        assert_equal(value.first, err.message, "Line: #{key}")
+        assert_equal(value.first.rstrip, err.message, "Line: #{key}")
         assert_equal(__FILE__, err.sass_filename)
         assert_equal((value[1] || key.split("\n").length) + line - 1, err.sass_line, "Line: #{key}")
         assert_match(/#{Regexp.escape(__FILE__)}:[0-9]+/, err.backtrace[0], "Line: #{key}")
@@ -737,6 +745,27 @@ bang, bip, bop
 SASS
   end
 
+  def test_root_level_pseudo_class_with_new_properties
+    assert_equal(<<CSS, render(<<SASS, :property_syntax => :new))
+:focus {
+  outline: 0; }
+CSS
+:focus
+  outline: 0
+SASS
+  end
+
+  def test_pseudo_class_with_new_properties
+    assert_equal(<<CSS, render(<<SASS, :property_syntax => :new))
+p :focus {
+  outline: 0; }
+CSS
+p
+  :focus
+    outline: 0
+SASS
+  end
+
   # Regression tests
 
   def test_parens_in_mixins

data/test/test_helper.rb

@@ -9,12 +9,6 @@ require 'sass'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
-# required because of Sass::Plugin
-unless defined? RAILS_ROOT
-  RAILS_ROOT = '.'
-  MERB_ENV = RAILS_ENV  = 'testing'
-end
-
 class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,200 +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/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
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 licenses: []
@@ -268,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