haml 2.0.6 → 2.0.7

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/lib/haml.rb

@@ -1053,4 +1053,5 @@ module Haml
   end
 end
 
+require 'haml/util'
 require 'haml/engine'

data/lib/haml/buffer.rb

@@ -105,6 +105,7 @@ module Haml
       tabulation = @real_tabs
 
       result = result.to_s.rstrip
+      result = result.lstrip if nuke_inner_whitespace
       result = html_escape(result) if escape_html
 
       if preserve_tag

data/lib/haml/filters.rb

@@ -249,13 +249,13 @@ END
       def render(text)
         engine = case @required
                  when 'rdiscount'
-                   RDiscount
+                   ::RDiscount
                  when 'peg_markdown'
-                   PEGMarkdown
+                   ::PEGMarkdown
                  when 'maruku'
-                   Maruku
+                   ::Maruku
                  when 'bluecloth'
-                   BlueCloth
+                   ::BlueCloth
                  end
         engine.new(text).to_html
       end
@@ -266,7 +266,7 @@ END
       lazy_require 'maruku'
 
       def render(text)
-        Maruku.new(text).to_html
+        ::Maruku.new(text).to_html
       end
     end
   end

data/lib/haml/helpers.rb

@@ -254,17 +254,17 @@ module Haml
     # the local variable <tt>foo</tt> would be assigned to "<p>13</p>\n".
     #
     def capture_haml(*args, &block)
-      buffer = eval('_hamlout', block) rescue haml_buffer
+      buffer = eval('_hamlout', block.binding) rescue haml_buffer
       with_haml_buffer(buffer) do
         position = haml_buffer.buffer.length
 
         block.call(*args)
 
-        captured = haml_buffer.buffer.slice!(position..-1)
+        captured = haml_buffer.buffer.slice!(position..-1).split(/^/)
 
         min_tabs = nil
         captured.each do |line|
-          tabs = line.index(/[^ ]/)
+          tabs = line.index(/[^ ]/) || line.length
           min_tabs ||= tabs
           min_tabs = min_tabs > tabs ? tabs : min_tabs
         end
@@ -287,10 +287,15 @@ END
 
     # Outputs text directly to the Haml buffer, with the proper tabulation
     def haml_concat(text = "")
-      haml_buffer.buffer << ('  ' * haml_buffer.tabulation) << text.to_s << "\n"
+      haml_buffer.buffer << haml_indent << text.to_s << "\n"
       nil
     end
 
+    # Returns the string that should be used to indent the current line
+    def haml_indent
+      '  ' * haml_buffer.tabulation
+    end
+
     #
     # call-seq:
     #   haml_tag(name, *flags, attributes = {}) {...}
@@ -407,7 +412,7 @@ END
 
     # Returns whether or not +block+ is defined directly in a Haml template.
     def block_is_haml?(block)
-      eval('_hamlout', block)
+      eval('_hamlout', block.binding)
       true
     rescue
       false

data/lib/haml/helpers/action_view_mods.rb

@@ -17,7 +17,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
       alias_method :render, :render_with_haml
 
       # Rails >2.1
-      if instance_methods.include?('output_buffer')
+      if Haml::Util.has?(:instance_method, self, :output_buffer)
         def output_buffer_with_haml
           return haml_buffer.buffer if is_haml?
           output_buffer_without_haml
@@ -44,7 +44,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
       # In Rails <=2.1, we've got to override considerable capturing infrastructure.
       # In Rails >2.1, we can make do with only overriding #capture
       # (which no longer behaves differently in helper contexts).
-      unless ActionView::Base.instance_methods.include?('output_buffer')
+      unless Haml::Util.has?(:instance_method, ActionView::Base, :output_buffer)
         module CaptureHelper
           def capture_with_haml(*args, &block)
             # Rails' #capture helper will just return the value of the block
@@ -141,10 +141,12 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
                 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? && is_haml?
+            concat "\n" if block_given?
             res
           else
             form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
