haml 3.0.14 → 3.0.15

data/VERSION

@@ -1 +1 @@
-3.0.14
+3.0.15

data/lib/haml/exec.rb

@@ -388,9 +388,6 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
-        p [colon_path?(@args[0]), split_colon_path(@args[0])]
-        exit
-
         if @args[1] && !colon_path?(@args[0])
           flag = @options[:update] ? "--update" : "--watch"
           err =
@@ -446,7 +443,7 @@ MSG
 
       def split_colon_path(path)
         one, two = path.split(':', 2)
-        if one && two && #::Haml::Util.windows? &&
+        if one && two && ::Haml::Util.windows? &&
             one =~ /\A[A-Za-z]\Z/ && two =~ /\A[\/\\]/
           # If we're on Windows and we were passed a drive letter path,
           # don't split on that colon.

data/lib/sass/engine.rb

@@ -592,25 +592,38 @@ WARNING
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
         :line => @line + 1) unless line.children.empty?
 
-      if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
-          match.offset(0).first == 0 && !match.post_match.strip.empty? &&
-          match.post_match.strip[0] != ?,
-        # @import "filename" media-type
-        return Tree::DirectiveNode.new("@import #{value}")
-      end
+      scanner = StringScanner.new(value)
+      values = []
 
-      value.split(/,\s*/).map do |f|
-        if f =~ Sass::SCSS::RX::URI
-          # All url()s are literal CSS @imports
-          next Tree::DirectiveNode.new("@import #{f}")
-        elsif f =~ Sass::SCSS::RX::STRING
-          f = $1 || $2
+      loop do
+        unless node = parse_import_arg(scanner)
+          raise SyntaxError.new("Invalid @import: expected file to import, was #{scanner.rest.inspect}",
+            :line => @line)
         end
+        values << node
+        break unless scanner.scan(/,\s*/)
+      end
+
+      return values
+    end
 
-        # http:// URLs are always literal CSS imports
-        next Tree::DirectiveNode.new("@import url(#{f})") if f =~ /^http:\/\//
+    def parse_import_arg(scanner)
+      return if scanner.eos?
+      unless (str = scanner.scan(Sass::SCSS::RX::STRING)) ||
+          (uri = scanner.scan(Sass::SCSS::RX::URI))
+        return Tree::ImportNode.new(scanner.scan(/[^,]+/))
+      end
 
-        Tree::ImportNode.new(f)
+      val = scanner[1] || scanner[2]
+      scanner.scan(/\s*/)
+      if media = scanner.scan(/[^,].*/)
+        Tree::DirectiveNode.new("@import #{str || uri} #{media}")
+      elsif uri
+        Tree::DirectiveNode.new("@import #{uri}")
+      elsif val =~ /^http:\/\//
+        Tree::DirectiveNode.new("@import url(#{val})")
+      else
+        Tree::ImportNode.new(val)
       end
     end
 

data/test/haml/helper_test.rb

@@ -118,7 +118,7 @@ HAML
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="foo" method="post">
+<form #{rails_form_attr}action="foo" method="post">#{rails_form_opener}
   <p>bar</p>
   <strong>baz</strong>
 </form>
@@ -167,7 +167,7 @@ HAML
     def @base.protect_against_forgery?; false; end
     error_class = Haml::Util.ap_geq_3? ? "field_with_errors" : "fieldWithErrors"
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   <div class="#{error_class}"><label for="post_error_field">Error field</label></div>
 </form>
 HTML

data/test/haml/results/helpers.xhtml

@@ -45,29 +45,6 @@ click
 <p>baz</p>
                     <p>boom</p>
 foo
-<p>
-  <form action="" method="post">
-</p>
-<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

@@ -280,7 +280,7 @@ END
     def test_av_block_deprecation_warning
       assert_warning(/^DEPRECATION WARNING: - style block helpers are deprecated\. Please use =\./) do
         assert_equal <<HTML, render(<<HAML, :action_view)
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:
@@ -379,7 +379,7 @@ HAML
 
     def test_xss_protection_with_form_for
       assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:

data/test/haml/templates/helpers.haml

@@ -35,72 +35,6 @@ click
 %p boom
 - concat "foo\n"
 - haml_buffer.tabulation = 0
