sass 3.1.0 → 3.3.0

data/test/sass/templates/_cached_import_option_partial.scss

@@ -0,0 +1 @@
+partial {value: whatever()}

data/test/sass/templates/_double_import_loop2.sass

@@ -0,0 +1 @@
+@import "double_import_loop1"

data/test/sass/templates/_filename_fn_import.scss

@@ -0,0 +1,11 @@
+@mixin imported-mixin {
+  imported-mixin: filename();
+}
+
+@function imported-function() {
+  @return filename();
+}
+
+filename {
+  imported: filename();
+}

data/test/sass/templates/_imported_content.sass

@@ -0,0 +1,3 @@
+@mixin foo
+  a
+    @content

data/test/sass/templates/_same_name_different_partiality.scss

@@ -0,0 +1 @@
+.foo {partial: yes}

data/test/sass/templates/bork5.sass

@@ -0,0 +1,3 @@
+bork
+  /* foo */
+  :bork $bork

data/test/sass/templates/cached_import_option.scss

@@ -0,0 +1,3 @@
+@import "cached_import_option_partial";
+
+main {value: whatever()}

data/test/sass/templates/double_import_loop1.sass

@@ -0,0 +1 @@
+@import "double_import_loop2"

data/test/sass/templates/filename_fn.scss

@@ -0,0 +1,18 @@
+@import "filename_fn_import";
+
+@mixin local-mixin {
+  local-mixin: filename();
+}
+
+@function local-function() {
+  @return filename();
+}
+
+filename {
+  local: filename();
+  @include local-mixin;
+  local-function: local-function();
+
+  @include imported-mixin;
+  imported-function: imported-function();
+}

data/test/sass/templates/import_charset.sass

@@ -1,6 +1,8 @@
 .foo
   a: b
 
+@import "foo.css"
+
 // Even though the imported file is in IBM866,
 // since the root file is in UTF-8/ASCII
 // the output will end up being UTF-8.

data/test/sass/templates/import_charset_1_8.sass

@@ -1,4 +1,6 @@
 .foo
   a: b
 
+@import "foo.css"
+
 @import "imported_charset_ibm866"

data/test/sass/templates/import_charset_ibm866.sass

@@ -3,6 +3,8 @@
 .foo
   a: b
 
+@import "foo.css"
+
 // Even though the imported file is in UTF-8,
 // since the root file is in IBM866
 // the output will end up being IBM866.

data/test/sass/templates/import_content.sass

@@ -0,0 +1,4 @@
+@import imported_content
+
+@include foo
+  b: c

data/test/sass/templates/same_name_different_ext.sass

@@ -0,0 +1,2 @@
+.foo
+  ext: sass

data/test/sass/templates/same_name_different_ext.scss

@@ -0,0 +1 @@
+.foo {ext: scss}

data/test/sass/templates/same_name_different_partiality.scss

@@ -0,0 +1 @@
+.foo {partial: no}

data/test/sass/templates/single_import_loop.sass

@@ -0,0 +1 @@
+@import "single_import_loop"

data/test/sass/templates/subdir/import_up1.scss

@@ -0,0 +1 @@
+@import "../subdir/import_up2.scss";

data/test/sass/templates/subdir/import_up2.scss

@@ -0,0 +1 @@
+@import "../subdir/import_up3.scss";