@@ -162,7 +164,9 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
               tab_up
               oldproc.call(*args)
               tab_down
+              concat haml_indent
             end
+            concat haml_indent
           end
           form_for_without_haml(object_name, *args, &proc)
           concat "\n" if block_given? && is_haml?

data/lib/haml/util.rb

@@ -0,0 +1,15 @@
+module Haml
+  module Util
+    class << self; include Haml::Util; end
+
+    RUBY_VERSION = ::RUBY_VERSION.split(".").map {|s| s.to_i}
+
+    def ruby1_8?
+      Haml::Util::RUBY_VERSION[0] == 1 && Haml::Util::RUBY_VERSION[1] < 9
+    end
+
+    def has?(attr, klass, method)
+      klass.send("#{attr}s").include?(ruby1_8? ? method.to_s : method.to_sym)
+    end
+  end
+end

data/test/benchmark.rb

@@ -14,19 +14,11 @@ end
 require File.dirname(__FILE__) + '/../lib/haml'
 require File.dirname(__FILE__) + '/linked_rails'
 %w[sass rubygems erb erubis markaby active_support action_controller
-   action_view haml/template].each(&method(:require))
-
-begin
-  require 'benchwarmer'
-rescue LoadError
-  # Since it's not as simple as gem install at the time of writing,
-  # we need to direct folks to the benchwarmer gem.
-  raise "The Haml benchmarks require the benchwarmer gem, available from http://github.com/wycats/benchwarmer"
-end
+   action_view action_pack haml/template rbench].each {|dep| require(dep)}
 
 def view
-  unless ActionView::Base.instance_methods.include? 'finder'
-    return ActionView::Base.new(File.dirname(__FILE__), vars)
+  unless Haml::Util.has?(:instance_method, ActionView::Base, :finder)
+    return ActionView::Base.new(File.dirname(__FILE__), {})
   end
 
   # Rails >=2.1.0
@@ -35,9 +27,15 @@ def view
   base
 end
 
-Benchmark.warmer(times) do
-  columns :haml, :erb, :erubis, :mab
-  titles :haml => "Haml", :erb => "ERB", :erubis => "Erubis", :mab => "Markaby"
+def render(view, file)
+  view.render :file => file
+end
+
+RBench.run(times) do
+  column :haml, :title => "Haml"
+  column :haml_ugly, :title => "Haml :ugly"
+  column :erb, :title => "ERB"
+  column :erubis, :title => "Erubis"
 
   template_name = 'standard'
   directory = File.dirname(__FILE__) + '/haml'
@@ -45,49 +43,56 @@ Benchmark.warmer(times) do
   erb_template     = File.read("#{directory}/rhtml/#{template_name}.rhtml")
   markaby_template = File.read("#{directory}/markaby/#{template_name}.mab")
 
-  report "Uncached" do
-    haml   { Haml::Engine.new(haml_template).render }
-    erb    { ERB.new(erb_template, nil, '-').result }
-    erubis { Erubis::Eruby.new(erb_template).result }
-    mab    { Markaby::Template.new(markaby_template).render }
-  end
-
   report "Cached" do
     obj = Object.new
 
     Haml::Engine.new(haml_template).def_method(obj, :haml)
+    Haml::Engine.new(haml_template, :ugly => true).def_method(obj, :haml_ugly)
     Erubis::Eruby.new(erb_template).def_method(obj, :erubis)
     obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
 
-    haml   { obj.haml }
-    erb    { obj.erb }
-    erubis { obj.erubis }
+    haml      { obj.haml }
+    haml_ugly { obj.haml_ugly }
+    erb       { obj.erb }
+    erubis    { obj.erubis }
   end
 
   report "ActionView" do
     @base = view
 
+    @base.unmemoize_all
+    Haml::Template.options[:ugly] = false
     # To cache the template
-    @base.render 'haml/templates/standard'
-    @base.render 'haml/rhtml/standard'
+    render @base, 'haml/templates/standard'
+    render @base, 'haml/rhtml/standard'
+
+    haml { render @base, 'haml/templates/standard' }
+    erb  { render @base, 'haml/rhtml/standard' }
 