--#
--# ActionPack pre-2.0 has weird url_for issues here.
-- if ActionPack::VERSION::MAJOR < 2
-  :plain
-    <p>
-      <form action="" method="post">
-    </p>
-    <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>
-- elsif Haml::Util.ap_geq?("3.0.0.beta3")
-  %p
-    = form_tag ''
-  %div
-    = form_tag '' do
-      %div= submit_tag 'save'
-      - @foo = 'value one'
-      = test_partial 'partial'
-    = form_for @article, :as => :article, :url => '', :html => {:class => nil, :id => nil} do |f|
-      Title:
-      = f.text_field :title
-      Body:
-      = f.text_field :body
-- 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 ''
-  %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/sass/engine_test.rb

@@ -493,6 +493,12 @@ CSS
   def test_media_import
     assert_equal("@import \"./fonts.sass\" all;\n",
       render("@import \"./fonts.sass\" all"))
+    assert_equal(<<CSS, render(<<SASS))
+@import "./fonts.sass" all;
+@import url(./fonts.scss);
+CSS
+@import "./fonts.sass" all, url(./fonts.scss)
+SASS
   end
 
   def test_http_import
@@ -2044,6 +2050,14 @@ SASS
     end
   end
 
+  def test_import_with_commas_in_url
+    assert_equal <<CSS, render(<<SASS)
+@import url(foo.css?bar,baz);
+CSS
+@import url(foo.css?bar,baz)
+SASS
+  end
+
   # Encodings
 
   unless Haml::Util.ruby1_8?

data/test/test_helper.rb

@@ -68,4 +68,14 @@ class Test::Unit::TestCase
     return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3?
     return ":#{name}, @#{name}"
   end
+
+  def rails_form_attr
+    return 'accept-charset="UTF-8" ' if Haml::Util.ap_geq?("3.0.0.rc")
+    return ''
+  end
+
+  def rails_form_opener
+    return '' unless Haml::Util.ap_geq?("3.0.0.rc")
+    return '<div style="margin:0;padding:0;display:inline"><input name="_snowman" type="hidden" value="&#9731;" /></div>'
+  end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 14
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,37 +11,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -07:00
+date: 2010-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 3
         version: 0.5.3
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 9
         version: 0.5.9
-  type: :development
-  version_requirements: *id002
+    version: 
 description: "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML\n      that's designed to express the structure of XHTML or XML documents\n      in a non-repetitive, elegant, easy way,\n      using indentation rather than closing tags\n      and allowing Ruby to be embedded with ease.\n      It was originally envisioned as a plugin for Ruby on Rails,\n      but it can function as a stand-alone templating engine.\n"
 email: haml@googlegroups.com
 executables: 
@@ -58,373 +45,294 @@ 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/haml.rbc
 - lib/sass.rb
-- lib/sass/css.rb
-- lib/sass/script/node.rbc
-- lib/sass/script/node.rb
-- lib/sass/script/funcall.rbc
-- lib/sass/script/operation.rbc
-- lib/sass/script/interpolation.rb
-- lib/sass/script/number.rb
-- lib/sass/script/css_lexer.rbc
-- lib/sass/script/bool.rbc
-- lib/sass/script/lexer.rbc
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/interpolation.rbc
-- lib/sass/script/functions.rb
-- lib/sass/script/string_interpolation.rb
-- lib/sass/script/functions.rbc
-- lib/sass/script/bool.rb
-- lib/sass/script/string_interpolation.rbc
-- lib/sass/script/color.rbc
-- lib/sass/script/literal.rbc
-- lib/sass/script/string.rbc
-- lib/sass/script/color.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/unary_operation.rbc
-- lib/sass/script/variable.rbc
-- lib/sass/script/number.rbc
-- lib/sass/script/parser.rb
-- lib/sass/script/css_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/script/parser.rbc
-- lib/sass/script/css_parser.rbc
+- lib/sass/plugin/generic.rb
+- lib/sass/plugin/configuration.rb
+- lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/rack.rb
+- lib/sass/plugin/merb.rb
 - lib/sass/script.rb
+- lib/sass/selector/simple_sequence.rb
+- lib/sass/selector/sequence.rb
+- lib/sass/selector/simple.rb
+- lib/sass/selector/abstract_sequence.rb
+- lib/sass/selector/comma_sequence.rb
 - lib/sass/error.rb
