RubyGems - haml - Versions diffs - 2.0.10 → 2.2.0 - Mend

haml 2.0.10 → 2.2.0

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (107) hide show

data/.yardopts +5 -0
data/MIT-LICENSE +1 -1
data/README.md +347 -0
data/Rakefile +124 -19
data/VERSION +1 -1
data/VERSION_NAME +1 -0
data/extra/haml-mode.el +397 -78
data/extra/sass-mode.el +148 -36
data/extra/update_watch.rb +13 -0
data/lib/haml.rb +15 -993
data/lib/haml/buffer.rb +131 -84
data/lib/haml/engine.rb +129 -97
data/lib/haml/error.rb +7 -7
data/lib/haml/exec.rb +127 -42
data/lib/haml/filters.rb +107 -42
data/lib/haml/helpers.rb +210 -156
data/lib/haml/helpers/action_view_extensions.rb +34 -39
data/lib/haml/helpers/action_view_mods.rb +132 -139
data/lib/haml/html.rb +77 -65
data/lib/haml/precompiler.rb +404 -213
data/lib/haml/shared.rb +78 -0
data/lib/haml/template.rb +14 -14
data/lib/haml/template/patch.rb +2 -2
data/lib/haml/template/plugin.rb +2 -3
data/lib/haml/util.rb +211 -6
data/lib/haml/version.rb +30 -13
data/lib/sass.rb +7 -856
data/lib/sass/css.rb +169 -161
data/lib/sass/engine.rb +344 -328
data/lib/sass/environment.rb +79 -0
data/lib/sass/error.rb +33 -11
data/lib/sass/files.rb +139 -0
data/lib/sass/plugin.rb +160 -117
data/lib/sass/plugin/merb.rb +7 -6
data/lib/sass/plugin/rails.rb +5 -6
data/lib/sass/repl.rb +58 -0
data/lib/sass/script.rb +59 -0
data/lib/sass/script/bool.rb +17 -0
data/lib/sass/script/color.rb +183 -0
data/lib/sass/script/funcall.rb +50 -0
data/lib/sass/script/functions.rb +198 -0
data/lib/sass/script/lexer.rb +178 -0
data/lib/sass/script/literal.rb +177 -0
data/lib/sass/script/node.rb +14 -0
data/lib/sass/script/number.rb +381 -0
data/lib/sass/script/operation.rb +45 -0
data/lib/sass/script/parser.rb +172 -0
data/lib/sass/script/string.rb +12 -0
data/lib/sass/script/unary_operation.rb +34 -0
data/lib/sass/script/variable.rb +31 -0
data/lib/sass/tree/comment_node.rb +73 -10
data/lib/sass/tree/debug_node.rb +30 -0
data/lib/sass/tree/directive_node.rb +42 -17
data/lib/sass/tree/file_node.rb +41 -0
data/lib/sass/tree/for_node.rb +48 -0
data/lib/sass/tree/if_node.rb +54 -0
data/lib/sass/tree/mixin_def_node.rb +29 -0
data/lib/sass/tree/mixin_node.rb +48 -0
data/lib/sass/tree/node.rb +214 -11
data/lib/sass/tree/prop_node.rb +109 -0
data/lib/sass/tree/rule_node.rb +178 -51
data/lib/sass/tree/variable_node.rb +34 -0
data/lib/sass/tree/while_node.rb +31 -0
data/test/haml/engine_test.rb +331 -36
data/test/haml/helper_test.rb +12 -1
data/test/haml/results/content_for_layout.xhtml +0 -3
data/test/haml/results/filters.xhtml +2 -0
data/test/haml/results/list.xhtml +1 -1
data/test/haml/template_test.rb +7 -2
data/test/haml/templates/content_for_layout.haml +0 -2
data/test/haml/templates/list.haml +1 -1
data/test/haml/util_test.rb +92 -0
data/test/sass/css2sass_test.rb +69 -24
data/test/sass/engine_test.rb +586 -64
data/test/sass/functions_test.rb +125 -0
data/test/sass/more_results/more1.css +9 -0
data/test/sass/more_results/more1_with_line_comments.css +26 -0
data/test/sass/more_results/more_import.css +29 -0
data/test/sass/more_templates/_more_partial.sass +2 -0
data/test/sass/more_templates/more1.sass +23 -0
data/test/sass/more_templates/more_import.sass +11 -0
data/test/sass/plugin_test.rb +81 -28
data/test/sass/results/line_numbers.css +49 -0
data/test/sass/results/{constants.css → script.css} +4 -4
data/test/sass/results/subdir/subdir.css +2 -0
data/test/sass/results/units.css +11 -0
data/test/sass/script_test.rb +258 -0
data/test/sass/templates/import.sass +1 -1
data/test/sass/templates/importee.sass +7 -2
data/test/sass/templates/line_numbers.sass +13 -0
data/test/sass/templates/{constants.sass → script.sass} +11 -10
data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +2 -0
data/test/sass/templates/subdir/subdir.sass +2 -2
data/test/sass/templates/units.sass +11 -0
data/test/test_helper.rb +14 -0
metadata +77 -19
data/FAQ +0 -138
data/README.rdoc +0 -319
data/lib/sass/constant.rb +0 -216
data/lib/sass/constant/color.rb +0 -101
data/lib/sass/constant/literal.rb +0 -54
data/lib/sass/constant/nil.rb +0 -9
data/lib/sass/constant/number.rb +0 -87
data/lib/sass/constant/operation.rb +0 -30
data/lib/sass/constant/string.rb +0 -22
data/lib/sass/tree/attr_node.rb +0 -57
data/lib/sass/tree/value_node.rb +0 -20