-    haml { @base.render 'haml/templates/standard' }
-    erb  { @base.render 'haml/rhtml/standard' }
+    Haml::Template.options[:ugly] = true
+    render @base, 'haml/templates/standard_ugly'
+    haml_ugly { render @base, 'haml/templates/standard_ugly' }
   end
 
   report "ActionView with deep partials" do
     @base = view
 
+    @base.unmemoize_all
+    Haml::Template.options[:ugly] = false
     # To cache the template
-    @base.render 'haml/templates/action_view'
-    @base.render 'haml/rhtml/action_view'
+    render @base, 'haml/templates/action_view'
+    render @base, 'haml/rhtml/action_view'
+
+    haml { render @base, 'haml/templates/action_view' }
+    erb  { render @base, 'haml/rhtml/action_view' }
 
-    haml { @base.render 'haml/templates/action_view' }
-    erb  { @base.render 'haml/rhtml/action_view' }
+    Haml::Template.options[:ugly] = true
+    render @base, 'haml/templates/action_view_ugly'
+    haml_ugly { render @base, 'haml/templates/action_view_ugly' }
   end
 end
 
-Benchmark.warmer(times) do
+RBench.run(times) do
   sass_template = File.read("#{File.dirname(__FILE__)}/sass/templates/complex.sass")
 
   report("Sass") { Sass::Engine.new(sass_template).render }

data/test/haml/engine_test.rb

@@ -188,6 +188,19 @@ SOURCE
                  render("%p{:foo => 'bar', :bar => false, :baz => 'false'}", :format => :xhtml))
   end
 
+  def test_whitespace_nuke_with_both_newlines
+    # Regression test
+    assert_equal("<p>foo</p>\n", render('%p<= "\nfoo\n"'))
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  <p>foo</p>
+</p>
+HTML
+%p
+  %p<= "\\nfoo\\n"
+HAML
+  end
+
   def test_both_whitespace_nukes_work_together
     assert_equal(<<RESULT, render(<<SOURCE))
 <p><q>Foo
@@ -308,6 +321,16 @@ HAML
     assert_equal("foo&amp;bar\n", render("= 'foo&bar' #comment", :escape_html => true))
   end
 
+  def test_script_with_if_shouldnt_output
+    assert_equal(<<HTML, render(<<HAML))
+<p>foo</p>
+<p></p>
+HTML
+%p= "foo"
+%p= "bar" if false
+HAML
+  end
+
   # Options tests
 
   def test_filename_and_line

data/test/haml/results/helpers.xhtml

@@ -48,24 +48,26 @@ foo
 <p>
   <form action="" method="post">
 </p>
-<form action="" method="post">
-  <div><input name="commit" type="submit" value="save" /></div>
-  <p>
-    @foo =
-    value one
-  </p>
-  Toplevel? false
-  <p>
-    @foo =
-    value three
-  </p>
-</form>
-<form action="" method="post">
-  Title:
-  <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-  Body:
-  <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-</form>
+<div>
+  <form action="" method="post">
+    <div><input name="commit" type="submit" value="save" /></div>
+    <p>
+      @foo =
+      value one
+    </p>
+    Toplevel? false
+    <p>
+      @foo =
+      value three
+    </p>
+  </form>
+  <form action="" method="post">
+    Title:
+    <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
+    Body:
+    <input id="article_body" name="article[body]" size="30" type="text" value="World" />
+  </form>
+</div>
 <li><a href='http://www.google.com'>google</a></li>
 <p>
   foo

data/test/haml/template_test.rb

@@ -38,7 +38,7 @@ class TemplateTest < Test::Unit::TestCase
   def setup
     vars = { 'article' => Article.new, 'foo' => 'value one' }
     
