haml 3.1.0 → 3.1.1

data/vendor/sass/test/sass/results/if.css

@@ -0,0 +1,3 @@
+a { branch: if; }
+
+b { branch: else; }

data/vendor/sass/test/sass/script_conversion_test.rb

@@ -67,19 +67,6 @@ class SassScriptConversionTest < Test::Unit::TestCase
   def test_variable
     assert_renders "$foo-bar"
     assert_renders "$flaznicate"
-    assert_warning(<<WARN) {assert_equal "$tumbly-wumbly", render("!tumbly-wumbly")}
-DEPRECATION WARNING:
-On line 1, character 1 of 'test_variable_inline.sass'
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use "$tumbly-wumbly" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-  end
-
-  def test_important
-    assert_renders "!important"
-    assert_renders "$foo !important"
   end
 
   def self.test_precedence(outer, inner)
@@ -282,30 +269,6 @@ RUBY
     assert_equal '"foo#{$bar}baz"', render("'foo\#{$bar}baz'")
   end
 
-  def test_sass2_string_interpolation
-    assert_equal 'foo#{$bar}baz', render('"foo#{$bar}baz"', :context => :equals)
-    assert_equal '#{$bar}baz', render('"#{$bar}baz"', :context => :equals)
-    assert_equal 'foo#{$bar}', render('"foo#{$bar}"', :context => :equals)
-
-    assert_equal 'unquote(".foo#{$bar}.bar")', render('".foo#{$bar}.bar"', :context => :equals)
-    assert_equal 'unquote(".foo#{$bar}")', render('".foo#{$bar}"', :context => :equals)
-    assert_equal 'unquote("#{$bar}.bar")', render('"#{$bar}.bar"', :context => :equals)
-
-    assert_equal "unquote(\"f'o\#{$bar}b'z\")", render("'f\\'o\#{$bar}b\\'z'", :context => :equals)
-    assert_equal "unquote('f\"o\#{$bar}b\"z')", render("'f\\\"o\#{$bar}b\\\"z'", :context => :equals)
-    assert_equal "unquote(\"f'o\#{$bar}b\\\"z\")", render("'f\\'o\#{$bar}b\\\"z'", :context => :equals)
-  end
-
-  def test_sass2_urls
-    Sass::Util.silence_sass_warnings do
-      assert_equal 'url(foo/bar.gif)', render('url(foo/bar.gif)', :context => :equals)
-      assert_equal 'url("foo/bar.gif")', render('url("foo/bar.gif")', :context => :equals)
-
-      assert_equal 'url($var)', render('url(!var)', :context => :equals)
-      assert_equal 'url("#{$var}/flip.gif")', render('url("#{!var}/flip.gif")', :context => :equals)
-    end
-  end
-
   private
 
   def assert_renders(script, options = {})
@@ -315,7 +278,6 @@ RUBY
   def render(script, options = {})
     munge_filename(options)
     node = Sass::Script.parse(script, 1, 0, options)
-    node.context = options[:context] if options[:context]
     node.to_sass
   end
 end

data/vendor/sass/test/sass/script_test.rb

