haml 2.0.10 → 2.2.0

data/test/sass/results/{constants.css → script.css}

@@ -1,5 +1,5 @@
-#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaa; short-color: #112233; named-color: #808000; con: foo bar 9 hi there boom; con2: noquo quo; }
-#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10+12; many: 6; order: 7; complex: #4c9db1hi16; }
+#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaa; short-color: #112233; named-color: olive; con: foo bar(9 hi there boom); con2: noquo quo; }
+#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 +12; many: 6; order: 7; complex: #4c9db1hi16; }
 
 #plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: hi there; str-str2: hi there; str-col: 14em solid #112233; str-num: times: 13; col-num: #ff7b9d; col-col: #5173ff; }
 
@@ -7,10 +7,10 @@
 
 #times { num-num: 7; num-col: #7496b8; col-num: #092345; col-col: #243648; }
 
-#div { num-num: 3.33333333333333; num-num2: 3; col-num: #092345; col-col: #0b0d0f; }
+#div { num-num: 3.333; num-num2: 3.333; col-num: #092345; col-col: #0b0d0f; comp: 1px; }
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
-#const { escaped-quote: !foo; escaped-slash: !foo; default: Hello! !important; }
+#const { escaped-quote: !foo; default: Hello! !important; }
 
 #regression { a: 4; }

data/test/sass/results/subdir/subdir.css

@@ -1 +1,3 @@
+#nested { relative: true; }
+
 #subdir { font-size: 20px; font-weight: bold; }

data/test/sass/results/units.css

@@ -0,0 +1,11 @@
+b {
+  foo: 5px;
+  bar: 24px;
+  baz: 66.667%;
+  many-units: 32em;
+  mm: 15mm;
+  pc: 2pc;
+  pt: -72pt;
+  inches: 2in;
+  more-inches: 3.5in;
+  mixed: 6px; }

data/test/sass/script_test.rb