-    unless ActionView::Base.instance_methods.include? 'finder'
+    unless Haml::Util.has?(:instance_method, ActionView::Base, :finder)
       @base = ActionView::Base.new(TEMPLATE_PATH, vars)
     else
       # Rails 2.1.0
@@ -46,7 +46,7 @@ class TemplateTest < Test::Unit::TestCase
       @base.finder.append_view_path(TEMPLATE_PATH)
     end
     
-    if @base.private_methods.include?('evaluate_assigns')
+    if Haml::Util.has?(:private_method, @base, :evaluate_assigns)
       @base.send(:evaluate_assigns)
     else
       # Rails 2.2

data/test/haml/templates/_av_partial_1_ugly.haml

@@ -0,0 +1,9 @@
+%h2 This is a pretty complicated partial
+.partial
+  %p It has several nested partials,
+  %ul
+    - 5.times do
+      %li
+        %strong Partial:
+        - @nesting = 5
+        = render :partial => 'haml/templates/av_partial_2_ugly'

data/test/haml/templates/_av_partial_2_ugly.haml

@@ -0,0 +1,5 @@
+- @nesting -= 1
+.partial{:level => @nesting}
+  %h3 This is a crazy deep-nested partial.
+  %p== Nesting level #{@nesting}
+  = render :partial => 'haml/templates/av_partial_2_ugly' if @nesting > 0

data/test/haml/templates/action_view_ugly.haml

@@ -0,0 +1,47 @@
+!!!
+%html{html_attrs}
+  %head
+    %title Hampton Catlin Is Totally Awesome
+    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
+  %body
+    %h1
+      This is very much like the standard template,
+      except that it has some ActionView-specific stuff.
+      It's only used for benchmarking.
+    .crazy_partials= render :partial => 'haml/templates/av_partial_1_ugly'
+    / You're In my house now!
+    .header
+      Yes, ladies and gentileman. He is just that egotistical.
+      Fantastic! This should be multi-line output
+      The question is if this would translate! Ahah!
+      = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
+    #body= " Quotes should be loved! Just like people!"
+    - 120.times do |number|
+      - number
+    Wow.|
+    %p
+      = "Holy cow        " + |
+        "multiline       " + |      
+        "tags!           " + |
+        "A pipe (|) even!"   |
+      = [1, 2, 3].collect { |n| "PipesIgnored|" }
+      = [1, 2, 3].collect { |n|     |
+          n.to_s                    |
+        }.join("|")                 |
+    %div.silent
+      - foo = String.new
+      - foo << "this"
+      - foo << " shouldn't"
+      - foo << " evaluate"
+      = foo + " but now it should!"
+      -# Woah crap a comment!
+
+    -# That was a line that shouldn't close everything.
+    %ul.really.cool
+      - ('a'..'f').each do |a|
+        %li= a
+    #combo.of_divs_with_underscore= @should_eval = "with this text"
+    = [ 104, 101, 108, 108, 111 ].map do |byte|
+      - byte.chr
+    .footer
+      %strong.shout= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works"

data/test/haml/templates/helpers.haml

@@ -42,36 +42,39 @@ click
     <p>
       <form action="" method="post">
     </p>
-    <form action="" method="post">
-      <div><input name="commit" type="submit" value="save" /></div>
-      <p>
-        @foo =
-        value one
-      </p>
-      Toplevel? false
-      <p>
-        @foo =
-        value three
-      </p>
-    </form>
-    <form action="" method="post">
-      Title:
-      <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-      Body:
-      <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-    </form>
+    <div>
+      <form action="" method="post">
+        <div><input name="commit" type="submit" value="save" /></div>
+        <p>
+          @foo =
+          value one
+        </p>
+        Toplevel? false
+        <p>
+          @foo =
+          value three
+        </p>
+      </form>
+      <form action="" method="post">
+        Title:
+        <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
+        Body:
+        <input id="article_body" name="article[body]" size="30" type="text" value="World" />
+      </form>
+    </div>
 - else
   %p
     = form_tag ''
