sass 3.2.19 → 3.4.25

data/test/sass/templates/nested.sass

@@ -1,25 +1,25 @@
 #main
-  :width 15em
-  :color #0000ff
+  width: 15em
+  color: #0000ff
   p
-    :border
-      :style dotted
+    border:
+      style: dotted
       /* Nested comment
         More nested stuff
-      :width 2px
+      width: 2px
   .cool
-    :width 100px
+    width: 100px
 
 #left
-  :font
-    :size 2em
-    :weight bold
-  :float left
+  font:
+    size: 2em
+    weight: bold
+  float: left
 
 #right
   .header
-    :border-style solid
+    border-style: solid
   .body
-    :border-style dotted
+    border-style: dotted
   .footer
-    :border-style dashed
+    border-style: dashed

data/test/sass/templates/parent_ref.sass

@@ -1,25 +1,25 @@
 a
-  :color #000
+  color: #000
   &:hover
-    :color #f00
+    color: #f00
 
 p, div
-  :width 100em
+  width: 100em
   & foo
-    :width 10em
+    width: 10em
   &:hover, bar
-    :height 20em
+    height: 20em
 
 #cool
-  :border
-    :style solid
-    :width 2em
+  border:
+    style: solid
+    width: 2em
   .ie7 &, .ie6 &
-    :content string("Totally not cool.")
+    content: string("Totally not cool.")
   .firefox &
-    :content string("Quite cool.")
+    content: string("Quite cool.")
 
 .wow, .snazzy
-  :font-family fantasy
+  font-family: fantasy
   &:hover, &:visited
-    :font-weight bold
+    font-weight: bold

data/test/sass/templates/script.sass

@@ -14,88 +14,88 @@ $percent: 11%
 $complex: 1px/1em
 
 #main
-  :content $str
-  :qstr $qstr
-  :hstr $hstr
-  :width $width
-  :background-color #000
-  :color $main_text
-  :short-color #123
-  :named-color olive
-  :con "foo" bar ($space "boom")
-  :con2 "noquo" quo
+  content: $str
+  qstr: $qstr
+  hstr: $hstr
+  width: $width
+  background-color: #000
+  color: $main_text
+  short-color: #123
+  named-color: olive
+  con: "foo" bar ($space "boom")
+  con2: "noquo" quo
   #sidebar
-    :background-color $color
-    :num
-      :normal $num
-      :dec $dec
-      :dec0 $dec_0
-      :neg $neg
-    :esc $esc
-    :many 1 + 2 + 3
-    :order 1 + 2 * 3
-    :complex ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)*   4)
+    background-color: $color
+    num:
+      normal: $num
+      dec: $dec
+      dec0: $dec_0
+      neg: $neg
+    esc: $esc
+    many: 1 + 2 + 3
+    order: 1 + 2 * 3
+    complex: ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)*   4)
 
 #plus
-  :num
-    :num 5+2
-    :num-un 10em + 15em
-    :num-un2 10 + 13em
-    :num-neg 10 + -.13
-    :str 100 * 1px
-    :col 13 + #aaa
-    :perc $percent + 20%
-  :str
-    :str "hi" + "\ there"
-    :str2 "hi" + " there"
-    :col "14em solid " + #123
-    :num "times: " + 13
-  :col
-    :num #f02 + 123.5
-    :col #12A + #405162
+  num:
+    num: 5+2
+    num-un: 10em + 15em
+    num-un2: 10 + 13em
+    num-neg: 10 + -.13
+    str: 100 * 1px
+    col: 13 + #aaa
+    perc: $percent + 20%
+  str:
+    str: "hi" + "\ there"
+    str2: "hi" + " there"
+    col: "14em solid " + #123
+    num: "times: " + 13
+  col:
+    num: #f02 + 123.5
+    col: #12A + #405162
 
 #minus
-  :num
-    :num 912 - 12
-  :col
-    :num #fffffa - 5.2
-    :col #abcdef - #fedcba
-  :unary
-    :num -1
-    :const -$neg
-    :paren -(5 + 6)
-    :two --12
-    :many --------12
-    :crazy -----(5 + ---$neg)
+  num:
+    num: 912 - 12
+  col:
+    num: #fffffa - 5.2
+    col: #abcdef - #fedcba
+  unary:
+    num: -1
+    const: -$neg
+    paren: -(5 + 6)
+    two: --12
+    many: --------12
+    crazy: -----(5 + ---$neg)
 
 #times
-  :num
-    :num 2 * 3.5
-    :col 2 * #3a4b5c
-  :col
-    :num #12468a * 0.5
-    :col #121212 * #020304
+  num:
+    num: 2 * 3.5
+    col: 2 * #3a4b5c
+  col:
+    num: #12468a * 0.5
+    col: #121212 * #020304
     
 #div
-  :num
-    :num (10 / 3.0)
-    :num2 (10 / 3)
-  :col
-    :num #12468a / 2
-    :col #abcdef / #0f0f0f
-  :comp  $complex * 1em
+  num:
+    num: (10 / 3.0)
+    num2: (10 / 3)
+  col:
+    num: #12468a / 2
+    col: #abcdef / #0f0f0f
+  comp:  $complex * 1em
 
 #mod
-  :num
-    :num 17 % 3
-  :col
-    :col #5f6e7d % #10200a
-    :num #aaabac % 3
+  num:
+    num: 17 % 3
+  col:
+    col: #5f6e7d % #10200a
+    num: #aaabac % 3
 
 #const
-  :escaped
-    :quote \$foo \!bar
-  :default $str !important
+  escaped:
+    quote: \$foo \!bar
+  default: $str !important
 
 #regression
-  :a (3 + 2) - 1
+  a: (3 + 2) - 1

data/test/sass/templates/scss_import.scss

@@ -3,7 +3,8 @@ $preconst: hello;
 @mixin premixin {pre-mixin: here}
 
 @import "importee.sass", "scss_importee", "basic.sass", "basic.css", "../results/complex.css";
-@import "partial.sass";
+@import "part\
+ial.sass";
 
 nonimported {
   myconst: $preconst;

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

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

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

@@ -1,3 +1,3 @@
 #pi
-  :width 314px
-    
+  width: 314px
+    

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

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

data/test/sass/templates/units.sass

@@ -1,11 +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
+  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/sass/test_helper.rb

@@ -1,7 +1,7 @@
 test_dir = File.dirname(__FILE__)
 $:.unshift test_dir unless $:.include?(test_dir)
 
-class Test::Unit::TestCase
+class MiniTest::Test
   def absolutize(file)
     File.expand_path("#{File.dirname(__FILE__)}/#{file}")
   end

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
 unless Sass::Util.ruby1_8?
-  class MultibyteStringScannerTest < Test::Unit::TestCase
+  class MultibyteStringScannerTest < MiniTest::Test
     def setup
       @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
     end
@@ -140,8 +140,16 @@ unless Sass::Util.ruby1_8?
     def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
       assert_equal pos, @scanner.pos, 'pos'
       assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
-      assert_equal matched_size, @scanner.matched_size, 'matched_size'
-      assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
+      if matched_size.nil?
+        assert_nil @scanner.matched_size, 'matched_size'
+      else
+        assert_equal matched_size, @scanner.matched_size, 'matched_size'
+      end
+      if byte_matched_size.nil?
+        assert_nil @scanner.byte_matched_size, 'byte_matched_size'
+      else
+        assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
+      end
     end
   end
 end

data/test/sass/util/normalized_map_test.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'sass/util/normalized_map'
+
+class NormalizedMapTest < MiniTest::Test
+  extend PublicApiLinter
+
+  lint_api Hash, Sass::Util::NormalizedMap
+
+  def lint_instance
+    Sass::Util::NormalizedMap.new
+  end
+
+  def test_normalized_map_errors_unless_explicitly_implemented
+    assert Sass.tests_running
+    assert_raise_message(ArgumentError, "The method invert must be implemented explicitly") do
+      Sass::Util::NormalizedMap.new.invert
+    end
+  end
+
+  def test_normalized_map_does_not_error_when_released
+    Sass.tests_running = false
+    assert_equal({}, Sass::Util::NormalizedMap.new.invert)
+  ensure
+    Sass.tests_running = true
+  end
+
+  def test_basic_lifecycle
+    m = Sass::Util::NormalizedMap.new
+    m["a-b"] = 1
+    assert_equal ["a_b"], m.keys
+    assert_equal 1, m["a_b"]
+    assert_equal 1, m["a-b"]
+    assert m.has_key?("a_b")
+    assert m.has_key?("a-b")
+    assert_equal({"a-b" => 1}, m.as_stored)
+    assert_equal 1, m.delete("a-b")
+    assert !m.has_key?("a-b")
+    m["a_b"] = 2
+    assert_equal({"a_b" => 2}, m.as_stored)
+  end
+
+  def test_dup
+    m = Sass::Util::NormalizedMap.new
+    m["a-b"] = 1
+    m2 = m.dup
+    m.delete("a-b")
+    assert !m.has_key?("a-b")
+    assert m2.has_key?("a-b")
+  end
+end

data/test/sass/util/subset_map_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../test_helper'
 
-class SubsetMapTest < Test::Unit::TestCase
+class SubsetMapTest < MiniTest::Test
   def setup
     @ssm = Sass::Util::SubsetMap.new
     @ssm[Set[1, 2]] = "Foo"
@@ -44,7 +44,7 @@ class SubsetMapTest < Test::Unit::TestCase
   end
 
   def test_empty_key_set
-    assert_raise(ArgumentError) {@ssm[Set[]] = "Fail"}
+    assert_raises(ArgumentError) {@ssm[Set[]] = "Fail"}
   end
 
   def test_empty_key_get

data/test/sass/util_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 require 'tmpdir'
 
-class UtilTest < Test::Unit::TestCase
+class UtilTest < MiniTest::Test
   include Sass::Util
 
   def test_scope
@@ -42,6 +42,15 @@ class UtilTest < Test::Unit::TestCase
       }, map_hash({:foo => 1, :bar => 2, :baz => 3}) {|k, v| [k.to_s, v.to_s]})
   end
 
+  def test_map_hash_with_normalized_map
+    map = NormalizedMap.new("foo-bar" => 1, "baz_bang" => 2)
+    result = map_hash(map) {|k, v| [k, v.to_s]}
+    assert_equal("1", result["foo-bar"])
+    assert_equal("1", result["foo_bar"])
+    assert_equal("2", result["baz-bang"])
+    assert_equal("2", result["baz_bang"])
+  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,
@@ -70,6 +79,15 @@ class UtilTest < Test::Unit::TestCase
       merge_adjacent_strings([str, " ", str, " ", str, :bang, str, " ", str, 12]))
   end
 
+  def test_replace_subseq
+    assert_equal([1, 2, :a, :b, 5],
+      replace_subseq([1, 2, 3, 4, 5], [3, 4], [:a, :b]))
+    assert_equal([1, 2, 3, 4, 5],
+      replace_subseq([1, 2, 3, 4, 5], [3, 4, 6], [:a, :b]))
+    assert_equal([1, 2, 3, 4, 5],
+      replace_subseq([1, 2, 3, 4, 5], [4, 5, 6], [:a, :b]))
+  end
+
   def test_intersperse
     assert_equal(["foo", " ", "bar", " ", "baz"],
       intersperse(%w[foo bar baz], " "))
@@ -188,48 +206,11 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(98, ord("bar"))
   end
 
-  def test_flatten
-    assert_equal([1, 2, 3], flatten([1, 2, 3], 0))
-    assert_equal([1, 2, 3], flatten([1, 2, 3], 1))
-    assert_equal([1, 2, 3], flatten([1, 2, 3], 2))
-
-    assert_equal([[1, 2], 3], flatten([[1, 2], 3], 0))
-    assert_equal([1, 2, 3], flatten([[1, 2], 3], 1))
-    assert_equal([1, 2, 3], flatten([[1, 2], 3], 2))
-
-    assert_equal([[[1], 2], [3], 4], flatten([[[1], 2], [3], 4], 0))
-    assert_equal([[1], 2, 3, 4], flatten([[[1], 2], [3], 4], 1))
-    assert_equal([1, 2, 3, 4], flatten([[[1], 2], [3], 4], 2))
-  end
-
-  def test_set_hash
-    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[3, 2, 1]))
-    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[1, 2, 3]))
-
-    s1 = Set[]
-    s1 << 1
-    s1 << 2
-    s1 << 3
-    s2 = Set[]
-    s2 << 3
-    s2 << 2
-    s2 << 1
-    assert(set_hash(s1) == set_hash(s2))
-  end
-
-  def test_set_eql
-    assert(set_eql?(Set[1, 2, 3], Set[3, 2, 1]))
-    assert(set_eql?(Set[1, 2, 3], Set[1, 2, 3]))
-
-    s1 = Set[]
-    s1 << 1
-    s1 << 2
-    s1 << 3
-    s2 = Set[]
-    s2 << 3
-    s2 << 2
-    s2 << 1
-    assert(set_eql?(s1, s2))
+  def test_flatten_vertically
+    assert_equal([1, 2, 3], flatten_vertically([1, 2, 3]))
+    assert_equal([1, 3, 5, 2, 4, 6], flatten_vertically([[1, 2], [3, 4], [5, 6]]))
+    assert_equal([1, 2, 4, 3, 5, 6], flatten_vertically([1, [2, 3], [4, 5, 6]]))
+    assert_equal([1, 4, 6, 2, 5, 3], flatten_vertically([[1, 2, 3], [4, 5], 6]))
   end
 
   def test_extract_and_inject_values
@@ -255,10 +236,12 @@ class UtilTest < Test::Unit::TestCase
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
+    assert_equal(["C:/tmp/foo.rb", 12, nil], caller_info("C:/tmp/foo.rb:12"))
     assert_equal(["(sass)", 12, "blah"], caller_info("(sass):12: in `blah'"))
     assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
     assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
+    assert_equal(["C:/tmp/foo.rb", 12, "fizzle"], caller_info("C:/tmp/foo.rb:12: in `fizzle {}'"))
 
     info = nested_caller_info_fn
     assert_equal(__FILE__, info[0])
@@ -304,6 +287,15 @@ class UtilTest < Test::Unit::TestCase
     def foo
       Sass::Util.abstract(self)
     end
+    def old_method
+      Sass::Util.deprecated(self)
+    end
+    def old_method_with_custom_message
+      Sass::Util.deprecated(self, "Call FooBar#new_method instead.")
+    end
+    def self.another_old_method
+      Sass::Util.deprecated(self)
+    end
   end
 
   def test_abstract
@@ -311,6 +303,68 @@ class UtilTest < Test::Unit::TestCase
       "UtilTest::FooBar must implement #foo") {FooBar.new.foo}
   end
 
+  def test_deprecated
+    assert_warning("DEPRECATION WARNING: UtilTest::FooBar#old_method will be removed in a future version of Sass.") { FooBar.new.old_method }
+    assert_warning(<<WARNING) { FooBar.new.old_method_with_custom_message }
+DEPRECATION WARNING: UtilTest::FooBar#old_method_with_custom_message will be removed in a future version of Sass.
+Call FooBar#new_method instead.
+WARNING
+    assert_warning("DEPRECATION WARNING: UtilTest::FooBar.another_old_method will be removed in a future version of Sass.") { FooBar.another_old_method }
+  end
+
+  def test_json_escape_string
+    assert_json_string "", ""
+    alphanum = (("0".."9").to_a).concat(("a".."z").to_a).concat(("A".."Z").to_a).join
+    assert_json_string alphanum, alphanum
+    assert_json_string "'\"\\'", "'\\\"\\\\'"
+    assert_json_string "\b\f\n\r\t", "\\b\\f\\n\\r\\t"
+  end
+
+  def assert_json_string(source, target)
+    assert_equal target, json_escape_string(source)
+  end
+
+  def test_json_value_of
+    assert_json_value 0, "0"
+    assert_json_value(-42, "-42")
+    assert_json_value 42, "42"
+    assert_json_value true, "true"
+    assert_json_value false, "false"
+    assert_json_value "", "\"\""
+    assert_json_value "\"\"", "\"\\\"\\\"\""
+    assert_json_value "Multi\nLine\rString", "\"Multi\\nLine\\rString\""
+    assert_json_value [1, "some\nstr,ing", false, nil], "[1,\"some\\nstr,ing\",false,null]"
+  end
+
+  def assert_json_value(source, target)
+    assert_equal target, json_value_of(source)
+  end
+
+  def test_vlq
+    assert_equal "A", encode_vlq(0)
+    assert_equal "e", encode_vlq(15)
+    assert_equal "gB", encode_vlq(16)
+    assert_equal "wH", encode_vlq(120)
+  end
+
+  def assert_vlq_encodes(int, vlq)
+    vlq_from_decimal_array = decimal_array.map {|d| encode_vlq(d)}.join
+    decimal_array_from_vlq = decode_vlq(vlq)
+    assert_equal vlq, vlq_from_decimal_array
+    assert_equal decimal_array, decimal_array_from_vlq
+  end
+
+  def test_round_respects_precision
+    original_precision = Sass::Script::Value::Number.precision
+    assert_equal 0, Sass::Util.round(0.49999)
+    assert_equal 1, Sass::Util.round(0.499999)
+    Sass::Script::Value::Number.precision = 6
+    assert_equal 0, Sass::Util.round(0.499999)
+    assert_equal 1, Sass::Util.round(0.49999999)
+  ensure
+    Sass::Script::Value::Number.precision = original_precision
+  end
+
   def test_atomic_writes
     # when using normal writes, this test fails about 90% of the time.
     filename = File.join(Dir.tmpdir, "test_atomic")
@@ -341,6 +395,8 @@ class UtilTest < Test::Unit::TestCase
       end
       threads.each {|t| t.join}
     end
+  ensure
+    Sass::Util.retry_on_windows {File.delete filename if File.exist?(filename)}
   end
 
   def test_atomic_write_permissions