@@ -0,0 +1,258 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/engine'
+
+class SassScriptTest < Test::Unit::TestCase
+  include Sass::Script
+
+  def test_color_checks_input
+    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([256, 2, 3])}
+  end
+
+  def test_string_escapes
+    assert_equal '"', resolve("\"\\\"\"")
+    assert_equal "\\", resolve("\"\\\\\"")
+    assert_equal "\\02fa", resolve("\"\\02fa\"")
+  end
+
+  def test_color_names
+    assert_equal "white", resolve("white")
+    assert_equal "white", resolve("#ffffff")
+    assert_equal "#fffffe", resolve("white - #000001")
+  end
+
+  def test_implicit_strings
+    silence_warnings do
+      assert_equal Sass::Script::String.new("foo"), eval("foo")
+      assert_equal Sass::Script::String.new("foo bar"), eval("foo bar")
+      assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
+    end
+  end
+
+  def test_interpolation
+    assert_equal "foo bar, baz bang", resolve('"foo #{"bar"}, #{"baz"} bang"')
+    assert_equal "foo bar baz bang", resolve('"foo #{"#{"ba" + "r"} baz"} bang"')
+    assert_equal 'foo #{bar baz} bang', resolve('"foo \#{#{"ba" + "r"} baz} bang"')
+    assert_equal 'foo #{baz bang', resolve('"foo #{"\#{" + "baz"} bang"')
+  end
+
+  def test_rule_interpolation
+    assert_equal(<<CSS, render(<<SASS))
+foo bar baz bang {
+  a: b; }
+CSS
+foo \#{"\#{"ba" + "r"} baz"} bang
+  a: b
+SASS
+    assert_equal(<<CSS, render(<<SASS))
+foo \#{bar baz} bang {
+  a: b; }
+CSS
+foo \\\#{\#{"ba" + "r"} baz} bang
+  a: b
+SASS
+    assert_equal(<<CSS, render(<<SASS))
+foo \#{baz bang {
+  a: b; }
+CSS
+foo \#{"\\\#{" + "baz"} bang
+  a: b
+SASS
+  end
+
+  def test_warning_reporting
+    assert_warning(<<WARN) {eval("foo")}
+DEPRECATION WARNING:
+On line 1, character 1 of 'test_warning_reporting_inline.sass'
+Implicit strings have been deprecated and will be removed in version 2.4.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+    assert_warning(<<WARN) {eval("1 + foo")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_warning_reporting_inline.sass'
+Implicit strings have been deprecated and will be removed in version 2.4.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+    assert_warning(<<WARN) {render("@if 1 + foo")}
+DEPRECATION WARNING:
+On line 1, character 9 of 'test_warning_reporting_inline.sass'
+Implicit strings have been deprecated and will be removed in version 2.4.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+
+    # Regression
+    assert_warning(<<WARN) {render("@if if")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_warning_reporting_inline.sass'
+Implicit strings have been deprecated and will be removed in version 2.4.
+'if' was not quoted. Please add double quotes (e.g. "if").
+WARN
+  end
+
+  def test_inaccessible_functions
+    assert_warning <<WARN do
+DEPRECATION WARNING:
+On line 2, character 6 of 'test_inaccessible_functions_inline.sass'
+Implicit strings have been deprecated and will be removed in version 2.4.
+'to_s' was not quoted. Please add double quotes (e.g. "to_s").
+WARN
+      assert_equal "send(to_s)", resolve("send(to_s)", :line => 2)
+    end
+    assert_equal "public_instance_methods()", resolve("public_instance_methods()")
+  end
+
+  def test_ruby_equality
+    assert_equal eval('"foo"'), eval('"foo"')
+    assert_equal eval('1'), eval('1.0')
+    assert_not_equal eval('1'), eval('"1"')
+  end
+
+  def test_booleans
+    assert_equal "true", resolve("true")
+    assert_equal "false", resolve("false")
+  end
+
+  def test_boolean_ops
+    assert_equal "true", resolve("true and true")
+    assert_equal "true", resolve("false or true")
+    assert_equal "true", resolve("true or false")
+    assert_equal "true", resolve("true or true")
+    assert_equal "false", resolve("false or false")
+    assert_equal "false", resolve("false and true")
+    assert_equal "false", resolve("true and false")
+    assert_equal "false", resolve("false and false")
+
+    assert_equal "true", resolve("not false")
+    assert_equal "false", resolve("not true")
+    assert_equal "true", resolve("not not true")
+
+    assert_equal "1", resolve("false or 1")
+    assert_equal "false", resolve("false and 1")
+    assert_equal "2", resolve("2 or 3")
+    assert_equal "3", resolve("2 and 3")
+  end
+
+  def test_arithmetic_ops
+    assert_equal "2", resolve("1 + 1")
+    assert_equal "0", resolve("1 - 1")
+    assert_equal "8", resolve("2 * 4")
+    assert_equal "0.5", resolve("2 / 4")
+    assert_equal "2", resolve("4 / 2")
+
+    assert_equal "-1", resolve("-1")
+  end
+
+  def test_string_ops
+    assert_equal "foo bar", resolve('"foo" "bar"')
+    assert_equal "true 1", resolve('true 1')
+    assert_equal "foo, bar", resolve('"foo" , "bar"')
+    assert_equal "true, 1", resolve('true , 1')
+    assert_equal "foobar", resolve('"foo" + "bar"')
+    assert_equal "true1", resolve('true + 1')
+    assert_equal "foo-bar", resolve('"foo" - "bar"')
+    assert_equal "true-1", resolve('true - 1')
+    assert_equal "foo/bar", resolve('"foo" / "bar"')
+    assert_equal "true/1", resolve('true / 1')
+
+    assert_equal "-bar", resolve('- "bar"')
+    assert_equal "-true", resolve('- true')
+    assert_equal "/bar", resolve('/ "bar"')
+    assert_equal "/true", resolve('/ true')
+  end
+
+  def test_relational_ops
+    assert_equal "false", resolve("1 > 2")
+    assert_equal "false", resolve("2 > 2")
+    assert_equal "true", resolve("3 > 2")
+    assert_equal "false", resolve("1 >= 2")
+    assert_equal "true", resolve("2 >= 2")
+    assert_equal "true", resolve("3 >= 2")
+    assert_equal "true", resolve("1 < 2")
+    assert_equal "false", resolve("2 < 2")
+    assert_equal "false", resolve("3 < 2")
+    assert_equal "true", resolve("1 <= 2")
+    assert_equal "true", resolve("2 <= 2")
+    assert_equal "false", resolve("3 <= 2")
+  end
+
+  def test_equals
+    assert_equal("true", resolve('"foo" == !foo', {},
+        env("foo" => Sass::Script::String.new("foo"))))
+    assert_equal "true", resolve("1 == 1.0")
+    assert_equal "true", resolve("false != true")
+    assert_equal "false", resolve("1em == 1px")
+    assert_equal "false", resolve("12 != 12")
+  end
+
+  def test_operation_precedence
+    assert_equal "false true", resolve("true and false false or true")
+    assert_equal "true", resolve("false and true or true and true")
+    assert_equal "true", resolve("1 == 2 or 3 == 3")
+    assert_equal "true", resolve("1 < 2 == 3 >= 3")
+    assert_equal "true", resolve("1 + 3 > 4 - 2")
+    assert_equal "11", resolve("1 + 2 * 3 + 4")
+  end
+
+  def test_functions
+    assert_equal "#80ff80", resolve("hsl(120, 100%, 75%)")
+    assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")
+  end
+
+  def test_operator_unit_conversion
+    assert_equal "1.1cm", resolve("1cm + 1mm")
+    assert_equal "true", resolve("2mm < 1cm")
+    assert_equal "true", resolve("10mm == 1cm")
+    assert_equal "true", resolve("1 == 1cm")
+    assert_equal "true", resolve("1.1cm == 11mm")
+  end
+
+  private
+
+  def resolve(str, opts = {}, environment = env)
+    munge_filename opts
+    eval(str, opts, environment).to_s
+  end
+
+  def eval(str, opts = {}, environment = env)
+    munge_filename opts
+    Sass::Script.parse(str, opts[:line] || 1,
+      opts[:offset] || 0, opts[:filename]).perform(environment)
+  end
+
+  def render(sass, options = {})
+    munge_filename options
+    Sass::Engine.new(sass, options).render
+  end
+
+  def assert_warning(message)
+    the_real_stderr, $stderr = $stderr, StringIO.new
+    yield
+    assert_equal message.strip, $stderr.string.strip
+  ensure
+    $stderr = the_real_stderr
+  end
+
+  def silence_warnings
+    the_real_stderr, $stderr = $stderr, StringIO.new
+    yield
+  ensure
+    $stderr = the_real_stderr
+  end
+
+  def env(hash = {})
+    env = Sass::Environment.new
+    hash.each {|k, v| env.set_var(k, v)}
+    env
+  end
+
+  def test_number_printing
+    assert_equal "1", eval("1")
+    assert_equal "1", eval("1.0")
+    assert_equal "1.121", eval("1.1214")
+    assert_equal "1.122", eval("1.1215")
+    assert_equal "Infinity", eval("1.0/0.0")
+    assert_equal "-Infinity", eval("-1.0/0.0")
+    assert_equal "NaN", eval("0.0/0.0")
+  end
+end

data/test/sass/templates/import.sass

@@ -1,4 +1,4 @@
-!preconst = hello
+!preconst = "hello"
 
 =premixin
   pre-mixin: here

data/test/sass/templates/importee.sass

@@ -1,4 +1,4 @@
-!postconst = goodbye
+!postconst = "goodbye"
 
 =postmixin
   post-mixin: here
@@ -11,4 +11,9 @@ imported
 @import basic
 
 midrule
-  :inthe middle
+  :inthe middle
+
+=crazymixin
+  foo: bar
+  baz
+    blat: bang

data/test/sass/templates/line_numbers.sass

@@ -0,0 +1,13 @@
+foo
+  bar: baz
+
+=premixin
+  squggle
+    blat: bang
+
+!preconst = 12
+
+@import importee
+
+umph
+  +crazymixin

data/test/sass/templates/{constants.sass → script.sass}

@@ -5,12 +5,13 @@
 !dec = 10.2
 !dec_0 = 99.0
 !neg = -10
-!esc= 10\+12
+!esc= 10"+12"
 !str= "Hello!"
 !qstr= "Quo\"ted\"!"
 !hstr= "Hyph-en!"
-!concat = (5 + 4) hi there
+!concat = "#{5 + 4} hi there"
 !percent= 11%
+!complex = 1px/1em
 
 #main
   :content = !str
@@ -21,8 +22,8 @@
   :color= !main_text
   :short-color= #123
   :named-color= olive
-  :con= foo bar (!concat boom)
-  :con2= noquo "quo"
+  :con= "foo" bar (!concat "boom")
+  :con2= "noquo" "quo"
   #sidebar
     :background-color= !color
     :num
@@ -33,7 +34,7 @@
     :esc= !esc
     :many= 1 + 2 + 3
     :order= 1 + 2 * 3
-    :complex= ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)*   4)
+    :complex= ((1 + 2) + 15)+#3a8b9f + ("hi"+(1 +1+ 2)*   4)
 
 #plus
   :num