-- lib/sass/repl.rb
-- lib/sass/error.rbc
-- lib/sass/tree/node.rbc
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/variable_node.rbc
-- lib/sass/tree/node.rb
-- lib/sass/tree/extend_node.rb
-- lib/sass/tree/directive_node.rbc
-- lib/sass/tree/comment_node.rbc
 - lib/sass/tree/for_node.rb
-- lib/sass/tree/mixin_node.rbc
+- lib/sass/tree/mixin_node.rb
 - lib/sass/tree/warn_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/warn_node.rbc
-- lib/sass/tree/extend_node.rbc
-- lib/sass/tree/while_node.rb
+- lib/sass/tree/extend_node.rb
+- lib/sass/tree/if_node.rb
+- lib/sass/tree/prop_node.rb
 - lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/if_node.rbc
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/while_node.rbc
-- lib/sass/tree/if_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/prop_node.rbc
+- lib/sass/tree/variable_node.rb
+- lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
-- lib/sass/tree/mixin_def_node.rbc
-- lib/sass/tree/rule_node.rbc
-- lib/sass/tree/root_node.rbc
+- lib/sass/tree/node.rb
+- lib/sass/tree/comment_node.rb
 - lib/sass/tree/rule_node.rb
-- lib/sass/tree/for_node.rbc
-- lib/sass/tree/debug_node.rbc
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/import_node.rbc
-- lib/sass/tree/variable_node.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/configuration.rb
-- lib/sass/plugin/merb.rb
-- lib/sass/plugin/staleness_checker.rbc
-- lib/sass/plugin/staleness_checker.rb
-- lib/sass/plugin/configuration.rbc
-- lib/sass/plugin/generic.rb
-- lib/sass/environment.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/while_node.rb
 - lib/sass/callbacks.rb
-- lib/sass/selector/simple_sequence.rb
-- lib/sass/selector/comma_sequence.rbc
-- lib/sass/selector/sequence.rbc
-- lib/sass/selector/simple.rbc
-- lib/sass/selector/abstract_sequence.rbc
-- lib/sass/selector/simple_sequence.rbc
-- lib/sass/selector/abstract_sequence.rb
-- lib/sass/selector/comma_sequence.rb
-- lib/sass/selector/sequence.rb
-- lib/sass/selector/simple.rb
-- lib/sass/selector.rb
 - lib/sass/files.rb
-- lib/sass/script.rbc
 - lib/sass/scss.rb
-- lib/sass/engine.rb
-- lib/sass/scss.rbc
-- lib/sass/callbacks.rbc
 - lib/sass/plugin.rb
-- lib/sass/less.rbc
-- lib/sass/selector.rbc
-- lib/sass/scss/static_parser.rb
-- lib/sass/scss/script_parser.rbc
-- lib/sass/scss/sass_parser.rb
-- lib/sass/scss/static_parser.rbc
+- 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/css_parser.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/node.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/interpolation.rb
+- lib/sass/css.rb
+- lib/sass/engine.rb
+- lib/sass/less.rb
+- lib/sass/selector.rb
+- lib/sass/scss/parser.rb
+- lib/sass/scss/script_parser.rb
 - lib/sass/scss/rx.rb
 - lib/sass/scss/script_lexer.rb
-- lib/sass/scss/sass_parser.rbc
-- lib/sass/scss/parser.rb
 - lib/sass/scss/css_parser.rb
-- lib/sass/scss/rx.rbc
-- lib/sass/scss/script_lexer.rbc
-- lib/sass/scss/parser.rbc
-- lib/sass/scss/css_parser.rbc
-- lib/sass/scss/script_parser.rb
-- lib/sass/less.rb
-- lib/sass/environment.rbc
-- lib/sass/files.rbc
-- lib/sass/engine.rbc
-- lib/sass/plugin.rbc
-- lib/sass.rbc
-- lib/haml/filters.rb
+- lib/sass/scss/sass_parser.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/repl.rb
+- lib/sass/environment.rb
+- lib/haml/util.rb
 - lib/haml/exec.rb
-- lib/haml/util.rbc
 - lib/haml/railtie.rb
+- lib/haml/html.rb
 - lib/haml/error.rb