data/test/sass/test_helper.rb

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

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -0,0 +1,147 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../../test_helper'
+
+unless Sass::Util.ruby1_8?
+  class MultibyteStringScannerTest < Test::Unit::TestCase
+    def setup
+      @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
+    end
+
+    def test_initial
+      assert_scanner_state 0, 0, nil, nil
+    end
+
+    def test_check
+      assert_equal 'cö', @scanner.check(/../)
+      assert_scanner_state 0, 0, 2, 3
+      assert_equal 0, @scanner.pos
+      assert_equal 0, @scanner.pos
+      assert_equal 2, @scanner.matched_size
+      assert_equal 3, @scanner.byte_matched_size
+    end
+
+    def test_check_until
+      assert_equal 'cölorfü', @scanner.check_until(/f./)
+      assert_scanner_state 0, 0, 2, 3
+    end
+
+    def test_getch
+      assert_equal 'c', @scanner.getch
+      assert_equal 'ö', @scanner.getch
+      assert_scanner_state 2, 3, 1, 2
+    end
+
+    def test_match?
+      assert_equal 2, @scanner.match?(/../)
+      assert_scanner_state 0, 0, 2, 3
+    end
+
+    def test_peek
+      assert_equal 'cö', @scanner.peek(2)
+      assert_scanner_state 0, 0, nil, nil
+    end
+
+    def test_rest_size
+      assert_equal 'cö', @scanner.scan(/../)
+      assert_equal 6, @scanner.rest_size
+    end
+
+    def test_scan
+      assert_equal 'cö', @scanner.scan(/../)
+      assert_scanner_state 2, 3, 2, 3
+    end
+
+    def test_scan_until
+      assert_equal 'cölorfü', @scanner.scan_until(/f./)
+      assert_scanner_state 7, 9, 2, 3
+    end
+
+    def test_skip
+      assert_equal 2, @scanner.skip(/../)
+      assert_scanner_state 2, 3, 2, 3
+    end
+
+    def test_skip_until
+      assert_equal 7, @scanner.skip_until(/f./)
+      assert_scanner_state 7, 9, 2, 3
+    end
+
+    def test_set_pos
+      @scanner.pos = 7
+      assert_scanner_state 7, 9, nil, nil
+      @scanner.pos = 6
+      assert_scanner_state 6, 7, nil, nil
+      @scanner.pos = 1
+      assert_scanner_state 1, 1, nil, nil
+    end
+
+    def test_reset
+      @scanner.scan(/../)
+      @scanner.reset
+      assert_scanner_state 0, 0, nil, nil
+    end
+
+    def test_scan_full
+      assert_equal 'cö', @scanner.scan_full(/../, true, true)
+      assert_scanner_state 2, 3, 2, 3
+
+      @scanner.reset
+      assert_equal 'cö', @scanner.scan_full(/../, false, true)
+      assert_scanner_state 0, 0, 2, 3
+
+      @scanner.reset
+      assert_nil @scanner.scan_full(/../, true, false)
+      assert_scanner_state 2, 3, 2, 3
+
+      @scanner.reset
+      assert_nil @scanner.scan_full(/../, false, false)
+      assert_scanner_state 0, 0, 2, 3
+    end
+
+    def test_search_full
+      assert_equal 'cölorfü', @scanner.search_full(/f./, true, true)
+      assert_scanner_state 7, 9, 2, 3
+
+      @scanner.reset
+      assert_equal 'cölorfü', @scanner.search_full(/f./, false, true)
+      assert_scanner_state 0, 0, 2, 3
+
+      @scanner.reset
+      assert_nil @scanner.search_full(/f./, true, false)
+      assert_scanner_state 7, 9, 2, 3
+
+      @scanner.reset
+      assert_nil @scanner.search_full(/f./, false, false)
+      assert_scanner_state 0, 0, 2, 3
+    end
+
+    def test_set_string
+      @scanner.scan(/../)
+      @scanner.string = 'föóbâr'
+      assert_scanner_state 0, 0, nil, nil
+    end
+
+    def test_terminate
+      @scanner.scan(/../)
+      @scanner.terminate
+      assert_scanner_state 8, 10, nil, nil
+    end
+
+    def test_unscan
+      @scanner.scan(/../)
+      @scanner.scan_until(/f./)
+      @scanner.unscan
+      assert_scanner_state 2, 3, nil, nil
+    end
+
+    private
+
+    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'
+    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 < Test::Unit::TestCase
+  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_test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
+require 'tmpdir'
 
 class UtilTest < Test::Unit::TestCase
   include Sass::Util
@@ -41,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,
@@ -120,6 +130,23 @@ class UtilTest < Test::Unit::TestCase
       lcs([-5, 3, 2, 8], [-4, 1, 8]) {|a, b| (a - b).abs <= 1 && [a, b].max})
   end
 
+  def test_group_by_to_a
+    assert_equal([[1, [1, 3, 5, 7]], [0, [2, 4, 6, 8]]],
+      group_by_to_a(1..8) {|i| i % 2})
+    assert_equal([[1, [1, 4, 7, 10]], [2, [2, 5, 8, 11]], [0, [3, 6, 9, 12]]],
+      group_by_to_a(1..12) {|i| i % 3})
+  end
+
+  def test_subsequence
+    assert(subsequence?([1, 2, 3], [1, 2, 3]))
+    assert(subsequence?([1, 2, 3], [1, :a, 2, :b, 3]))
+    assert(subsequence?([1, 2, 3], [:a, 1, :b, :c, 2, :d, 3, :e, :f]))
+
+    assert(!subsequence?([1, 2, 3], [1, 2]))
+    assert(!subsequence?([1, 2, 3], [1, 3, 2]))
+    assert(!subsequence?([1, 2, 3], [3, 2, 1]))
+  end
+
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"
@@ -159,6 +186,12 @@ class UtilTest < Test::Unit::TestCase
       enum_cons(%w[foo bar baz], 2).map {|s1, s2| "#{s1}#{s2}"})
   end
 