@@ -41,14 +42,14 @@
     :num-un= 10em + 15em
     :num-un2= 10 + 13em
     :num-neg= 10 + -.13
-    :str= 100 + px
+    :str= 100 * 1px
     :col= 13 + #aaa
     :perc = !percent + 20%
   :str
-    :str= hi + \ there
-    :str2= hi + " there"
+    :str= "hi" + "\ there"
+    :str2= "hi" + " there"
     :col= "14em solid " + #123
-    :num= times:\  + 13
+    :num= "times: " + 13
   :col
     :num= #f02 + 123.5
     :col= #12A + #405162
@@ -82,6 +83,7 @@
   :col
     :num= #12468a / 2
     :col= #abcdef / #0f0f0f
+  :comp = !complex * 1em
 
 #mod
   :num
@@ -93,7 +95,6 @@
 #const
   :escaped
     :quote = "!foo"
-    :slash = \!foo
   :default = !str !important
 
 #regression

data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass

@@ -0,0 +1,2 @@
+#nested
+  :relative true

data/test/sass/templates/subdir/subdir.sass

@@ -1,6 +1,6 @@
+@import nested_subdir/nested_partial.sass
+
 #subdir
   :font
     :size 20px
     :weight bold
-    
-    

data/test/sass/templates/units.sass