-- lib/haml/version.rbc
-- lib/haml/error.rbc
-- lib/haml/helpers.rbc
-- lib/haml/util/subset_map.rbc
+- lib/haml/buffer.rb
 - lib/haml/util/subset_map.rb
-- lib/haml/html/erb.rb
 - lib/haml/template.rb
-- lib/haml/root.rbc
-- lib/haml/filters.rbc
-- lib/haml/shared.rb
-- lib/haml/shared.rbc
-- 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/template/options.rb
 - lib/haml/helpers.rb
-- lib/haml/buffer.rbc
-- lib/haml/buffer.rb
-- lib/haml/html.rb
-- lib/haml/engine.rbc
 - lib/haml/root.rb
-- lib/haml/railtie.rbc
-- lib/haml/precompiler.rbc
+- lib/haml/version.rb
+- lib/haml/filters.rb
+- lib/haml/engine.rb
+- lib/haml/html/erb.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
-- vendor/fssm/Rakefile
-- vendor/fssm/profile/prof-pathname.rb
-- vendor/fssm/profile/prof-plain-pathname.html
-- vendor/fssm/profile/prof-cache.rb
-- vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/fssm/profile/prof.html
-- vendor/fssm/example.rb
-- vendor/fssm/spec/spec_helper.rb
-- vendor/fssm/spec/path_spec.rb
-- vendor/fssm/spec/root/file.css
-- vendor/fssm/spec/root/file.yml
-- vendor/fssm/spec/root/moo/cow.txt
-- vendor/fssm/spec/root/file.rb
-- vendor/fssm/spec/root/duck/quack.txt
+- vendor/fssm/README.markdown
 - vendor/fssm/lib/fssm.rb
-- vendor/fssm/lib/fssm/path.rb
 - vendor/fssm/lib/fssm/support.rb
-- vendor/fssm/lib/fssm/pathname.rb
 - vendor/fssm/lib/fssm/monitor.rb
-- vendor/fssm/lib/fssm/tree.rb
-- vendor/fssm/lib/fssm/state/directory.rb
-- vendor/fssm/lib/fssm/state/file.rb
-- vendor/fssm/lib/fssm/backends/polling.rb
+- vendor/fssm/lib/fssm/pathname.rb
+- vendor/fssm/lib/fssm/backends/inotify.rb
 - vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
 - vendor/fssm/lib/fssm/backends/fsevents.rb
-- vendor/fssm/lib/fssm/backends/inotify.rb
+- vendor/fssm/lib/fssm/backends/polling.rb
+- vendor/fssm/lib/fssm/path.rb
+- vendor/fssm/lib/fssm/tree.rb
+- vendor/fssm/lib/fssm/state/file.rb
+- vendor/fssm/lib/fssm/state/directory.rb
+- vendor/fssm/spec/spec_helper.rb
+- vendor/fssm/spec/path_spec.rb
+- vendor/fssm/spec/root/file.rb
+- vendor/fssm/spec/root/file.yml
+- vendor/fssm/spec/root/duck/quack.txt
+- vendor/fssm/spec/root/file.css
+- vendor/fssm/spec/root/moo/cow.txt
+- vendor/fssm/profile/prof-plain-pathname.html
+- vendor/fssm/profile/prof.html
+- vendor/fssm/profile/prof-cache.rb
+- vendor/fssm/profile/prof-fssm-pathname.html
+- vendor/fssm/profile/prof-pathname.rb
+- vendor/fssm/fssm.gemspec
 - vendor/fssm/VERSION.yml
+- vendor/fssm/example.rb
+- vendor/fssm/Rakefile
 - vendor/fssm/LICENSE
-- vendor/fssm/README.markdown
-- vendor/fssm/fssm.gemspec
-- bin/sass-convert
-- bin/sass
 - bin/css2sass
-- bin/html2haml
+- bin/sass
 - bin/haml
-- test/test_helper.rbc
-- test/linked_rails.rb
-- test/benchmark.rb
-- test/linked_rails.rbc
-- test/sass/script_test.rb
-- test/sass/engine_test.rbc
-- test/sass/less_conversion_test.rb
-- test/sass/plugin_test.rbc
-- test/sass/css2sass_test.rb
-- test/sass/extend_test.rbc
-- test/sass/script_conversion_test.rb
+- bin/sass-convert
+- bin/html2haml
+- test/sass/conversion_test.rb
 - test/sass/extend_test.rb