@@ -14,6 +14,12 @@ class HelperTest < Test::Unit::TestCase
   def setup
     @base = ActionView::Base.new
     @base.controller = ActionController::Base.new
+    if defined?(ActionController::Response)
+      # This is needed for >=3.0.0
+      @base.controller.response = ActionController::Response.new
+    end
     @base.instance_variable_set('@post', Post.new("Foo bar\nbaz"))
   end
@@ -61,7 +67,7 @@ class HelperTest < Test::Unit::TestCase
     begin
       ActionView::Base.new.render(:inline => "<%= flatten('Foo\\nBar') %>")
-    rescue NoMethodError
+    rescue NoMethodError, ActionView::TemplateError
       proper_behavior = true
     end
     assert(proper_behavior)
@@ -182,6 +188,11 @@ HAML
                  render("= find_and_preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
   end
+  def test_find_and_preserve_with_block_and_tags
+    assert_equal("<pre>Foo\nBar</pre>\nFoo\nBar\n",
+                 render("= find_and_preserve([]) do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
+  end
   def test_preserve_with_block
     assert_equal("<pre>Foo&#x000A;Bar</pre>&#x000A;Foo&#x000A;Bar\n",
                  render("= preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))

data/test/haml/results/content_for_layout.xhtml CHANGED

@@ -2,9 +2,6 @@
 <html>
   <head></head>
   <body>
-    <div id='content'>
-      Lorem ipsum dolor sit amet
-    </div>
     <div id='yieldy'>
       Lorem ipsum dolor sit amet
     </div>

data/test/haml/results/filters.xhtml CHANGED

@@ -1,6 +1,8 @@
 <style>
+  /* line 1 */
   p { border-style: dotted; border-width: 22px; border-color: #ff00ff; }
+  /* line 6 */
   h1 { font-weight: normal; }
 </style>
 TESTING HAHAHAHA!

data/test/haml/results/list.xhtml CHANGED

@@ -1,4 +1,4 @@
-! Not a Doctype !
+!Not a Doctype!
 <ul>
   <li>a</li>
   <li>b</li>

data/test/haml/template_test.rb CHANGED

@@ -35,6 +35,10 @@ class DummyController
   def self.controller_path
     ''
   end
+  def controller_path
+    ''
+  end
 end
 class TemplateTest < Test::Unit::TestCase
@@ -91,7 +95,8 @@ class TemplateTest < Test::Unit::TestCase
   end
   def assert_renders_correctly(name, &render_method)
-    if ActionPack::VERSION::MAJOR < 2 || ActionPack::VERSION::MINOR < 2
+    if ActionPack::VERSION::MAJOR < 2 ||
+        (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
       render_method ||= proc { |name| @base.render(name) }
     else
       render_method ||= proc { |name| @base.render(:file => name) }
@@ -135,7 +140,7 @@ class TemplateTest < Test::Unit::TestCase
   end
   def test_action_view_templates_render_correctly
-    @base.instance_variable_set("@content_for_layout", 'Lorem ipsum dolor sit amet')
+    @base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
     assert_renders_correctly 'content_for_layout'
   end

data/test/haml/templates/content_for_layout.haml CHANGED

@@ -2,8 +2,6 @@
 %html
   %head
   %body
-    #content
-      = @content_for_layout
     #yieldy
       = yield :layout
     #nosym

data/test/haml/templates/list.haml CHANGED

@@ -1,4 +1,4 @@
-! Not a Doctype !
+!Not a Doctype!
 %ul
   %li a
   %li b

data/test/haml/util_test.rb ADDED

@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../test_helper'
+require 'pathname'
+class UtilTest < Test::Unit::TestCase
+  include Haml::Util
+  def test_scope
+    assert(File.exist?(scope("Rakefile")))
+  end
+  def test_to_hash
+    assert_equal({
+        :foo => 1,
+        :bar => 2,
+        :baz => 3
+      }, to_hash([[:foo, 1], [:bar, 2], [:baz, 3]]))
+  end
+  def test_map_keys
+    assert_equal({
+        "foo" => 1,
+        "bar" => 2,
+        "baz" => 3
+      }, map_keys({:foo => 1, :bar => 2, :baz => 3}) {|k| k.to_s})
+  end
+  def test_map_vals
+    assert_equal({
+        :foo => "1",
+        :bar => "2",
+        :baz => "3"
+      }, map_vals({:foo => 1, :bar => 2, :baz => 3}) {|k| k.to_s})
+  end
+  def test_map_hash
+    assert_equal({
+        "foo" => "1",
+        "bar" => "2",
+        "baz" => "3"
+      }, map_hash({:foo => 1, :bar => 2, :baz => 3}) {|k, v| [k.to_s, v.to_s]})
+  end
+  def test_powerset
+    return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
+    assert_equal([[].to_set].to_set,
+      powerset([]))
+    assert_equal([[].to_set, [1].to_set].to_set,
+      powerset([1]))
+    assert_equal([[].to_set, [1].to_set, [2].to_set, [1, 2].to_set].to_set,
+      powerset([1, 2]))
+    assert_equal([[].to_set, [1].to_set, [2].to_set, [3].to_set,
+        [1, 2].to_set, [2, 3].to_set, [1, 3].to_set, [1, 2, 3].to_set].to_set,
+      powerset([1, 2, 3]))
+  end
+  def test_has
+    assert(has?(:instance_method, String, :chomp!))
+    assert(has?(:private_instance_method, Haml::Engine, :set_locals))
+  end
+  def test_enum_with_index
+    assert_equal(%w[foo0 bar1 baz2],
+      enum_with_index(%w[foo bar baz]).map {|s, i| "#{s}#{i}"})
+  end
+  def test_def_static_method
+    klass = Class.new
+    def_static_method(klass, :static_method, [:arg1, :arg2],
+      :sarg1, :sarg2, <<RUBY)
+      s = "Always " + arg1
+      s << " <% if sarg1 %>and<% else %>but never<% end %> " << arg2
+      <% if sarg2 %>
+        s << "."
+      <% end %>
+RUBY
+    c = klass.new
+    assert_equal("Always brush your teeth and comb your hair.",
+      c.send(static_method_name(:static_method, true, true),
+        "brush your teeth", "comb your hair"))
+    assert_equal("Always brush your teeth and comb your hair",
+      c.send(static_method_name(:static_method, true, false),
+        "brush your teeth", "comb your hair"))
+    assert_equal("Always brush your teeth but never play with fire.",
+      c.send(static_method_name(:static_method, false, true),
+        "brush your teeth", "play with fire"))
+    assert_equal("Always brush your teeth but never play with fire",
+      c.send(static_method_name(:static_method, false, false),
+        "brush your teeth", "play with fire"))
+  end
+end

data/test/sass/css2sass_test.rb CHANGED

@@ -11,27 +11,27 @@ h1 {
 CSS
     assert_equal(<<SASS, css2sass(css))
 h1
-  :color red
+  color: red
 SASS
-    assert_equal(<<SASS, css2sass(css, :alternate => true))
+    assert_equal(<<SASS, css2sass(css, :old => true))
 h1
-  color: red
+  :color red
 SASS
   end
   def test_nesting
     assert_equal(<<SASS, css2sass(<<CSS))
 li
-  :display none
+  display: none
   a
-    :text-decoration none
+    text-decoration: none
     span
-      :color yellow
+      color: yellow
     &:hover
-      :text-decoration underline
+      text-decoration: underline
 SASS
 li {
   display: none;
@@ -51,6 +51,28 @@ li a:hover {
 CSS
   end
+  def test_no_nesting_around_rules
+    assert_equal(<<SASS, css2sass(<<CSS))
+div .warning
+  color: #d21a19
+span .debug
+  cursor: crosshair
+div .debug
+  cursor: default
+SASS
+div .warning {
+  color: #d21a19; }
+span .debug {
+  cursor: crosshair;}
+div .debug {
+  cursor: default; }
+CSS
+  end
   def test_comments_multiline
     css = <<CSS
 /* comment */
@@ -82,24 +104,24 @@ span.turkey {
 CSS
     sass = <<SASS
 elephant.rawr
-  :rampages excessively
+  rampages: excessively
 span.turkey
-  :isdinner true
+  isdinner: true
 .turducken
-  :chimera not_really
+  chimera: not_really
 #overhere
-  :bored sorta
-  :better_than thread_pools
+  bored: sorta
+  better_than: thread_pools
 #one_more
-  :finally srsly
+  finally: srsly
 SASS
     assert_equal(css2sass(css), sass)
   end
@@ -108,7 +130,7 @@ SASS
     assert_equal(<<SASS, css2sass(<<CSS))
 li
   .one, .two
-    :color red
+    color: red
 SASS
 li .one {
   color: red;
@@ -120,16 +142,16 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 .one
-  :color green
+  color: green
 .two
-  :color green
-  :color red
+  color: green
+  color: red
 .three
-  :color red
+  color: red
 SASS
 .one, .two {
   color: green;
@@ -144,23 +166,23 @@ CSS
   def test_bad_formatting
     assert_equal(<<SASS, css2sass(<<CSS))
 hello
-  :parent true
+  parent: true
   there
-    :parent false
+    parent: false
   who
-    :hoo false
+    hoo: false
   why
-    :y true
+    y: true
   when
-    :wen nao
+    wen: nao
 down_here
-  :yeah true
+  yeah: true
 SASS
 hello {
   parent: true;
@@ -185,6 +207,29 @@ down_here { yeah: true; }
 CSS
   end
+  def test_comments_in_selectors
+    assert_equal(<<SASS, css2sass(<<CSS))
+.js
+  #location-navigation-form .form-submit, #business-listing-form .form-submit, #detailTabs ul, #detailsEnhanced #addTags, #locationSearchList, #moreHoods
+    display: none
+#navListLeft
+  display: none
+SASS
+.js #location-navigation-form .form-submit,
+.js #business-listing-form .form-submit,
+.js #detailTabs ul,
+/* .js #addReview, */
+/* .js #addTags, */
+.js #detailsEnhanced #addTags,
+.js #locationSearchList,
+.js #moreHoods,
+#navListLeft
+  { display: none; }
+CSS
+  end
   private
   def css2sass(string, opts={})

data/test/sass/engine_test.rb CHANGED

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
+require 'stringio'
 class SassEngineTest < Test::Unit::TestCase
   # A map of erroneous Sass documents to the error messages they should produce.
@@ -8,68 +9,104 @@ class SassEngineTest < Test::Unit::TestCase
   # if so, the second element should be the line number that should be reported for the error.
   # If this isn't provided, the tests will assume the line number should be the last line of the document.
   EXCEPTION_MAP = {
-    "!a = 1 + " => 'Constant arithmetic error: "1 +".',
-    "!a = 1 + 2 +" => 'Constant arithmetic error: "1 + 2 +".',
-    "!a = \"b" => 'Unterminated string: "\\"b".',
-    "!a = #aaa - a" => 'Undefined operation: "#aaaaaa minus a".',
-    "!a = #aaa / a" => 'Undefined operation: "#aaaaaa div a".',
-    "!a = #aaa * a" => 'Undefined operation: "#aaaaaa times a".',
-    "!a = #aaa % a" => 'Undefined operation: "#aaaaaa mod a".',
-    "!a = 1 - a" => 'Undefined operation: "1 minus a".',
-    "!a = 1 * a" => 'Undefined operation: "1 times a".',
-    "!a = 1 / a" => 'Undefined operation: "1 div a".',
-    "!a = 1 % a" => 'Undefined operation: "1 mod a".',
-    ":" => 'Invalid attribute: ":".',
-    ": a" => 'Invalid attribute: ": a".',
-    ":= a" => 'Invalid attribute: ":= a".',
-    "a\n  :b" => 'Invalid attribute: ":b ".',
-    "a\n  :b: c" => 'Invalid attribute: ":b: c".',
-    "a\n  :b:c d" => 'Invalid attribute: ":b:c d".',
-    "a\n  :b=c d" => 'Invalid attribute: ":b=c d".',
-    "a\n  :b c;" => 'Invalid attribute: ":b c;" (This isn\'t CSS!).',
-    "a\n  b : c" => 'Invalid attribute: "b : c".',
-    "a\n  b=c: d" => 'Invalid attribute: "b=c: d".',
-    ":a" => 'Attributes aren\'t allowed at the root of a document.',
-    "!" => 'Invalid constant: "!".',
-    "!a" => 'Invalid constant: "!a".',
-    "! a" => 'Invalid constant: "! a".',
-    "!a b" => 'Invalid constant: "!a b".',
-    "a\n\t:b c" => <<END.strip,
-A tab character was used for indentation. Sass must be indented using two spaces.
-Are you sure you have soft tabs enabled in your editor?
-END
-    "a\n :b c" => "1 space was used for indentation. Sass must be indented using two spaces.",
-    "a\n    :b c" => "4 spaces were used for indentation. Sass must be indented using two spaces.",
-    "a\n  :b c\n  !d = 3" => "Constants may only be declared at the root of a document.",
-    "!a = 1b + 2c" => "Incompatible units: b and c.",
+    "!a = 1 + " => 'Expected expression, was end of text.',
+    "!a = 1 + 2 +" => 'Expected expression, was end of text.',
+    "!a = 1 + 2 + %" => 'Expected expression, was mod token.',
+    "!a = foo(\"bar\"" => 'Expected rparen token, was end of text.',
+    "!a = 1 }" => 'Unexpected end_interpolation token.',
+    "!a = 1 }foo\"" => 'Unexpected end_interpolation token.',
+    ":" => '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: 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".',
+    "a\n  :b c;" => 'Invalid property: ":b c;" (no ";" required at end-of-line).',
+    "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.',
+    "!" => 'Invalid variable: "!".',
+    "!a" => 'Invalid variable: "!a".',
+    "! a" => 'Invalid variable: "! a".',
+    "!a b" => 'Invalid variable: "!a b".',
+    "!a = 1b + 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b < 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b > 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b <= 2c" => "Incompatible units: 'c' and 'b'.",
+    "!a = 1b >= 2c" => "Incompatible units: 'c' and 'b'.",
+    "a\n  :b= 1b * 2c" => "2b*c isn't a valid CSS value.",
+    "a\n  :b= 1b % 2c" => "Cannot modulo by a number with units: 2c.",
+    "!a = 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
+    "!a = #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
-    "a\n  :b\n    c" => "Illegal nesting: Only attributes may be nested beneath attributes.",
-    "a,\n  :b c" => "Rules can\'t end in commas.",
+    "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
+    "a,\n  :b c" => ["Rules can\'t end in commas.", 1],
     "a," => "Rules can\'t end in commas.",
-    "a,\n!b = c" => "Rules can\'t end in commas.",
-    "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath constants.",
+    "a,\n!b = 1" => ["Rules can\'t end in commas.", 1],
+    "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
     "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",
-    "!foo = bar baz !" => "Unterminated constant.",
-    "!foo = !(foo)" => "Invalid constant.",
+    %Q{!foo = "bar" "baz" !} => %Q{Syntax error in '"bar" "baz" !' at character 20.},
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
-    ".bar\n  =foo\n    :color red\n" => "Mixins may only be defined at the root of a document.",
+    ".bar\n  =foo\n    :color red\n" => ["Mixins may only be defined at the root of a document.", 2],
     "=foo\n  :color red\n.bar\n  +foo\n    :color red" => "Illegal nesting: Nothing may be nested beneath mixin directives.",
     "    a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 1],
     " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
+    "a\n  b: c\n b: c" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],
+    "a\n  b: c\na\n b: c" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 4],
+    "a\n\t\tb: c\n\tb: c" => ["Inconsistent indentation: 1 tab was used for indentation, but the rest of the document was indented using 2 tabs.", 3],
+    "a\n  b: c\n   b: c" => ["Inconsistent indentation: 3 spaces were used for indentation, but the rest of the document was indented using 2 spaces.", 3],
+    "a\n  b: c\n  a\n   d: e" => ["Inconsistent indentation: 3 spaces were used for indentation, but the rest of the document was indented using 2 spaces.", 4],
+    "a\n  b: c\na\n    d: e" => ["The line was indented 2 levels deeper than the previous line.", 4],
+    "a\n  b: c\n  a\n        d: e" => ["The line was indented 3 levels deeper than the previous line.", 4],
+    "a\n \tb: c" => ["Indentation can't use both tabs and spaces.", 2],
+    "=a(" => 'Invalid mixin "a(".',
+    "=a(b)" => 'Mixin argument "b" must begin with an exclamation point (!).',
+    "=a(,)" => "Mixin arguments can't be empty.",
+    "=a(!)" => "Mixin arguments can't be empty.",
+    "=a(!foo bar)" => "Invalid variable \"!foo bar\".",
+    "=foo\n  bar: baz\n+foo" => ["Properties aren't allowed at the root of a document.", 2],
+    "a-\#{!b\n  c: d" => ["Expected end_interpolation token, was end of text.", 1],
+    "=a(!b = 1, !c)" => "Required arguments must not follow optional arguments \"!c\".",
+    "=a(!b = 1)\n  :a= !b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
+    "=a(!b)\n  :a= !b\ndiv\n  +a" => "Mixin a is missing parameter !b.",
+    "@else\n  a\n    b: c" => ["@else must come after @if.", 1],
+    "@if false\n@else foo" => "Invalid else directive '@else foo': expected 'if <expr>'.",
+    "@if false\n@else if " => "Invalid else directive '@else if': expected 'if <expr>'.",
+    "a\n  !b = 12\nc\n  d = !b" => 'Undefined variable: "!b".',
+    "=foo\n  !b = 12\nc\n  +foo\n  d = !b" => 'Undefined variable: "!b".',
+    '@for !a from "foo" to 1' => '"foo" is not an integer.',
+    '@for !a from 1 to "2"' => '"2" is not an integer.',
+    '@for !a from 1 to "foo"' => '"foo" is not an integer.',
+    '@for !a from 1 to 1.232323' => '1.232 is not an integer.',
+    '@for !a from 1px to 3em' => "Incompatible units: 'em' and 'px'.",
+    '@if' => "Invalid if directive '@if': expected expression.",
+    '@while' => "Invalid while directive '@while': expected expression.",
+    '@debug' => "Invalid debug directive '@debug': expected expression.",
     # Regression tests
-    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3],
+    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
   }
+  def teardown
+    clean_up_sassc
+  end
   def test_basic_render
     renders_correctly "basic", { :style => :compact }
   end
+  def test_empty_render
+    assert_equal "", render("")
+  end
   def test_multiple_calls_to_render
     sass = Sass::Engine.new("a\n  b: c")
     assert_equal sass.render, sass.render
@@ -82,16 +119,25 @@ END
     renders_correctly "compressed", { :style => :compressed }
   end
+  def test_flexible_tabulation
+    assert_equal("p {\n  a: b; }\n  p q {\n    c: d; }\n",
+                 render("p\n a: b\n q\n  c: d\n"))
+    assert_equal("p {\n  a: b; }\n  p q {\n    c: d; }\n",
+                 render("p\n\ta: b\n\tq\n\t\tc: d\n"))
+  end
   def test_exceptions
     EXCEPTION_MAP.each do |key, value|
+      line = 10
       begin
-        Sass::Engine.new(key).render
+        Sass::Engine.new(key, :filename => __FILE__, :line => line).render
       rescue Sass::SyntaxError => err
         value = [value] unless value.is_a?(Array)
         assert_equal(value.first, err.message, "Line: #{key}")
-        assert_equal(value[1] || key.split("\n").length, err.sass_line, "Line: #{key}")
-        assert_match(/\(sass\):[0-9]+/, err.backtrace[0], "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}")
       else
         assert(false, "Exception not raised for\n#{key}")
       end
@@ -101,7 +147,7 @@ END
   def test_exception_line
     to_render = <<SASS
 rule
-  :attr val
+  :prop val
   // comment!
   :broken
@@ -115,9 +161,26 @@ SASS
     end
   end
+  def test_exception_location
+    to_render = <<SASS
+rule
+  :prop val
+  // comment!
+  :broken
+SASS
+    begin
+      Sass::Engine.new(to_render, :filename => __FILE__, :line => (__LINE__-7)).render
+    rescue Sass::SyntaxError => err
+      assert_equal(__FILE__, err.sass_filename)
+      assert_equal((__LINE__-6), err.sass_line)
+    else
+      assert(false, "Exception not raised for '#{to_render}'!")
+    end
+  end
   def test_imported_exception
-    [1, 2].each do |i|
-      i = nil if i == 1
+    [nil, 2].each do |i|
       begin
         Sass::Engine.new("@import bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -130,19 +193,44 @@ SASS
   end
   def test_css_import
-    assert_equal("@import url(./fonts.css) screen;", render("@import url(./fonts.css) screen"))
-    assert_equal("@import \"./fonts.css\" screen;", render("@import \"./fonts.css\" screen"))
+    assert_equal("@import url(./fonts.css) screen;\n", render("@import url(./fonts.css) screen"))
+    assert_equal("@import \"./fonts.css\" screen;\n", render("@import \"./fonts.css\" screen"))
   end
   def test_sass_import
+    assert !File.exists?(sassc_path("importee"))
     renders_correctly "import", { :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"] }
+    assert File.exists?(sassc_path("importee"))
+  end
+  def test_no_cache
+    assert !File.exists?(sassc_path("importee"))
+    renders_correctly("import", {
+        :style => :compact, :cache => false,
+        :load_paths => [File.dirname(__FILE__) + "/templates"],
+      })
+    assert !File.exists?(sassc_path("importee"))
+  end
+  def test_units
+    renders_correctly "units"
   end
   def test_default_function
-    assert_equal("foo {\n  bar: url(foo.png); }\n", render("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(foo.png); }\n", render(%Q{foo\n  bar = url("foo.png")\n}));
     assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar = url()\n"));
   end
+  def test_string_minus
+    assert_equal("foo {\n  bar: baz-boom-bat; }\n", render(%Q{foo\n  bar = "baz"-"boom"-"bat"}))
+    assert_equal("foo {\n  bar: -baz-boom; }\n", render(%Q{foo\n  bar = -"baz"-"boom"}))
+  end
+  def test_string_div
+    assert_equal("foo {\n  bar: baz/boom/bat; }\n", render(%Q{foo\n  bar = "baz"/"boom"/"bat"}))
+    assert_equal("foo {\n  bar: /baz/boom; }\n", render(%Q{foo\n  bar = /"baz"/"boom"}))
+  end
   def test_basic_multiline_selector
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
                  render("#foo #bar,\n#baz #boom\n  :foo bar"))
@@ -163,21 +251,21 @@ SASS
   def test_colon_only
     begin
-      render("a\n  b: c", :attribute_syntax => :normal)
+      render("a\n  b: c", :property_syntax => :old)
     rescue Sass::SyntaxError => e
-      assert_equal("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.",
+      assert_equal("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.",
                    e.message)
     else
-      assert(false, "SyntaxError not raised for :attribute_syntax => :normal")
+      assert(false, "SyntaxError not raised for :property_syntax => :old")
     end
     begin
-      render("a\n  :b c", :attribute_syntax => :alternate)
+      render("a\n  :b c", :property_syntax => :new)
     rescue Sass::SyntaxError => e
-      assert_equal("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.",
+      assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
                    e.message)
     else
-      assert(false, "SyntaxError not raised for :attribute_syntax => :alternate")
+      assert(false, "SyntaxError not raised for :property_syntax => :new")
     end
   end
@@ -192,7 +280,7 @@ SASS
   end
   def test_directive
-    assert_equal("@a b;", render("@a b"))
+    assert_equal("@a b;\n", render("@a b"))
     assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
     assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
@@ -252,6 +340,54 @@ END
     assert_equal("@a{b:c;#d{e:f}g:h}\n", render(to_render, :style => :compressed))
   end
+  def test_line_annotations
+    assert_equal(<<CSS, render(<<SASS, :line_comments => true, :style => :compact))
+/* line 2, test_line_annotations_inline.sass */
+foo bar { foo: bar; }
+/* line 5, test_line_annotations_inline.sass */
+foo baz { blip: blop; }
+/* line 9, test_line_annotations_inline.sass */
+floodle { flop: blop; }
+/* line 18, test_line_annotations_inline.sass */
+bup { mix: on; }
+/* line 15, test_line_annotations_inline.sass */
+bup mixin { moop: mup; }
+/* line 22, test_line_annotations_inline.sass */
+bip hop, skip hop { a: b; }
+CSS
+foo
+  bar
+    foo: bar
+  baz
+    blip: blop
+floodle
+  flop: blop
+=mxn
+  mix: on
+  mixin
+    moop: mup
+bup
+  +mxn
+bip, skip
+  hop
+    a: b
+SASS
+  end
+  def test_line_annotations_with_filename
+    renders_correctly "line_numbers", :line_comments => true, :load_paths => [File.dirname(__FILE__) + "/templates"]
+  end
   def test_empty_first_line
     assert_equal("#a {\n  b: c; }\n", render("#a\n\n  b: c"))
   end
@@ -266,8 +402,8 @@ END
   end
   def test_or_eq
-    assert_equal("foo {\n  a: b; }\n", render("!foo = b\n!foo ||= c\nfoo\n  a = !foo"))
-    assert_equal("foo {\n  a: b; }\n", render("!foo ||= b\nfoo\n  a = !foo"))
+    assert_equal("foo {\n  a: b; }\n", render(%Q{!foo = "b"\n!foo ||= "c"\nfoo\n  a = !foo}))
+    assert_equal("foo {\n  a: b; }\n", render(%Q{!foo ||= "b"\nfoo\n  a = !foo}))
   end
   def test_mixins
@@ -275,27 +411,413 @@ END
   end
   def test_mixins_dont_interfere_with_sibling_combinator
-    assert_equal("foo + bar {\n  a: b; }\n", render("foo\n  + bar\n    a: b"))
     assert_equal("foo + bar {\n  a: b; }\nfoo + baz {\n  c: d; }\n",
                  render("foo\n  +\n    bar\n      a: b\n    baz\n      c: d"))
   end
-  private
+  def test_mixin_args
+    assert_equal("blat {\n  baz: hi; }\n", render(<<SASS))
+=foo(!bar)
+  baz = !bar
+blat
+  +foo(\"hi\")
+SASS
+    assert_equal("blat {\n  baz: 3; }\n", render(<<SASS))
+=foo(!a, !b)
+  baz = !a + !b
+blat
+  +foo(1, 2)
+SASS
+    assert_equal("blat {\n  baz: 4;\n  baz: 3;\n  baz: 5;\n  bang: 3; }\n", render(<<SASS))
+=foo(!c = (6 + 4) / 2)
+  baz = !c
+!c = 3
+blat
+  +foo(!c + 1)
+  +foo((!c + 3)/2)
+  +foo
+  bang = !c
+SASS
+  end
+  def test_default_values_for_mixin_arguments
+    assert_equal("white {\n  color: white; }\n\nblack {\n  color: black; }\n", render(<<SASS))
+=foo(!a = #FFF)
+  :color= !a
+white
+  +foo
+black
+  +foo(#000)
+SASS
+    assert_equal(<<CSS, render(<<SASS))
+one {
+  color: white;
+  padding: 1px;
+  margin: 4px; }
+two {
+  color: white;
+  padding: 2px;
+  margin: 5px; }
+three {
+  color: white;
+  padding: 2px;
+  margin: 3px; }
+CSS
+!a = 5px
+=foo(!a, !b = 1px, !c = 3px + !b)
+  :color= !a
+  :padding= !b
+  :margin= !c
+one
+  +foo(#fff)
+two
+  +foo(#fff, 2px)
+three
+  +foo(#fff, 2px, 3px)
+SASS
+  end
+  def test_interpolation
+    assert_equal("a-1 {\n  b-2-3: c-3; }\n", render(<<SASS))
+!a = 1
+!b = 2
+!c = 3
+a-\#{!a}
+  b-\#{!b}-\#{!c}: c-\#{!a + !b}
+SASS
+  end
+  def test_if_directive
+    assert_equal("a {\n  b: 1; }\n", render(<<SASS))
+!var = true
+a
+  @if !var
+    b: 1
+  @if not !var
+    b: 2
+SASS
+  end
+  def test_for
+    assert_equal(<<CSS, render(<<SASS))
+a-0 {
+  2i: 0; }
+a-1 {
+  2i: 2; }
+a-2 {
+  2i: 4; }
+a-3 {
+  2i: 6; }
+b-1 {
+  j-1: 0; }
+b-2 {
+  j-1: 1; }
+b-3 {
+  j-1: 2; }
+b-4 {
+  j-1: 3; }
+CSS
+!a = 3
+@for !i from 0 to !a + 1
+  a-\#{!i}
+    2i = 2 * !i
+@for !j from 1 through 4
+  b-\#{!j}
+    j-1 = !j - 1
+SASS
+  end
+  def test_while
+    assert_equal(<<CSS, render(<<SASS))
+a-5 {
+  blooble: gloop; }
+a-4 {
+  blooble: gloop; }
+a-3 {
+  blooble: gloop; }
+a-2 {
+  blooble: gloop; }
+a-1 {
+  blooble: gloop; }
+CSS
+!a = 5
+@while !a != 0
+  a-\#{!a}
+    blooble: gloop
+  !a = !a - 1
+SASS
+  end
+  def test_else
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  t1: t;
+  t2: t;
+  t3: t;
+  t4: t; }
+CSS
+a
+  @if true
+    t1: t
+  @else
+    f1: f
+  @if false
+    f2: f
+  @else
+    t2: t
+  @if false
+    f3: f1
+  @else if 1 + 1 == 3
+    f3: f2
+  @else
+    t3: t
+  @if false
+    f4: f1
+  @else if 1 + 1 == 2
+    t4: t
+  @else
+    f4: f2
+  @if false
+    f5: f1
+  @else if false
+    f5: f2
+SASS
+  end
+  def test_variable_reassignment
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 1;
+  c: 2; }
+CSS
+!a = 1
+a
+  b = !a
+  !a = 2
+  c = !a
+SASS
+  end
+  def test_variable_scope
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b-1: c;
+  b-2: c;
+  d: 12; }
+b {
+  d: 17; }
+CSS
+!i = 12
+a
+  @for !i from 1 through 2
+    b-\#{!i}: c
+  d = !i
+=foo
+  !i = 17
+b
+  +foo
+  d = !i
+SASS
+  end
+  def test_argument_error
+    assert_raise(Sass::SyntaxError) { render("a\n  b = hsl(1)") }
+  end
+  def test_comments_at_the_top_of_a_document
+    render(<<SASS)
+//
+  This is a comment that
+  continues to the second line.
+foo
+  bar: baz
+SASS
+  end
+  def test_loud_comments_containing_a_comment_close
+    actual_css = render(<<SASS)
+/*
+  This is a comment that
+  continues to the second line. */
+foo
+  bar: baz
+SASS
+assert_equal(<<CSS, actual_css)
+/* This is a comment that
+ * continues to the second line. */
+foo {
+  bar: baz; }
+CSS
+  end
+  def test_quoted_colon
+    assert_equal(<<CSS, render(<<SASS))
+a b[foo="bar: baz"] {
+  c: d; }
+CSS
+a
+  b[foo="bar: baz"]
+    c: d
+SASS
+  end
+  def test_quoted_comma
+    assert_equal(<<CSS, render(<<SASS))
+a b[foo="bar, baz"] {
+  c: d; }
+CSS
+a
+  b[foo="bar, baz"]
+    c: d
+SASS
+  end
+  def test_quoted_ampersand
+    assert_equal(<<CSS, render(<<SASS))
+a b[foo="bar & baz"] {
+  c: d; }
+CSS
+a
+  b[foo="bar & baz"]
+    c: d
+SASS
+  end
+  # Regression tests
+  def test_comment_beneath_prop
+    assert_equal(<<RESULT, render(<<SOURCE))
+.box {
+  border-style: solid; }
+RESULT
+.box
+  :border
+    //:color black
+    :style solid
+SOURCE
+    assert_equal(<<RESULT, render(<<SOURCE))
+.box {
+  /* :color black */
+  border-style: solid; }
+RESULT
+.box
+  :border
+    /*:color black
+    :style solid
+SOURCE
+    assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
+.box{border-style:solid}
+RESULT
+.box
+  :border
+    /*:color black
+    :style solid
+SOURCE
+  end
+  def test_compressed_comment_beneath_directive
+    assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
+@foo{a:b}
+RESULT
+@foo
+  a: b
+  /*b: c
+SOURCE
+  end
+  def test_comment_with_crazy_indentation
+    assert_equal(<<CSS, render(<<SASS))
+/* This is a loud comment:
+ *          Where the indentation is wonky. */
+.comment {
+  width: 1px; }
+CSS
+/*
+  This is a loud comment:
+           Where the indentation is wonky.
+//
+  This is a silent comment:
+           Where the indentation is wonky.
+.comment
+  width: 1px
+SASS
+  end
+  def test_plus_with_space
+    assert_equal(<<CSS, render(<<SASS))
+a + b {
+  color: green; }
+CSS
+a
+  + b
+    color: green
+SASS
+  end
+  def test_empty_line_comment
+    assert_equal(<<CSS, render(<<SASS))
+/* Foo
+ *
+ * Bar */
+CSS
+/*
+  Foo
+  Bar
+SASS
+  end
+  private
   def render(sass, options = {})
+    munge_filename options
     Sass::Engine.new(sass, options).render
   end
   def renders_correctly(name, options={})
     sass_file  = load_file(name, "sass")
     css_file   = load_file(name, "css")
+    options[:filename] ||= filename(name, "sass")
+    options[:css_filename] ||= filename(name, "css")
     css_result = Sass::Engine.new(sass_file, options).render
     assert_equal css_file, css_result
   end
   def load_file(name, type = "sass")
     @result = ''
-    File.new(File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}").each_line { |l| @result += l }
+    File.new(filename(name, type)).each_line { |l| @result += l }
     @result
   end
+  def filename(name, type)
+    File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+  end
+  def sassc_path(template)
+    sassc_path = File.join(File.dirname(__FILE__) + "/templates/#{template}.sass")
+    Sass::Files.send(:sassc_filename, sassc_path, Sass::Engine::DEFAULT_OPTIONS)
+  end
 end