-  - 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
+  %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
 = list_of({:google => 'http://www.google.com'}) do |name, link|
   %a{ :href => link }= name
 %p

data/test/haml/templates/standard_ugly.haml

@@ -0,0 +1,42 @@
+!!!
+%html{html_attrs}
+  %head
+    %title Hampton Catlin Is Totally Awesome
+    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
+  %body
+    / You're In my house now!
+    .header
+      Yes, ladies and gentileman. He is just that egotistical.
+      Fantastic! This should be multi-line output
+      The question is if this would translate! Ahah!
+      = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
+    #body= " Quotes should be loved! Just like people!"
+    - 120.times do |number|
+      - number
+    Wow.|
+    %p
+      = "Holy cow        " + |
+        "multiline       " + |      
+        "tags!           " + |
+        "A pipe (|) even!"   |
+      = [1, 2, 3].collect { |n| "PipesIgnored|" }
+      = [1, 2, 3].collect { |n|     |
+          n.to_s                    |
+        }.join("|")                 |
+    %div.silent
+      - foo = String.new
+      - foo << "this"
+      - foo << " shouldn't"
+      - foo << " evaluate"
+      = foo + " but now it should!"
+      -# Woah crap a comment!
+
+    -# That was a line that shouldn't close everything.
+    %ul.really.cool
+      - ('a'..'f').each do |a|
+        %li= a
+    #combo.of_divs_with_underscore= @should_eval = "with this text"
+    = [ 104, 101, 108, 108, 111 ].map do |byte|
+      - byte.chr
+    .footer
+      %strong.shout= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works"

data/test/sass/plugin_test.rb

@@ -84,13 +84,22 @@ class SassPluginTest < Test::Unit::TestCase
     end
     
     require 'sass/plugin/merb'