+  def test_extract
+    arr = [1, 2, 3, 4, 5]
+    assert_equal([1, 3, 5], extract!(arr) {|e| e % 2 == 1})
+    assert_equal([2, 4], arr)
+  end
+
   def test_ord
     assert_equal(102, ord("f"))
     assert_equal(98, ord("bar"))
@@ -178,6 +211,13 @@ class UtilTest < Test::Unit::TestCase
     assert_equal([1, 2, 3, 4], flatten([[[1], 2], [3], 4], 2))
   end
 
+  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_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]))
@@ -208,6 +248,26 @@ class UtilTest < Test::Unit::TestCase
     assert(set_eql?(s1, s2))
   end
 
+  def test_extract_and_inject_values
+    test = lambda {|arr| assert_equal(arr, with_extracted_values(arr) {|str| str})}
+
+    test[['foo bar']]
+    test[['foo {12} bar']]
+    test[['foo {{12} bar']]
+    test[['foo {{1', 12, '2} bar']]
+    test[['foo 1', 2, '{3', 4, 5, 6, '{7}', 8]]
+    test[['foo 1', [2, 3, 4], ' bar']]
+    test[['foo ', 1, "\n bar\n", [2, 3, 4], "\n baz"]]
+  end
+
+  def nested_caller_info_fn
+    caller_info
+  end
+
+  def double_nested_caller_info_fn
+    nested_caller_info_fn
+  end
+
   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"))
@@ -215,6 +275,22 @@ class UtilTest < Test::Unit::TestCase
     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 {}'"))
+
+    info = nested_caller_info_fn
+    assert_equal(__FILE__, info[0])
+    assert_equal("test_caller_info", info[2])
+
+    info = proc {nested_caller_info_fn}.call
+    assert_equal(__FILE__, info[0])
+    assert_match(/^(block in )?test_caller_info$/, info[2])
+
+    info = double_nested_caller_info_fn
+    assert_equal(__FILE__, info[0])
+    assert_equal("double_nested_caller_info_fn", info[2])
+
+    info = proc {double_nested_caller_info_fn}.call
+    assert_equal(__FILE__, info[0])
+    assert_equal("double_nested_caller_info_fn", info[2])
   end
 
   def test_version_gt
@@ -244,6 +320,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
@@ -251,4 +336,102 @@ 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_atomic_writes
+    # when using normal writes, this test fails about 90% of the time.
+    filename = File.join(Dir.tmpdir, "test_atomic")
+    5.times do
+      writes_to_perform = %w(1 2 3 4 5 6 7 8 9).map {|i| "#{i}\n" * 100_000}
+      threads = writes_to_perform.map do |to_write|
+        Thread.new do
+          # To see this test fail with a normal write,
+          # change to the standard file open mechanism:
+          # open(filename, "w") do |f|
+          atomic_create_and_write_file(filename) do |f|
+            f.write(to_write)
+          end
+        end
+      end
+      loop do
+        contents = File.exist?(filename) ? File.read(filename) : nil
+        next if contents.nil? || contents.size == 0
+        unless writes_to_perform.include?(contents)
+          if contents.size != writes_to_perform.first.size
+            fail "Incomplete write detected: was #{contents.size} characters, " +
+                 "should have been #{writes_to_perform.first.size}"
+          else
+            fail "Corrupted read/write detected"
+          end
+        end
+        break if threads.all? {|t| !t.alive?}
+      end
+      threads.each {|t| t.join}
+    end
+  end
+
+  class FakeError < RuntimeError; end
+
+  def test_atomic_writes_handles_exceptions
+    filename = File.join(Dir.tmpdir, "test_atomic_exception")
+    FileUtils.rm_f(filename)
+    tmp_filename = nil
+    assert_raises FakeError do
+      atomic_create_and_write_file(filename) do |f|
+        tmp_filename = f.path
+        raise FakeError.new "Borken"
+      end
+    end
+    assert !File.exist?(filename)
+    assert !File.exist?(tmp_filename)
+  end
 end