@@ -0,0 +1,11 @@
+b
+  :foo= 0.5 * 10px
+  :bar= 10zzz * 12px / 5zzz
+  :baz= percentage(12.0px / 18px)
+  :many-units= 10.0zzz / 3yyy * 12px / 5zzz * 3yyy / 3px * 4em
+  :mm= 5mm + 1cm
+  :pc= 1pc + 12pt
+  :pt= 72pt - 2in
+  :inches= 1in + 2.54cm
+  :more-inches= 1in + ((72pt * 2in) + (36pt * 1in)) / 2.54cm
+  :mixed= (1 + (1em * 6px / 3in)) * 4in / 2em

data/test/test_helper.rb

@@ -2,6 +2,7 @@ lib_dir = File.dirname(__FILE__) + '/../lib'
 require File.dirname(__FILE__) + '/linked_rails'
 
 require 'test/unit'
+require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
@@ -11,3 +12,16 @@ unless defined? RAILS_ROOT
   RAILS_ROOT = '.'
   MERB_ENV = RAILS_ENV  = 'testing'
 end
+
+class Test::Unit::TestCase
+  def munge_filename(opts)
+    return if opts[:filename]
+    test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1')
+    opts[:filename] = "#{test_name}_inline.sass"
+  end
+
+  def clean_up_sassc
+    path = File.dirname(__FILE__) + "/../.sass-cache"
+    FileUtils.rm_r(path) if File.exist?(path)
+  end
+end