haml 1.8.0 → 2.0.3

data/test/sass/engine_test.rb

@@ -1,57 +1,79 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/sass'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 class SassEngineTest < Test::Unit::TestCase
+  # A map of erroneous Sass documents to the error messages they should produce.
+  # The error messages may be arrays;
+  # 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 = 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" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
-    "a\n :b c" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
-    "a\n    :b c" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
+    "!" => '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\n  :b c" => "Base-level rules cannot contain the parent-selector-referencing character '&'",
+    "!a = 1b + 2c" => "Incompatible units: b and c.",
+    "& 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," => "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.",
-    "@import foo.sass" => "File to import not found or unreadable: foo.sass",
+    "@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 = bar baz !" => "Unterminated constant.",
     "!foo = !(foo)" => "Invalid constant.",
+    "=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.",
+    "=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],
+
+    # Regression tests
+    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 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 test_basic_render
     renders_correctly "basic", { :style => :compact }
   end
 
+  def test_multiple_calls_to_render
+    sass = Sass::Engine.new("a\n  b: c")
+    assert_equal sass.render, sass.render
+  end
+
   def test_alternate_styles
     renders_correctly "expanded", { :style => :expanded }
     renders_correctly "compact", { :style => :compact }
@@ -64,8 +86,10 @@ class SassEngineTest < Test::Unit::TestCase
       begin
         Sass::Engine.new(key).render
       rescue Sass::SyntaxError => err
-        assert_equal(value, err.message)
-        assert(err.sass_line, "Line: #{key}")
+        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}")
       else
         assert(false, "Exception not raised for\n#{key}")
@@ -98,16 +122,27 @@ class SassEngineTest < Test::Unit::TestCase
     end
   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"))
+  end
+
+  def test_sass_import
+    renders_correctly "import", { :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"] }
+  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("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar = url()\n"));
   end
 
-  def test_multiline_selector
+  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"))
     assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
                  render("#foo\n  #bar,\n  #baz\n    :foo bar"))
+    assert_equal("#foo,\n#bar {\n  foo: bar; }\n  #foo #baz,\n  #bar #baz {\n    foo: bar; }\n",
+                 render("#foo,\n#bar\n  :foo bar\n  #baz\n    :foo bar"))
     assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
                  render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
                  
@@ -115,6 +150,10 @@ class SassEngineTest < Test::Unit::TestCase
                  render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
   end
 
+  def test_complex_multiline_selector
+    renders_correctly "multiline"
+  end
+
   def test_colon_only
     begin
       render("a\n  b: c", :attribute_syntax => :normal)
@@ -204,7 +243,26 @@ END
     assert_equal(":focus {\n  a: b; }\n", render("\\:focus\n  a: b"))
     assert_equal("a {\n  b: c; }\n  a :focus {\n    d: e; }\n", render("\\a\n  b: c\n  \\:focus\n    d: e"))
   end
+
+  def test_cr_newline
+    assert_equal("foo {\n  a: b;\n  c: d;\n  e: f; }\n", render("foo\r  a: b\r\n  c: d\n\r  e: f"))
+  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"))
+  end
   
+  def test_mixins
+    renders_correctly "mixins", { :style => :expanded }
+  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 render(sass, options = {})

data/test/sass/plugin_test.rb

@@ -3,13 +3,9 @@
 MERB_ENV = RAILS_ENV  = 'testing'
 RAILS_ROOT = '.'
 
-require 'test/unit'
-require 'fileutils'
-require File.dirname(__FILE__) + '/../../lib/sass'
-require 'rubygems'
-
-require 'action_controller'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
+require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{
@@ -58,7 +54,7 @@ class SassPluginTest < Test::Unit::TestCase
     File.delete(tempfile_loc('bork'))
     Sass::Plugin.update_stylesheets
     File.open(tempfile_loc('bork')) do |file|
-      assert_equal("/*\nSass::SyntaxError: Undefined constant: \"!bork\"\non line 2 of #{File.dirname(__FILE__) + '/templates/bork.sass'}\n\n1: bork\n2:   :bork= !bork", file.read.split("\n")[0...6].join("\n"))
+      assert_equal("/*\nSass::SyntaxError: Undefined constant: \"!bork\".\non line 2 of #{File.dirname(__FILE__) + '/templates/bork.sass'}\n\n1: bork\n2:   :bork= !bork", file.read.split("\n")[0...6].join("\n"))
     end
     File.delete(tempfile_loc('bork'))
   end
@@ -155,5 +151,6 @@ class Sass::Engine
 end
 
 class ActionController::Base
+  undef :sass_old_process
   def sass_old_process(*args); end
 end

data/test/sass/results/constants.css

@@ -12,3 +12,5 @@
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
 #const { escaped-quote: !foo; escaped-slash: !foo; default: Hello! !important; }
+
+#regression { a: 4; }

data/test/sass/results/import.css

@@ -1,4 +1,4 @@
-imported { otherconst: hello; myconst: goodbye; }
+imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
 
@@ -26,4 +26,4 @@ body { font: Arial; background: blue; }
 @import url(../results/complex.css);
 #foo { background-color: #baf; }
 
-nonimported { myconst: hello; otherconst: goodbye; }
+nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/mixins.css

@@ -0,0 +1,95 @@
+#main {
+  width: 15em;
+  color: #0000ff;
+}
+#main p {
+  border-top-width: 2px;
+  border-top-color: #ffcc00;
+  border-left-width: 1px;
+  border-left-color: #000;
+  -moz-border-radius: 10px;
+  border-style: dotted;
+  border-width: 2px;
+}
+#main .cool {
+  width: 100px;
+}
+
+#left {
+  border-top-width: 2px;
+  border-top-color: #ffcc00;
+  border-left-width: 1px;
+  border-left-color: #000;
+  -moz-border-radius: 10px;
+  font-size: 2em;
+  font-weight: bold;
+  float: left;
+}
+
+#right {
+  border-top-width: 2px;
+  border-top-color: #ffcc00;
+  border-left-width: 1px;
+  border-left-color: #000;
+  -moz-border-radius: 10px;
+  color: #f00;
+  font-size: 20px;
+  float: right;
+}
+
+.bordered {
+  border-top-width: 2px;
+  border-top-color: #ffcc00;
+  border-left-width: 1px;
+  border-left-color: #000;
+  -moz-border-radius: 10px;
+}
+
+.complex {
+  color: #f00;
+  font-size: 20px;
+  text-decoration: none;
+}
+.complex:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+* html .complex {
+  height: 1px;
+  color: #f00;
+  font-size: 20px;
+}
+
+.more-complex {
+  color: #f00;
+  font-size: 20px;
+  text-decoration: none;
+  display: inline;
+  -webkit-nonsense-top-right: 1px;
+  -webkit-nonsense-bottom-left: 1px;
+}
+.more-complex:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+* html .more-complex {
+  height: 1px;
+  color: #f00;
+  font-size: 20px;
+}
+.more-complex a:hover {
+  text-decoration: underline;
+  color: #f00;
+  font-size: 20px;
+  border-top-width: 2px;
+  border-top-color: #ffcc00;
+  border-left-width: 1px;
+  border-left-color: #000;
+  -moz-border-radius: 10px;
+}