@@ -13,13 +13,13 @@ class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(Sass::SyntaxError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(Sass::SyntaxError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(ArgumentError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
@@ -198,6 +198,13 @@ SASS
     assert_equal "public_instance_methods()", resolve("public_instance_methods()")
   end
 
+  def test_adding_functions_directly_to_functions_module
+    assert !Functions.callable?('nonexistant')
+    Functions.class_eval { def nonexistant; end }
+    assert Functions.callable?('nonexistant')
+    Functions.send :remove_method, :nonexistant
+  end
+
   def test_default_functions
     assert_equal "url(12)", resolve("url(12)")
     assert_equal 'blam("foo")', resolve('blam("foo")')
@@ -399,6 +406,14 @@ SASS
     assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
   end
 
+  def test_empty_list
+    assert_equal "1 2 3", resolve("1 2 () 3")
+    assert_equal "1 2 3", resolve("1 2 3 ()")
+    assert_equal "1 2 3", resolve("() 1 2 3")
+    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("()")}
+    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/vendor/sass/test/sass/scss/scss_test.rb

@@ -699,6 +699,38 @@ CSS
 SCSS
   end
 
+  ## Functions
+
+  def test_basic_function
+    assert_equal(<<CSS, render(<<SASS))
+bar {
+  a: 3; }
+CSS
+@function foo() {
+  @return 1 + 2;
+}
+
+bar {
+  a: foo();
+}
+SASS
+  end
+
+  def test_function_args
+    assert_equal(<<CSS, render(<<SASS))
+bar {
+  a: 3; }
+CSS
+@function plus($var1, $var2) {
+  @return $var1 + $var2;
+}
+
+bar {
+  a: plus(1, 2);
+}
+SASS
+  end
+
   ## Interpolation
 
   def test_basic_selector_interpolation
@@ -846,17 +878,6 @@ SCSS
     assert_equal 2, e.sass_line
   end
 
-  def test_imports_only_at_toplevel
-    render <<SCSS
-foo {
-  @import "foo.scss";}
-SCSS
-    assert(false, "Expected syntax error")
-  rescue Sass::SyntaxError => e
-    assert_equal "Import directives may only be used at the root of a document.", e.message
-    assert_equal 2, e.sass_line
-  end
-
   def test_rules_beneath_properties
     render <<SCSS
 foo {

data/vendor/sass/test/sass/templates/if.sass

@@ -0,0 +1,11 @@
+a
+  @if true
+    branch: if
+  @else
+    branch: else
+
+b
+  @if false
+    branch: if
+  @else
+    branch: else

data/vendor/sass/test/sass/templates/nested_import.sass

@@ -0,0 +1,2 @@
+.foo
+  @import basic

data/vendor/sass/test/sass/util_test.rb

@@ -5,19 +5,6 @@ require 'pathname'
 class UtilTest < Test::Unit::TestCase
   include Sass::Util
 
-  class Dumpable
-    attr_reader :arr
-    def initialize; @arr = []; end
-    def _before_dump; @arr << :before; end
-    def _after_dump; @arr << :after; end
-    def _around_dump
-      @arr << :around_before
-      yield
-      @arr << :around_after
-    end
-    def _after_load; @arr << :loaded; end
-  end
-
   def test_scope
     assert(File.exist?(scope("Rakefile")))
   end
@@ -253,14 +240,6 @@ class UtilTest < Test::Unit::TestCase
     assert(!version_gt(v2, v1), "Expected #{v2} = #{v1}")
   end
 
-  def test_dump_and_load
-    obj = Dumpable.new
-    data = dump(obj)
-    assert_equal([:before, :around_before, :around_after, :after], obj.arr)
-    obj2 = load(data)
-    assert_equal([:before, :around_before, :loaded], obj2.arr)
-  end
-
   class FooBar
     def foo
       Sass::Util.abstract(self)

data/vendor/sass/test/test_helper.rb

@@ -8,9 +8,6 @@ require 'sass'
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
 module Sass::Script::Functions
-  module UserFunctions; end
-  include UserFunctions
-
   def option(name)
     Sass::Script::String.new(@options[name.value.to_sym].to_s)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -07:00
+date: 2011-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,346 +62,356 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
-- lib/sass/rails2_shim.rb
-- lib/sass/plugin.rb
-- lib/sass/rails3_shim.rb
-- lib/haml/helpers.rb
-- lib/haml/html.rb
-- lib/haml/shared.rb
-- lib/haml/error.rb
-- lib/haml/html/erb.rb
-- lib/haml/helpers/xss_mods.rb
-- lib/haml/helpers/action_view_extensions.rb
+- lib/sass.rb
+- lib/haml.rb
 - lib/haml/helpers/action_view_mods.rb
-- lib/haml/compiler.rb
-- lib/haml/railtie.rb
-- lib/haml/template/patch.rb
-- lib/haml/template/options.rb
-- lib/haml/template/plugin.rb
+- lib/haml/helpers/action_view_extensions.rb
+- lib/haml/helpers/xss_mods.rb
+- lib/haml/parser.rb
 - lib/haml/version.rb
-- lib/haml/root.rb
-- lib/haml/engine.rb
+- lib/haml/compiler.rb
+- lib/haml/shared.rb
 - lib/haml/buffer.rb
+- lib/haml/error.rb
+- lib/haml/engine.rb
+- lib/haml/root.rb
 - lib/haml/filters.rb
-- lib/haml/parser.rb
+- lib/haml/template/options.rb
+- lib/haml/template/plugin.rb
+- lib/haml/template/patch.rb
+- lib/haml/html/erb.rb
+- lib/haml/util.rb
+- lib/haml/helpers.rb
 - lib/haml/template.rb
+- lib/haml/railtie.rb
+- lib/haml/html.rb
 - lib/haml/exec.rb
-- lib/haml/util.rb
-- lib/sass.rb
-- lib/haml.rb
-- bin/haml
+- lib/sass/rails2_shim.rb
+- lib/sass/rails3_shim.rb
+- lib/sass/plugin.rb
 - bin/html2haml
+- bin/haml
+- test/linked_rails.rb
+- test/benchmark.rb
 - test/test_helper.rb
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/original_engine.haml
+- test/haml/engine_test.rb
+- test/haml/html2haml_test.rb
+- test/haml/erb/_av_partial_1.erb
+- test/haml/erb/standard.erb
+- test/haml/erb/_av_partial_2.erb
+- test/haml/erb/action_view.erb
 - test/haml/templates/helpers.haml
-- test/haml/templates/_av_partial_2_ugly.haml
-- test/haml/templates/content_for_layout.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/partialize.haml
+- test/haml/templates/whitespace_handling.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/list.haml
+- test/haml/templates/partials.haml
+- test/haml/templates/filters.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/standard_ugly.haml
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/action_view_ugly.haml
 - test/haml/templates/action_view.haml
-- test/haml/templates/nuke_inner_whitespace.haml
-- test/haml/templates/eval_suppressed.haml
-- test/haml/templates/_layout.erb
 - test/haml/templates/_partial.haml
+- test/haml/templates/_layout.erb
 - test/haml/templates/tag_parsing.haml
+- test/haml/templates/original_engine.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/_text_area.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/very_basic.haml
 - test/haml/templates/silent_script.haml
-- test/haml/templates/breakage.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/partial_layout.haml
+- test/haml/templates/content_for_layout.haml
 - test/haml/templates/_av_partial_2.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/list.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/render_layout.haml
-- test/haml/templates/action_view_ugly.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/partials.haml
 - test/haml/templates/_av_partial_1_ugly.haml
-- test/haml/templates/_text_area.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/partial_layout.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/breakage.haml
 - test/haml/templates/_layout_for_partial.haml
-- test/haml/templates/standard_ugly.haml
-- test/haml/templates/helpful.haml
-- test/haml/template_test.rb
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/render_layout.haml
 - test/haml/markaby/standard.mab
-- test/haml/erb/_av_partial_1.erb
-- test/haml/erb/_av_partial_2.erb
-- test/haml/erb/standard.erb
-- test/haml/erb/action_view.erb
-- test/haml/html2haml_test.rb
-- test/haml/spec_test.rb
-- test/haml/helper_test.rb
+- test/haml/template_test.rb
 - test/haml/util_test.rb
-- test/haml/mocks/article.rb
-- test/haml/engine_test.rb
 - test/haml/html2haml/erb_tests.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/spec/tests.json
-- test/haml/spec/lua_haml_spec.lua
-- test/haml/spec/README.md
 - test/haml/results/partial_layout.xhtml
 - test/haml/results/original_engine.xhtml
-- test/haml/results/helpers.xhtml
+- test/haml/results/silent_script.xhtml
 - test/haml/results/render_layout.xhtml
-- test/haml/results/tag_parsing.xhtml
+- test/haml/results/just_stuff.xhtml
+- test/haml/results/partials.xhtml
+- test/haml/results/helpful.xhtml
+- test/haml/results/eval_suppressed.xhtml
 - test/haml/results/whitespace_handling.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
 - test/haml/results/nuke_inner_whitespace.xhtml
-- test/haml/results/filters.xhtml
 - test/haml/results/standard.xhtml
-- test/haml/results/helpful.xhtml
-- test/haml/results/just_stuff.xhtml
-- test/haml/results/list.xhtml
-- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/tag_parsing.xhtml
+- test/haml/results/helpers.xhtml
 - test/haml/results/content_for_layout.xhtml
-- test/haml/results/silent_script.xhtml
-- test/haml/results/nuke_outer_whitespace.xhtml
-- test/haml/results/partials.xhtml
 - test/haml/results/very_basic.xhtml
-- test/benchmark.rb
-- test/linked_rails.rb
+- test/haml/results/filters.xhtml
+- test/haml/results/list.xhtml
+- test/haml/helper_test.rb
+- test/haml/spec_test.rb
+- test/haml/mocks/article.rb
+- test/haml/spec/ruby_haml_test.rb
+- test/haml/spec/README.md
+- test/haml/spec/tests.json
+- test/haml/spec/lua_haml_spec.lua
 - extra/update_watch.rb
-- vendor/sass/lib/sass/util/subset_map.rb
-- vendor/sass/lib/sass/shared.rb
-- vendor/sass/lib/sass/error.rb
-- vendor/sass/lib/sass/importers.rb
-- vendor/sass/lib/sass/cache_stores/filesystem.rb
-- vendor/sass/lib/sass/cache_stores/memory.rb
-- vendor/sass/lib/sass/cache_stores/null.rb
-- vendor/sass/lib/sass/cache_stores/active_support.rb
-- vendor/sass/lib/sass/cache_stores/base.rb
-- vendor/sass/lib/sass/environment.rb
-- vendor/sass/lib/sass/plugin/rack.rb
-- vendor/sass/lib/sass/plugin/staleness_checker.rb
+- vendor/sass/ext/extconf.rb
+- vendor/sass/yard/default/fulldoc/html/css/common.sass
+- vendor/sass/yard/default/layout/html/footer.erb
+- vendor/sass/yard/callbacks.rb
+- vendor/sass/yard/inherited_hash.rb
+- vendor/sass/README.md
+- vendor/sass/VERSION_NAME
+- vendor/sass/lib/sass.rb
+- vendor/sass/lib/sass/cache_stores.rb
 - vendor/sass/lib/sass/plugin/compiler.rb
-- vendor/sass/lib/sass/plugin/configuration.rb
 - vendor/sass/lib/sass/plugin/merb.rb
+- vendor/sass/lib/sass/plugin/staleness_checker.rb
+- vendor/sass/lib/sass/plugin/rack.rb
 - vendor/sass/lib/sass/plugin/rails.rb
+- vendor/sass/lib/sass/plugin/configuration.rb
 - vendor/sass/lib/sass/plugin/generic.rb
-- vendor/sass/lib/sass/railtie.rb
-- vendor/sass/lib/sass/callbacks.rb
-- vendor/sass/lib/sass/script/string.rb
-- vendor/sass/lib/sass/script/node.rb
-- vendor/sass/lib/sass/script/lexer.rb
-- vendor/sass/lib/sass/script/string_interpolation.rb
-- vendor/sass/lib/sass/script/css_parser.rb
-- vendor/sass/lib/sass/script/variable.rb
-- vendor/sass/lib/sass/script/literal.rb
-- vendor/sass/lib/sass/script/bool.rb
-- vendor/sass/lib/sass/script/number.rb
-- vendor/sass/lib/sass/script/unary_operation.rb
-- vendor/sass/lib/sass/script/css_lexer.rb
-- vendor/sass/lib/sass/script/operation.rb
-- vendor/sass/lib/sass/script/parser.rb
-- vendor/sass/lib/sass/script/funcall.rb
-- vendor/sass/lib/sass/script/color.rb
-- vendor/sass/lib/sass/script/interpolation.rb
-- vendor/sass/lib/sass/script/list.rb
-- vendor/sass/lib/sass/script/functions.rb
 - vendor/sass/lib/sass/version.rb
+- vendor/sass/lib/sass/cache_stores/chain.rb
+- vendor/sass/lib/sass/cache_stores/memory.rb
+- vendor/sass/lib/sass/cache_stores/null.rb
+- vendor/sass/lib/sass/cache_stores/filesystem.rb
+- vendor/sass/lib/sass/cache_stores/base.rb
+- vendor/sass/lib/sass/shared.rb
+- vendor/sass/lib/sass/repl.rb
+- vendor/sass/lib/sass/error.rb
+- vendor/sass/lib/sass/tree/import_node.rb
+- vendor/sass/lib/sass/tree/return_node.rb
 - vendor/sass/lib/sass/tree/root_node.rb
-- vendor/sass/lib/sass/tree/node.rb
 - vendor/sass/lib/sass/tree/if_node.rb
 - vendor/sass/lib/sass/tree/charset_node.rb
-- vendor/sass/lib/sass/tree/extend_node.rb
-- vendor/sass/lib/sass/tree/rule_node.rb
-- vendor/sass/lib/sass/tree/mixin_def_node.rb
-- vendor/sass/lib/sass/tree/mixin_node.rb
-- vendor/sass/lib/sass/tree/prop_node.rb
-- vendor/sass/lib/sass/tree/warn_node.rb
+- vendor/sass/lib/sass/tree/function_node.rb
+- vendor/sass/lib/sass/tree/media_node.rb
+- vendor/sass/lib/sass/tree/while_node.rb
+- vendor/sass/lib/sass/tree/for_node.rb
 - vendor/sass/lib/sass/tree/directive_node.rb
+- vendor/sass/lib/sass/tree/rule_node.rb
 - vendor/sass/lib/sass/tree/each_node.rb
+- vendor/sass/lib/sass/tree/node.rb
+- vendor/sass/lib/sass/tree/mixin_node.rb
+- vendor/sass/lib/sass/tree/extend_node.rb
+- vendor/sass/lib/sass/tree/mixin_def_node.rb
+- vendor/sass/lib/sass/tree/visitors/perform.rb
+- vendor/sass/lib/sass/tree/visitors/to_css.rb
+- vendor/sass/lib/sass/tree/visitors/check_nesting.rb
+- vendor/sass/lib/sass/tree/visitors/cssize.rb
+- vendor/sass/lib/sass/tree/visitors/convert.rb
+- vendor/sass/lib/sass/tree/visitors/base.rb
 - vendor/sass/lib/sass/tree/comment_node.rb
-- vendor/sass/lib/sass/tree/media_node.rb
-- vendor/sass/lib/sass/tree/variable_node.rb
+- vendor/sass/lib/sass/tree/warn_node.rb
 - vendor/sass/lib/sass/tree/debug_node.rb
-- vendor/sass/lib/sass/tree/import_node.rb
-- vendor/sass/lib/sass/tree/while_node.rb
-- vendor/sass/lib/sass/tree/for_node.rb
+- vendor/sass/lib/sass/tree/prop_node.rb
+- vendor/sass/lib/sass/tree/variable_node.rb
+- vendor/sass/lib/sass/engine.rb
+- vendor/sass/lib/sass/plugin.rb
+- vendor/sass/lib/sass/root.rb
+- vendor/sass/lib/sass/importers.rb
+- vendor/sass/lib/sass/util/subset_map.rb
+- vendor/sass/lib/sass/scss.rb
+- vendor/sass/lib/sass/scss/static_parser.rb
+- vendor/sass/lib/sass/scss/parser.rb
 - vendor/sass/lib/sass/scss/sass_parser.rb
-- vendor/sass/lib/sass/scss/script_parser.rb
-- vendor/sass/lib/sass/scss/css_parser.rb
 - vendor/sass/lib/sass/scss/script_lexer.rb
 - vendor/sass/lib/sass/scss/rx.rb
-- vendor/sass/lib/sass/scss/parser.rb
-- vendor/sass/lib/sass/scss/static_parser.rb
+- vendor/sass/lib/sass/scss/script_parser.rb
+- vendor/sass/lib/sass/scss/css_parser.rb
+- vendor/sass/lib/sass/css.rb
+- vendor/sass/lib/sass/script.rb
+- vendor/sass/lib/sass/util.rb
+- vendor/sass/lib/sass/importers/filesystem.rb
+- vendor/sass/lib/sass/importers/base.rb
+- vendor/sass/lib/sass/script/color.rb
+- vendor/sass/lib/sass/script/variable.rb
+- vendor/sass/lib/sass/script/operation.rb
+- vendor/sass/lib/sass/script/funcall.rb
+- vendor/sass/lib/sass/script/literal.rb
+- vendor/sass/lib/sass/script/parser.rb
+- vendor/sass/lib/sass/script/functions.rb
+- vendor/sass/lib/sass/script/number.rb
+- vendor/sass/lib/sass/script/string_interpolation.rb
+- vendor/sass/lib/sass/script/interpolation.rb
+- vendor/sass/lib/sass/script/node.rb
+- vendor/sass/lib/sass/script/bool.rb
+- vendor/sass/lib/sass/script/unary_operation.rb
+- vendor/sass/lib/sass/script/lexer.rb
+- vendor/sass/lib/sass/script/list.rb
+- vendor/sass/lib/sass/script/css_lexer.rb
+- vendor/sass/lib/sass/script/string.rb
+- vendor/sass/lib/sass/script/css_parser.rb
+- vendor/sass/lib/sass/selector.rb
 - vendor/sass/lib/sass/less.rb
-- vendor/sass/lib/sass/selector/simple_sequence.rb
+- vendor/sass/lib/sass/callbacks.rb
 - vendor/sass/lib/sass/selector/simple.rb
 - vendor/sass/lib/sass/selector/sequence.rb
 - vendor/sass/lib/sass/selector/abstract_sequence.rb
 - vendor/sass/lib/sass/selector/comma_sequence.rb
-- vendor/sass/lib/sass/root.rb
-- vendor/sass/lib/sass/importers/filesystem.rb
-- vendor/sass/lib/sass/importers/base.rb
-- vendor/sass/lib/sass/importers/rails.rb
-- vendor/sass/lib/sass/css.rb
-- vendor/sass/lib/sass/selector.rb
-- vendor/sass/lib/sass/engine.rb
-- vendor/sass/lib/sass/plugin.rb
-- vendor/sass/lib/sass/repl.rb
-- vendor/sass/lib/sass/scss.rb
+- vendor/sass/lib/sass/selector/simple_sequence.rb
+- vendor/sass/lib/sass/railtie.rb
+- vendor/sass/lib/sass/environment.rb
 - vendor/sass/lib/sass/exec.rb
-- vendor/sass/lib/sass/util.rb
-- vendor/sass/lib/sass/cache_stores.rb
-- vendor/sass/lib/sass/script.rb
-- vendor/sass/lib/sass.rb
-- vendor/sass/test/sass/plugin_test.rb
-- vendor/sass/test/sass/util/subset_map_test.rb
+- vendor/sass/TODO
+- vendor/sass/init.rb
+- vendor/sass/Rakefile
+- vendor/sass/MIT-LICENSE
+- vendor/sass/test/test_helper.rb
+- vendor/sass/test/sass/engine_test.rb
+- vendor/sass/test/sass/functions_test.rb
+- vendor/sass/test/sass/data/hsl-rgb.txt
+- vendor/sass/test/sass/extend_test.rb
+- vendor/sass/test/sass/css2sass_test.rb
 - vendor/sass/test/sass/templates/basic.sass
-- vendor/sass/test/sass/templates/line_numbers.sass
-- vendor/sass/test/sass/templates/nested_bork2.sass
-- vendor/sass/test/sass/templates/_imported_charset_utf8.sass
-- vendor/sass/test/sass/templates/mixin_bork.sass
-- vendor/sass/test/sass/templates/import_charset.sass
+- vendor/sass/test/sass/templates/mixins.sass
+- vendor/sass/test/sass/templates/options.sass
+- vendor/sass/test/sass/templates/scss_import.scss
+- vendor/sass/test/sass/templates/subdir/subdir.sass
+- vendor/sass/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- vendor/sass/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- vendor/sass/test/sass/templates/alt.sass
+- vendor/sass/test/sass/templates/nested_bork1.sass
+- vendor/sass/test/sass/templates/complex.sass
+- vendor/sass/test/sass/templates/units.sass
+- vendor/sass/test/sass/templates/nested_import.sass
+- vendor/sass/test/sass/templates/importee.sass
 - vendor/sass/test/sass/templates/importee.less
-- vendor/sass/test/sass/templates/warn.sass
-- vendor/sass/test/sass/templates/parent_ref.sass
-- vendor/sass/test/sass/templates/nested_bork3.sass
-- vendor/sass/test/sass/templates/script.sass
-- vendor/sass/test/sass/templates/import.sass
 - vendor/sass/test/sass/templates/scss_importee.scss
-- vendor/sass/test/sass/templates/bork1.sass
-- vendor/sass/test/sass/templates/compressed.sass
-- vendor/sass/test/sass/templates/importee.sass
-- vendor/sass/test/sass/templates/_partial.sass
-- vendor/sass/test/sass/templates/units.sass
-- vendor/sass/test/sass/templates/nested_bork1.sass
+- vendor/sass/test/sass/templates/line_numbers.sass
+- vendor/sass/test/sass/templates/expanded.sass
 - vendor/sass/test/sass/templates/bork3.sass
-- vendor/sass/test/sass/templates/nested_mixin_bork.sass
-- vendor/sass/test/sass/templates/complex.sass
+- vendor/sass/test/sass/templates/warn_imported.sass
 - vendor/sass/test/sass/templates/import_charset_ibm866.sass
-- vendor/sass/test/sass/templates/alt.sass
-- vendor/sass/test/sass/templates/scss_import.scss
+- vendor/sass/test/sass/templates/bork1.sass
+- vendor/sass/test/sass/templates/warn.sass
+- vendor/sass/test/sass/templates/bork2.sass
+- vendor/sass/test/sass/templates/nested.sass
 - vendor/sass/test/sass/templates/compact.sass
+- vendor/sass/test/sass/templates/multiline.sass
 - vendor/sass/test/sass/templates/_imported_charset_ibm866.sass
-- vendor/sass/test/sass/templates/nested.sass
-- vendor/sass/test/sass/templates/subdir/subdir.sass
-- vendor/sass/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- vendor/sass/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- vendor/sass/test/sass/templates/warn_imported.sass
-- vendor/sass/test/sass/templates/options.sass
+- vendor/sass/test/sass/templates/import_charset.sass
+- vendor/sass/test/sass/templates/parent_ref.sass
+- vendor/sass/test/sass/templates/import.sass
+- vendor/sass/test/sass/templates/nested_bork3.sass
+- vendor/sass/test/sass/templates/script.sass
 - vendor/sass/test/sass/templates/bork4.sass
+- vendor/sass/test/sass/templates/if.sass
+- vendor/sass/test/sass/templates/_partial.sass
+- vendor/sass/test/sass/templates/nested_mixin_bork.sass
 - vendor/sass/test/sass/templates/import_charset_1_8.sass
+- vendor/sass/test/sass/templates/nested_bork2.sass
+- vendor/sass/test/sass/templates/mixin_bork.sass
+- vendor/sass/test/sass/templates/compressed.sass
 - vendor/sass/test/sass/templates/nested_bork4.sass
-- vendor/sass/test/sass/templates/multiline.sass
-- vendor/sass/test/sass/templates/expanded.sass
-- vendor/sass/test/sass/templates/mixins.sass
-- vendor/sass/test/sass/templates/bork2.sass
-- vendor/sass/test/sass/script_conversion_test.rb
-- vendor/sass/test/sass/mock_importer.rb
-- vendor/sass/test/sass/test_helper.rb
-- vendor/sass/test/sass/functions_test.rb
-- vendor/sass/test/sass/util_test.rb
-- vendor/sass/test/sass/less_conversion_test.rb
-- vendor/sass/test/sass/more_results/more1.css
-- vendor/sass/test/sass/more_results/more1_with_line_comments.css
-- vendor/sass/test/sass/more_results/more_import.css
-- vendor/sass/test/sass/data/hsl-rgb.txt
-- vendor/sass/test/sass/scss/test_helper.rb
-- vendor/sass/test/sass/scss/css_test.rb
-- vendor/sass/test/sass/scss/rx_test.rb
-- vendor/sass/test/sass/scss/scss_test.rb
-- vendor/sass/test/sass/script_test.rb
-- vendor/sass/test/sass/importer_test.rb
-- vendor/sass/test/sass/cache_test.rb
+- vendor/sass/test/sass/templates/_imported_charset_utf8.sass
 - vendor/sass/test/sass/conversion_test.rb
-- vendor/sass/test/sass/more_templates/more1.sass
-- vendor/sass/test/sass/more_templates/_more_partial.sass
-- vendor/sass/test/sass/more_templates/more_import.sass
-- vendor/sass/test/sass/extend_test.rb
-- vendor/sass/test/sass/engine_test.rb
-- vendor/sass/test/sass/css2sass_test.rb
+- vendor/sass/test/sass/script_test.rb
+- vendor/sass/test/sass/util/subset_map_test.rb
 - vendor/sass/test/sass/callbacks_test.rb
-- vendor/sass/test/sass/results/units.css
-- vendor/sass/test/sass/results/alt.css
-- vendor/sass/test/sass/results/scss_importee.css
-- vendor/sass/test/sass/results/line_numbers.css
-- vendor/sass/test/sass/results/import_charset.css
+- vendor/sass/test/sass/importer_test.rb
+- vendor/sass/test/sass/scss/css_test.rb
+- vendor/sass/test/sass/scss/scss_test.rb
+- vendor/sass/test/sass/scss/rx_test.rb
+- vendor/sass/test/sass/scss/test_helper.rb
+- vendor/sass/test/sass/util_test.rb
+- vendor/sass/test/sass/results/mixins.css
+- vendor/sass/test/sass/results/warn_imported.css
 - vendor/sass/test/sass/results/expanded.css
-- vendor/sass/test/sass/results/warn.css
-- vendor/sass/test/sass/results/script.css
-- vendor/sass/test/sass/results/scss_import.css
-- vendor/sass/test/sass/results/nested.css
+- vendor/sass/test/sass/results/compact.css
+- vendor/sass/test/sass/results/compressed.css
+- vendor/sass/test/sass/results/scss_importee.css
+- vendor/sass/test/sass/results/basic.css
+- vendor/sass/test/sass/results/subdir/nested_subdir/nested_subdir.css
+- vendor/sass/test/sass/results/subdir/subdir.css
 - vendor/sass/test/sass/results/options.css
-- vendor/sass/test/sass/results/import_charset_1_8.css
+- vendor/sass/test/sass/results/scss_import.css
+- vendor/sass/test/sass/results/units.css
 - vendor/sass/test/sass/results/parent_ref.css
+- vendor/sass/test/sass/results/script.css
+- vendor/sass/test/sass/results/complex.css
+- vendor/sass/test/sass/results/import_charset.css
+- vendor/sass/test/sass/results/alt.css
+- vendor/sass/test/sass/results/if.css
 - vendor/sass/test/sass/results/multiline.css
+- vendor/sass/test/sass/results/import_charset_1_8.css
+- vendor/sass/test/sass/results/warn.css
 - vendor/sass/test/sass/results/import_charset_ibm866.css
-- vendor/sass/test/sass/results/subdir/subdir.css
-- vendor/sass/test/sass/results/subdir/nested_subdir/nested_subdir.css
-- vendor/sass/test/sass/results/warn_imported.css
-- vendor/sass/test/sass/results/compact.css
-- vendor/sass/test/sass/results/mixins.css
-- vendor/sass/test/sass/results/complex.css
-- vendor/sass/test/sass/results/compressed.css
 - vendor/sass/test/sass/results/import.css
-- vendor/sass/test/sass/results/basic.css
-- vendor/sass/test/test_helper.rb
-- vendor/sass/ext/extconf.rb
-- vendor/sass/sass.gemspec
-- vendor/sass/MIT-LICENSE
-- vendor/sass/yard/callbacks.rb
-- vendor/sass/yard/inherited_hash.rb
-- vendor/sass/yard/default/layout/html/footer.erb
-- vendor/sass/yard/default/fulldoc/html/css/common.sass
-- vendor/sass/Rakefile
-- vendor/sass/VERSION
-- vendor/sass/init.rb
-- vendor/sass/VERSION_NAME
+- vendor/sass/test/sass/results/nested.css
+- vendor/sass/test/sass/results/line_numbers.css
+- vendor/sass/test/sass/test_helper.rb
+- vendor/sass/test/sass/more_templates/_more_partial.sass
+- vendor/sass/test/sass/more_templates/more_import.sass
+- vendor/sass/test/sass/more_templates/more1.sass
+- vendor/sass/test/sass/script_conversion_test.rb
+- vendor/sass/test/sass/less_conversion_test.rb
+- vendor/sass/test/sass/more_results/more1.css
+- vendor/sass/test/sass/more_results/more1_with_line_comments.css
+- vendor/sass/test/sass/more_results/more_import.css
+- vendor/sass/test/sass/mock_importer.rb
+- vendor/sass/test/sass/cache_test.rb
+- vendor/sass/test/sass/plugin_test.rb
+- vendor/sass/doc-src/INDENTED_SYNTAX.md
 - vendor/sass/doc-src/FAQ.md
+- vendor/sass/doc-src/SCSS_FOR_SASS_USERS.md
 - vendor/sass/doc-src/SASS_REFERENCE.md
 - vendor/sass/doc-src/SASS_CHANGELOG.md
-- vendor/sass/doc-src/SCSS_FOR_SASS_USERS.md
-- vendor/sass/doc-src/INDENTED_SYNTAX.md
+- vendor/sass/bin/sass-convert
+- vendor/sass/bin/scss
+- vendor/sass/bin/sass
+- vendor/sass/VERSION
+- vendor/sass/CONTRIBUTING
 - vendor/sass/extra/update_watch.rb
 - vendor/sass/rails/init.rb
-- vendor/sass/README.md
-- vendor/sass/CONTRIBUTING
-- vendor/sass/vendor/fssm/lib/fssm.rb
-- vendor/sass/vendor/fssm/lib/fssm/path.rb
-- vendor/sass/vendor/fssm/lib/fssm/tree.rb
-- vendor/sass/vendor/fssm/lib/fssm/monitor.rb
-- vendor/sass/vendor/fssm/lib/fssm/support.rb
+- vendor/sass/sass.gemspec
+- vendor/sass/vendor/fssm/README.markdown
+- vendor/sass/vendor/fssm/example.rb
 - vendor/sass/vendor/fssm/lib/fssm/pathname.rb
 - vendor/sass/vendor/fssm/lib/fssm/state/file.rb
 - vendor/sass/vendor/fssm/lib/fssm/state/directory.rb
-- vendor/sass/vendor/fssm/lib/fssm/backends/fsevents.rb
+- vendor/sass/vendor/fssm/lib/fssm/monitor.rb
+- vendor/sass/vendor/fssm/lib/fssm/tree.rb
+- vendor/sass/vendor/fssm/lib/fssm/support.rb
+- vendor/sass/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
 - vendor/sass/vendor/fssm/lib/fssm/backends/polling.rb
 - vendor/sass/vendor/fssm/lib/fssm/backends/inotify.rb
-- vendor/sass/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
-- vendor/sass/vendor/fssm/example.rb
-- vendor/sass/vendor/fssm/LICENSE
-- vendor/sass/vendor/fssm/README.markdown
-- vendor/sass/vendor/fssm/Rakefile
-- vendor/sass/vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/sass/vendor/fssm/profile/prof-pathname.rb
+- vendor/sass/vendor/fssm/lib/fssm/backends/fsevents.rb
+- vendor/sass/vendor/fssm/lib/fssm/path.rb
+- vendor/sass/vendor/fssm/lib/fssm.rb
 - vendor/sass/vendor/fssm/profile/prof-plain-pathname.html
-- vendor/sass/vendor/fssm/profile/prof-cache.rb
+- vendor/sass/vendor/fssm/profile/prof-pathname.rb
 - vendor/sass/vendor/fssm/profile/prof.html
+- vendor/sass/vendor/fssm/profile/prof-cache.rb
+- vendor/sass/vendor/fssm/profile/prof-fssm-pathname.html
 - vendor/sass/vendor/fssm/fssm.gemspec
+- vendor/sass/vendor/fssm/Rakefile
 - vendor/sass/vendor/fssm/VERSION.yml
-- vendor/sass/vendor/fssm/spec/spec_helper.rb
+- vendor/sass/vendor/fssm/LICENSE
 - vendor/sass/vendor/fssm/spec/path_spec.rb
-- vendor/sass/vendor/fssm/spec/root/duck/quack.txt
 - vendor/sass/vendor/fssm/spec/root/moo/cow.txt
-- vendor/sass/vendor/fssm/spec/root/file.rb
-- vendor/sass/vendor/fssm/spec/root/file.css
 - vendor/sass/vendor/fssm/spec/root/file.yml
-- vendor/sass/TODO
-- vendor/sass/bin/sass
-- vendor/sass/bin/sass-convert
-- vendor/sass/bin/css2sass
+- vendor/sass/vendor/fssm/spec/root/file.css
+- vendor/sass/vendor/fssm/spec/root/file.rb
+- vendor/sass/vendor/fssm/spec/root/duck/quack.txt
+- vendor/sass/vendor/fssm/spec/spec_helper.rb
 - Rakefile
 - init.rb
 - .yardopts
-- MIT-LICENSE
+- README.md
+- VERSION_NAME
 - REVISION
+- MIT-LICENSE
 - VERSION
-- VERSION_NAME
-- README.md
 - CONTRIBUTING
-has_rdoc: true
+has_rdoc: false
 homepage: http://haml-lang.com/
 licenses: []
 
@@ -436,10 +446,10 @@ signing_key:
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine.
 test_files: 
-- test/haml/template_test.rb
+- test/haml/engine_test.rb
 - test/haml/html2haml_test.rb
-- test/haml/spec_test.rb
-- test/haml/helper_test.rb
+- test/haml/template_test.rb
 - test/haml/util_test.rb
-- test/haml/engine_test.rb
+- test/haml/helper_test.rb
+- test/haml/spec_test.rb
 - test/haml/spec/ruby_haml_test.rb