-- test/sass/data/hsl-rgb.txt
-- test/sass/less_conversion_test.rbc
-- test/sass/results/warn_imported.css
-- test/sass/results/units.css
-- test/sass/results/parent_ref.css
-- test/sass/results/compressed.css
-- test/sass/results/warn.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/options.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/scss_import.css
-- test/sass/results/expanded.css
-- test/sass/results/scss_importee.css
-- test/sass/more_results/more_import.css
+- test/sass/less_conversion_test.rb
+- test/sass/script_test.rb
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more1.css
-- test/sass/conversion_test.rb
-- test/sass/templates/basic.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/nested_bork4.sass
+- test/sass/more_results/more_import.css
+- test/sass/script_conversion_test.rb
+- test/sass/templates/bork2.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/importee.less
-- test/sass/templates/import.sass
-- test/sass/templates/script.sass
 - test/sass/templates/expanded.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/compact.sass
+- test/sass/templates/bork4.sass
+- test/sass/templates/nested_bork1.sass
+- test/sass/templates/import.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/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/_partial.sass
 - test/sass/templates/options.sass
+- test/sass/templates/units.sass
+- test/sass/templates/nested_bork4.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/nested_mixin_bork.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/nested_bork2.sass
+- test/sass/templates/alt.sass
+- test/sass/templates/bork3.sass
+- test/sass/templates/mixin_bork.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/nested_bork3.sass
-- test/sass/templates/nested_bork1.sass
-- test/sass/templates/scss_import.scss
-- test/sass/templates/bork4.sass
-- test/sass/templates/warn_imported.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/mixin_bork.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
+- test/sass/templates/warn_imported.sass
 - test/sass/templates/scss_importee.scss
-- test/sass/templates/units.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/scss_import.scss
 - test/sass/templates/bork1.sass
+- test/sass/templates/importee.less
 - test/sass/templates/complex.sass
-- test/sass/templates/bork3.sass
-- test/sass/templates/bork2.sass
+- test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/more_templates/_more_partial.sass
 - 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/engine_test.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/scss_test.rb
 - test/sass/scss/test_helper.rb
+- test/sass/scss/scss_test.rb
 - test/sass/scss/rx_test.rb
-- test/sass/plugin_test.rb
-- test/haml/engine_test.rbc
+- test/sass/data/hsl-rgb.txt
+- test/sass/results/nested.css
+- test/sass/results/warn.css
+- test/sass/results/units.css
+- test/sass/results/scss_importee.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/options.css
+- test/sass/results/warn_imported.css
+- test/sass/results/compact.css
+- test/sass/results/expanded.css
+- test/sass/results/alt.css
+- test/sass/results/mixins.css
+- test/sass/results/scss_import.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/haml/mocks/article.rb
 - test/haml/util_test.rb
 - test/haml/spec_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/util/subset_map_test.rb
+- test/haml/html2haml_test.rb
 - 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/util/subset_map_test.rb
+- 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/html2haml/erb_tests.rb
-- test/haml/engine_test.rb
-- test/haml/erb/_av_partial_2.erb
+- 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/erb/action_view.erb
+- test/haml/erb/_av_partial_2.erb
 - test/haml/erb/_av_partial_1.erb
 - test/haml/erb/standard.erb
+- test/haml/html2haml/erb_tests.rb
+- 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-lang.com/
 licenses: []
@@ -445,42 +353,40 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.6
+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/conversion_test.rb
+- test/sass/extend_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/css2sass_test.rb
+- test/sass/script_test.rb
 - test/sass/script_conversion_test.rb
-- test/sass/extend_test.rb
-- test/sass/conversion_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/functions_test.rb
-- test/sass/engine_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/scss_test.rb
 - test/sass/scss/rx_test.rb
-- test/sass/plugin_test.rb
+- test/sass/engine_test.rb
 - test/haml/util_test.rb
 - test/haml/spec_test.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/template_test.rb
-- test/haml/util/subset_map_test.rb
+- test/haml/html2haml_test.rb
 - test/haml/helper_test.rb
+- test/haml/util/subset_map_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/engine_test.rb