data/test/sass/results/multiline.css

@@ -0,0 +1,24 @@
+#main,
+#header {
+  height: 50px; }
+  #main div,
+  #header div {
+    width: 100px; }
+    #main div a span,
+    #main div em span,
+    #header div a span,
+    #header div em span {
+      color: pink; }
+
+#one div.nested,
+#one span.nested,
+#one p.nested,
+#two div.nested,
+#two span.nested,
+#two p.nested,
+#three div.nested,
+#three span.nested,
+#three p.nested {
+  font-weight: bold;
+  border-color: red;
+  display: block; }

data/test/sass/templates/constants.sass

@@ -95,3 +95,6 @@
     :quote = "!foo"
     :slash = \!foo
   :default = !str !important
+
+#regression
+  :a= (3 + 2) - 1

data/test/sass/templates/import.sass

@@ -1,8 +1,11 @@
 !preconst = hello
 
+=premixin
+  pre-mixin: here
+
 @import importee, basic, basic.css, ../results/complex.css, partial
 
 nonimported
   :myconst = !preconst
   :otherconst = !postconst
-
+  +postmixin

data/test/sass/templates/importee.sass

@@ -1,8 +1,12 @@
 !postconst = goodbye
 
+=postmixin
+  post-mixin: here
+
 imported
   :otherconst = !preconst
   :myconst = !postconst
+  +premixin
 
 @import basic
 

data/test/sass/templates/mixins.sass

@@ -0,0 +1,76 @@
+!yellow = #fc0
+
+=bordered
+  :border
+    :top
+      :width 2px
+      :color = !yellow
+    :left
+      :width 1px
+      :color #000
+  -moz-border-radius: 10px
+
+=header-font
+  :color #f00
+  :font
+    :size 20px
+
+=compound
+  +header-font
+  +bordered
+
+=complex
+  +header-font
+  text:
+    decoration: none
+  &:after
+    content: "."
+    display: block
+    height: 0
+    clear: both
+    visibility: hidden
+  * html &
+    height: 1px
+    +header-font
+=deep
+  a:hover
+    :text-decoration underline
+    +compound
+
+
+#main
+  :width 15em
+  :color #0000ff
+  p
+    +bordered
+    :border
+      :style dotted
+      :width 2px
+  .cool
+    :width 100px
+
+#left
+  +bordered
+  :font
+    :size 2em
+    :weight bold
+  :float left
+
+#right
+  +bordered
+  +header-font
+  :float right
+
+.bordered
+  +bordered
+
+.complex
+  +complex
+
+.more-complex
+  +complex
+  +deep
+  display: inline
+  -webkit-nonsense:
+    top-right: 1px
+    bottom-left: 1px

data/test/sass/templates/multiline.sass

@@ -0,0 +1,20 @@
+#main,
+#header
+  height: 50px
+  div
+    width: 100px
+    a,
+    em
+      span
+        color: pink
+
+#one,
+#two,
+#three
+  div.nested,
+  span.nested,
+  p.nested
+    :font
+      :weight bold
+    :border-color red
+    :display block

data/test/test_helper.rb

@@ -0,0 +1,18 @@
+lib_dir = File.dirname(__FILE__) + '/../lib'
+# allows testing with edge Rails by creating a test/rails symlink
+linked_rails = File.dirname(__FILE__) + '/rails'
+
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
+  puts "[ using linked Rails ]"
+  $:.unshift linked_rails + '/activesupport/lib'
+  $:.unshift linked_rails + '/actionpack/lib'
+else
+  require 'rubygems'
+end
+require 'action_controller'
+require 'action_view'
+
+require 'test/unit'
+$:.unshift lib_dir unless $:.include?(lib_dir)
+require 'haml'
+require 'sass'