-    MerbHandler.send(:define_method, :process_without_sass) { |*args| }
+    if defined?(MerbHandler)
+      MerbHandler.send(:define_method, :process_without_sass) { |*args| }
+    else
+      Merb::Rack::Application.send(:define_method, :call_without_sass) { |*args| }
+    end
+
     set_plugin_opts
 
     File.delete(tempfile_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic')
     
-    MerbHandler.new('.').process nil, nil
+    if defined?(MerbHandler)
+      MerbHandler.new('.').process nil, nil
+    else
+      Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/'))
+    end
 
     assert !Sass::Plugin.stylesheet_needs_update?('basic')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -24,167 +24,172 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- VERSION
+- FAQ
 - MIT-LICENSE
+- VERSION
 - README.rdoc
-- FAQ
 - REVISION
 files: 
 - rails/init.rb
 - lib/sass.rb
 - lib/sass
-- lib/sass/plugin
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/merb.rb
+- lib/sass/css.rb
 - lib/sass/error.rb
 - lib/sass/tree
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/value_node.rb
-- lib/sass/tree/attr_node.rb
 - lib/sass/tree/directive_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/comment_node.rb
+- lib/sass/tree/attr_node.rb
 - lib/sass/tree/rule_node.rb
+- lib/sass/plugin
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/merb.rb
 - lib/sass/constant.rb
+- lib/sass/engine.rb
+- lib/sass/plugin.rb
 - lib/sass/constant
-- lib/sass/constant/color.rb
-- lib/sass/constant/string.rb
 - lib/sass/constant/number.rb
 - lib/sass/constant/operation.rb
 - lib/sass/constant/literal.rb
+- lib/sass/constant/color.rb
+- lib/sass/constant/string.rb
 - lib/sass/constant/nil.rb
-- lib/sass/plugin.rb
-- lib/sass/css.rb
-- lib/sass/engine.rb
 - lib/haml
+- lib/haml/filters.rb
 - lib/haml/exec.rb
-- lib/haml/html.rb
 - lib/haml/error.rb
-- lib/haml/buffer.rb
 - lib/haml/template.rb
+- lib/haml/engine.rb
 - lib/haml/template
-- lib/haml/template/plugin.rb
 - lib/haml/template/patch.rb
+- lib/haml/template/plugin.rb
 - lib/haml/helpers.rb
-- lib/haml/filters.rb
-- lib/haml/engine.rb
+- lib/haml/buffer.rb
+- lib/haml/html.rb
 - lib/haml/precompiler.rb
+- lib/haml/util.rb
 - lib/haml/helpers
-- lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
+- lib/haml/helpers/action_view_extensions.rb
 - lib/haml.rb
-- bin/css2sass
 - bin/sass
-- bin/haml
+- bin/css2sass
 - bin/html2haml
+- bin/haml
+- test/linked_rails.rb
+- test/benchmark.rb
 - test/sass
+- test/sass/results
+- test/sass/results/constants.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/alt.css
+- test/sass/results/subdir
+- test/sass/results/subdir/subdir.css
+- test/sass/results/subdir/nested_subdir
+- 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/basic.css
+- test/sass/results/expanded.css
 - test/sass/templates
-- test/sass/templates/bork2.sass
+- test/sass/templates/basic.sass
+- test/sass/templates/bork.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/expanded.sass
 - test/sass/templates/import.sass
+- test/sass/templates/constants.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/nested.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/compact.sass
 - test/sass/templates/subdir
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/subdir/nested_subdir
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/basic.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/compact.sass
+- test/sass/templates/parent_ref.sass
 - test/sass/templates/alt.sass
-- test/sass/templates/constants.sass
 - test/sass/templates/importee.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/bork.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/complex.sass
-- test/sass/plugin_test.rb
-- test/sass/results
-- test/sass/results/nested.css
-- test/sass/results/subdir
-- test/sass/results/subdir/nested_subdir
-- 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/constants.css
-- test/sass/results/compressed.css
-- test/sass/results/parent_ref.css
-- test/sass/results/multiline.css
-- test/sass/results/basic.css
+- test/sass/templates/bork2.sass
 - test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/haml
 - test/haml/mocks
 - test/haml/mocks/article.rb
-- test/haml/template_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/rhtml
-- test/haml/rhtml/_av_partial_1.rhtml
+- 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/rhtml/_av_partial_2.rhtml
+- test/haml/html2haml_test.rb
+- test/haml/template_test.rb
 - test/haml/helper_test.rb
-- test/haml/templates
-- 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/_av_partial_2.haml
-- test/haml/templates/partial_layout.haml
-- test/haml/templates/helpful.haml
-- test/haml/templates/just_stuff.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/_av_partial_1.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/content_for_layout.haml
-- test/haml/templates/helpers.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/breakage.haml
-- test/haml/templates/action_view.haml
 - test/haml/results
+- test/haml/results/tag_parsing.xhtml
 - test/haml/results/content_for_layout.xhtml
-- test/haml/results/just_stuff.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/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/original_engine.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/list.xhtml
+- test/haml/results/just_stuff.xhtml
 - test/haml/results/partial_layout.xhtml
-- test/haml/results/tag_parsing.xhtml
+- test/haml/results/filters.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
 - test/haml/markaby
 - test/haml/markaby/standard.mab
+- test/haml/templates
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/partial_layout.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/partials.haml
+- test/haml/templates/_layout_for_partial.haml
+- test/haml/templates/original_engine.haml
+- test/haml/templates/helpers.haml
+- 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/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/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/engine_test.rb
-- test/linked_rails.rb
-- test/rails
-- test/benchmark.rb
 - test/test_helper.rb
+- test/rails
 - Rakefile
 - init.rb
-- VERSION
+- FAQ
 - MIT-LICENSE
+- VERSION
 - README.rdoc
-- FAQ
 - REVISION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
@@ -215,14 +220,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files: 
-- test/sass/plugin_test.rb
 - test/sass/engine_test.rb
-- test/haml/template_test.rb
+- test/sass/plugin_test.rb
 - test/haml/html2haml_test.rb
+- test/haml/template_test.rb
 - test/haml/helper_test.rb
 - test/haml/engine_test.rb