sass 3.4.22 → 3.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 414603b66564f231de620f9baff16563174a4b72
-  data.tar.gz: 4f09c7d1af56afa99f42b2c5922144774befd481
+  metadata.gz: 87969e0a80091cd78a2acae89e1fcb30abedcebf
+  data.tar.gz: d7297b39a2a1e46434b89fec0ba878b671a29e14
 SHA512:
-  metadata.gz: 40de104dabb794e5fd4fb20bdfcf0c2d57444d4b2f283312d4698482c3117fc5093b7e65daaacbae1b4ccd93989d0e6c3a3c0f3548a3c5710de74563d9ee6b96
-  data.tar.gz: 738319bc6f7d3b10e4ec16e0e5c5b9ed7b7c21f6c09d7bc244cbd5d0fab785778ccf4b2270ba86eb68597a8b1eb4836ef4f7460c7063381a7cfa2c9017b73c15
+  metadata.gz: 96e87063a0f068712aeb63593e7861f69db072d306b6005c8a49780bf9553bca1dc1bbfa7d4cef1a8a29d1f198aa636823260af4eaed0f75c0fb45a08c903526
+  data.tar.gz: 8bb8cef35fc3c2d5dd4be949d1a0ebd075f6468dc37d97c8d0af8252ab213788cc66350d636153877a4fa025bf42955ab7a209e8c3401d63b7e8fdea3ac5316e

data/CONTRIBUTING.md

@@ -37,6 +37,29 @@ branch, but don't worry about it too much; if you make a request against the
 wrong branch, the maintainer will take responsibility for rebasing it before
 merging.
 
+### Testing
+
+Tests for changes to the Sass language go in
+[sass-spec](https://github.com/sass/sass-spec) so that other
+implementations (E.g. libSass) can be tested against the same test
+suite. The sass-spec repo follows a "trunk development" model in that
+the tests there test against different version of the Sass language (as
+opposed to having branches that track different Sass versions). When
+contributing changes to Sass, update the Gemfile to use sass-spec from a
+branch or fork that has the new tests. When the feature lands in Sass,
+the committer will also merge the corresponding sass-spec changes.
+
+The [documentation of
+sass-spec](https://github.com/sass/sass-spec/blob/master/README.md)
+explains how to run sass-spec and contribute changes. In development,
+Change the Gemfile(s) to use the `:path` option against the sass-spec gem
+to link your local checkout of sass and sass-spec together in one or
+both directions.
+
+Changes to Sass internals or Ruby Sass specific features (E.g.
+the `sass-convert` tool) should always have tests in the Sass `test`
+directory following the conventions you see there.
+
 ### Feature Branches
 
 Sometimes it won't be possible to merge a new feature into `next` or `master`

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
+# Sass [![Gem Version](https://badge.fury.io/rb/sass.svg)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS,
 adding nested rules, variables, mixins, selector inheritance, and more.
@@ -184,7 +184,7 @@ See `sass-convert --help` for further information and options.
 To run the Sass executables from a source checkout instead of from rubygems:
 
 ```
-$ cd <SASS_CHECKOUT_DIRECTORY>
+$ cd sass
 $ bundle
 $ bundle exec sass ...
 $ bundle exec scss ...
@@ -199,12 +199,12 @@ and now occasionally consults on the language issues. Hampton lives in San
 Francisco, California and works as VP of Technology
 at [Moovweb](http://www.moovweb.com/).
 
-[Natalie Weizenbaum](https://twitter.com/nex3) is the primary developer and architect of
-Sass. Her hard work has kept the project alive by endlessly answering forum
-posts, fixing bugs, refactoring, finding speed improvements, writing
-documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a girl genius). Natalie lives in Seattle, Washington and works on
-[Dart](http://dartlang.org) application libraries at Google.
+[Natalie Weizenbaum](https://twitter.com/nex3) is the primary developer and
+architect of Sass. Her hard work has kept the project alive by endlessly
+answering forum posts, fixing bugs, refactoring, finding speed improvements,
+writing documentation, implementing new features, and designing the language.
+Natalie lives in Seattle, Washington and works on [Dart](http://dartlang.org)
+application libraries at Google.
 
 [Chris Eppstein](http://twitter.com/chriseppstein) is a core contributor to
 Sass and the creator of [Compass](http://compass-style.org/), the first Sass-based framework, and

data/Rakefile

@@ -48,8 +48,8 @@ namespace :test do
         end
         default_options = {
           :spec_directory => SassSpec::SPEC_DIR,
-          :engine_adapter => SassEngineAdapter.new("sass"),
-          :generate => [],
+          :engine_adapter => SassEngineAdapter.new,
+          :generate => false,
           :tap => false,
           :skip => false,
           :verbose => false,
@@ -57,14 +57,6 @@ namespace :test do
           :limit => -1,
           :unexpected_pass => false,
           :nuke => false,
-
-          # Constants
-          :output_styles => ["nested"],
-          :input_files => ["input.scss", "input.sass"],
-          :nested_output_file => 'expected_output',
-          :compressed_output_file => 'expected.compressed',
-          :expanded_output_file => 'expected.expanded',
-          :compact_output_file => 'expected.compact'
         }
         SassSpec::Runner.new(default_options.merge(sass_spec_options)).run || exit(1)
       ensure

data/VERSION

@@ -1 +1 @@
-3.4.22
+3.4.23

data/VERSION_DATE

@@ -1 +1 @@
-28 March 2016 23:31:39 UTC
+19 December 2016 23:15:42 UTC

data/extra/sass-spec-ref.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -e
+# Copyright 2016 Google Inc. Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+# Echoes the sass-spec Git ref that should be checked out for the current Travis
+# run. If we're running specs for a pull request which refers to a sass-spec
+# pull request, we'll run against the latter rather than sass-spec master.
+
+default=master
+
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  >&2 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST."
+  >&2 echo "Ref: $default."
+  echo "$default"
+  exit 0
+fi
+
+>&2 echo "Fetching pull request $TRAVIS_PULL_REQUEST..."
+
+JSON=$(curl -L -sS https://api.github.com/repos/sass/sass/pulls/$TRAVIS_PULL_REQUEST)
+
+RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+
+if [[ $JSON =~ $RE_SPEC_PR ]]; then
+  ref="pull/${BASH_REMATCH[2]}/head"
+  >&2 echo "Ref: $ref."
+  echo "$ref"
+else
+  >&2 echo "Ref: $default."
+  echo "$default"
+fi

data/lib/sass/cache_stores/filesystem.rb

@@ -36,7 +36,7 @@ module Sass
       def _store(key, version, sha, contents)
         compiled_filename = path_to(key)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)

data/lib/sass/exec/base.rb

@@ -23,7 +23,7 @@ module Sass::Exec
         # at_exit is a bit of a hack, but it allows us to rethrow when --trace
         # is active and get both the built-in exception formatting and the
         # correct exit code.
-        at_exit {exit 65} if e.is_a?(Sass::SyntaxError)
+        at_exit {exit Sass::Util.windows? ? 13 : 65} if e.is_a?(Sass::SyntaxError)
 
         raise e if @options[:trace] || e.is_a?(SystemExit)
 

data/lib/sass/logger.rb

@@ -2,11 +2,16 @@ module Sass::Logger; end
 
 require "sass/logger/log_level"
 require "sass/logger/base"
+require "sass/logger/delayed"
 
 module Sass
   class << self
-    attr_accessor :logger
-  end
+    def logger=(l)
+      Thread.current[:sass_logger] = l
+    end
 
-  self.logger = Sass::Logger::Base.new
+    def logger
+      Thread.current[:sass_logger] ||= Sass::Logger::Base.new
+    end
+  end
 end

data/lib/sass/logger/base.rb

@@ -5,6 +5,7 @@ class Sass::Logger::Base
 
   attr_accessor :log_level
   attr_accessor :disabled
+  attr_accessor :io
 
   log_level :trace
   log_level :debug
@@ -12,8 +13,9 @@ class Sass::Logger::Base
   log_level :warn
   log_level :error
 
-  def initialize(log_level = :debug)
+  def initialize(log_level = :debug, io = nil)
     self.log_level = log_level
+    self.io = io
   end
 
   def logging_level?(level)
@@ -25,6 +27,10 @@ class Sass::Logger::Base
   end
 
   def _log(level, message)
-    Kernel.warn(message)
+    if io
+      io.puts(message)
+    else
+      Kernel.warn(message)
+    end
   end
 end

data/lib/sass/logger/delayed.rb

@@ -0,0 +1,50 @@
+require 'sass/logger/log_level'
+
+# A logger that delays messages until they're explicitly flushed to an inner
+# logger.
+#
+# This can be installed around the current logger by calling \{#install!}, and
+# the original logger can be replaced by calling \{#uninstall!}. The log
+# messages can be flushed by calling \{#flush}.
+class Sass::Logger::Delayed < Sass::Logger::Base
+  # Installs a new delayed logger as the current Sass logger, wrapping the
+  # original logger.
+  #
+  # This can be undone by calling \{#uninstall!}.
+  #
+  # @return [Sass::Logger::Delayed] The newly-created logger.
+  def self.install!
+    logger = Sass::Logger::Delayed.new(Sass.logger)
+    Sass.logger = logger
+    logger
+  end
+
+  # Creates a delayed logger wrapping `inner`.
+  #
+  # @param inner [Sass::Logger::Base] The wrapped logger.
+  def initialize(inner)
+    self.log_level = inner.log_level
+    @inner = inner
+    @messages = []
+  end
+
+  # Flushes all queued logs to the wrapped logger.
+  def flush
+    @messages.each {|(l, m)| @inner.log(l, m)}
+  end
+
+  # Uninstalls this logger from \{Sass.logger\}. This should only be called if
+  # the logger was installed using \{#install!}
+  def uninstall!
+    if Sass.logger != self
+      throw Exception.new("Can't uninstall a logger that's not currently installed.")
+    end
+
+    @inner.log_level = log_level
+    Sass.logger = @inner
+  end
+
+  def _log(level, message)
+    @messages << [level, message]
+  end
+end

data/lib/sass/script/functions.rb

@@ -1305,7 +1305,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
+    #     color. Closer to `100%` gives more weight to `$color1`, closer to `0%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1546,7 +1546,7 @@ MESSAGE
     #   @param $start-at [Sass::Script::Value::Number] The index of the first
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`
-    #   @param $end-before [Sass::Script::Value::Number] The index of the last
+    #   @param $end-at [Sass::Script::Value::Number] The index of the last
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`. Defaults to -1
     #   @return [Sass::Script::Value::String] The substring. This will be quoted
@@ -1565,7 +1565,7 @@ MESSAGE
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      e = 0 if s < 0
+      return Sass::Script::Value::String.new("", string.type) if e < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1611,6 +1611,7 @@ MESSAGE
     #   type-of(true)   => bool
     #   type-of(#fff)   => color
     #   type-of(blue)   => color
+    #   type-of(null)   => null
     # @overload type_of($value)
     #   @param $value [Sass::Script::Value::Base] The value to inspect
     # @return [Sass::Script::Value::String] The unquoted string name of the
@@ -2263,6 +2264,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   variable-exists(a-false-value) => true
+    #   variable-exists(a-null-value) => true
     #
     #   variable-exists(nonexistent) => false
     #
@@ -2283,6 +2285,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   global-variable-exists(a-false-value) => true
+    #   global-variable-exists(a-null-value) => true
     #
     #   .foo {
     #     $some-var: false;

data/lib/sass/script/parser.rb

@@ -471,18 +471,24 @@ RUBY
       #   `expr`).
       # @return [Boolean]
       def is_unsafe_before?(expr, char_before)
-        # If the previous expression is an identifier or number, it's safe
-        # unless it was wrapped in parentheses.
-        if expr.is_a?(Script::Tree::Literal) &&
-           (expr.value.is_a?(Script::Value::Number) ||
-            (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier))
-          return char_before == ')'
-        end
+        return char_before == ')' if is_safe_value?(expr)
 
         # Otherwise, it's only safe if it was another interpolation.
         !expr.is_a?(Script::Tree::Interpolation)
       end
 
+      # Returns whether `expr` is safe as the value immediately before an
+      # interpolation.
+      #
+      # It's safe as long as the previous expression is an identifier or number,
+      # or a list whose last element is also safe.
+      def is_safe_value?(expr)
+        return is_safe_value?(expr.elements.last) if expr.is_a?(Script::Tree::ListLiteral)
+        return false unless expr.is_a?(Script::Tree::Literal)
+        expr.value.is_a?(Script::Value::Number) ||
+          (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier)
+      end
+
       def space
         start_pos = source_position
         e = or_expr

data/lib/sass/script/value/number.rb

@@ -34,29 +34,31 @@ module Sass::Script::Value
     attr_accessor :original
 
     def self.precision
-      @precision ||= 5
+      Thread.current[:sass_numeric_precision] || Thread.main[:sass_numeric_precision] || 5
     end
 
     # Sets the number of digits of precision
     # For example, if this is `3`,
     # `3.1415926` will be printed as `3.142`.
+    # The numeric precision is stored as a thread local for thread safety reasons.
+    # To set for all threads, be sure to set the precision on the main thread.
     def self.precision=(digits)
-      @precision = digits.round
-      @precision_factor = 10.0**@precision
-      @epsilon = 1 / (@precision_factor * 10)
+      Thread.current[:sass_numeric_precision] = digits.round
+      Thread.current[:sass_numeric_precision_factor] = nil
+      Thread.current[:sass_numeric_epsilon] = nil
     end
 
     # the precision factor used in numeric output
     # it is derived from the `precision` method.
     def self.precision_factor
-      @precision_factor ||= 10.0**precision
+      Thread.current[:sass_numeric_precision_factor] ||= 10.0**precision
     end
 
     # Used in checking equality of floating point numbers. Any
     # numbers within an `epsilon` of each other are considered functionally equal.
     # The value for epsilon is one tenth of the current numeric precision.
     def self.epsilon
-      @epsilon ||= 1 / (precision_factor * 10)
+      Thread.current[:sass_numeric_epsilon] ||= 1 / (precision_factor * 10)
     end
 
     # Used so we don't allocate two new arrays for each new number.
@@ -508,8 +510,8 @@ module Sass::Script::Value
       },
       {
         'dpi'  => Rational(1),
-        'dpcm' => Rational(1, 2.54),
-        'dppx' => Rational(1, 96)
+        'dpcm' => Rational(254, 100),
+        'dppx' => Rational(96)
       }
     ]
 

data/lib/sass/scss/parser.rb

@@ -560,7 +560,7 @@ module Sass
       def supports_clause
         return unless tok(/supports\(/i)
         ss
-        supports = supports_condition
+        supports = import_supports_condition
         ss
         tok!(/\)/)
         supports
@@ -570,6 +570,10 @@ module Sass
         supports_negation || supports_operator || supports_interpolation
       end
 
+      def import_supports_condition
+        supports_condition || supports_declaration
+      end
+
       def supports_negation
         return unless tok(/not/i)
         ss
@@ -589,6 +593,13 @@ module Sass
         cond
       end
 
+      def supports_declaration
+          name = sass_script(:parse)
+          tok!(/:/); ss
+          value = sass_script(:parse)
+          Sass::Supports::Declaration.new(name, value)
+      end
+
       def supports_condition_in_parens
         interp = supports_interpolation
         return interp if interp
@@ -597,11 +608,9 @@ module Sass
           tok!(/\)/); ss
           cond
         else
-          name = sass_script(:parse)
-          tok!(/:/); ss
-          value = sass_script(:parse)
+          decl = supports_declaration
           tok!(/\)/); ss
-          Sass::Supports::Declaration.new(name, value)
+          decl
         end
       end
 
@@ -828,6 +837,9 @@ module Sass
           |
             (?!url\()
             [^"'/\#!;\{\}] # "
+          |
+            # interp_uri will handle most url() calls, but not ones that take strings
+            url\(#{W}(?=")
           |
             /(?![/*])
           |
@@ -1143,14 +1155,20 @@ WARNING
         line = @line
         offset = @offset
         expected = @expected
+
+        logger = Sass::Logger::Delayed.install!
         if catch(:_sass_parser_error) {yield; false}
           @scanner.pos = pos
           @line = line
           @offset = offset
           @expected = expected
           {:pos => pos, :line => line, :expected => @expected, :block => block}
+        else
+          logger.flush
+          nil
         end
       ensure
+        logger.uninstall! if logger
         @throw_error = old_throw_error
       end
 

data/lib/sass/source/map.rb

@@ -118,12 +118,14 @@ module Sass::Source
       @data.each do |m|
         file, importer = m.input.file, m.input.importer
 
+        next unless importer
+
         if options[:type] == :inline
           source_uri = file
         else
           sourcemap_dir = sourcemap_path && sourcemap_path.dirname.to_s
           sourcemap_dir = nil if options[:type] == :file
-          source_uri = importer && importer.public_url(file, sourcemap_dir)
+          source_uri = importer.public_url(file, sourcemap_dir)
           next unless source_uri
         end
 

data/lib/sass/tree/visitors/convert.rb

@@ -289,7 +289,9 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
               child.line + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode))
+            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode)) ||
+            (child.is_a?(Sass::Tree::MixinNode) && nxt.is_a?(Sass::Tree::MixinNode) &&
+              child.line + 1 == nxt.line)
           ""
         else
           "\n"

data/test/sass/conversion_test.rb

@@ -1126,6 +1126,23 @@ foo {
 SCSS
   end
 
+  def test_consecutive_mixin_includes
+    assert_renders <<SASS, <<SCSS
+foo
+  +foo-bar
+  +foo-bar
+
+  a: blip
+SASS
+foo {
+  @include foo-bar;
+  @include foo-bar;
+
+  a: blip;
+}
+SCSS
+  end
+
   def test_mixin_include_with_hyphen_conversion_keyword_arg
     assert_renders <<SASS, <<SCSS
 foo

data/test/sass/script_test.rb

@@ -558,9 +558,9 @@ WARNING
   end
 
   def test_resolution_units
-    assert_equal "2.54", resolve("(1dpi/1dpcm)")
-    assert_equal "37.79528", resolve("(1dpcm/1dppx)")
-    assert_equal "0.01042", resolve("(1dppx/1dpi)")
+    assert_equal "0.3937", resolve("(1dpi/1dpcm)")
+    assert_equal "0.02646", resolve("(1dpcm/1dppx)")
+    assert_equal "96", resolve("(1dppx/1dpi)")
   end
 
   def test_operations_have_options

data/test/sass/scss/scss_test.rb

@@ -3649,6 +3649,39 @@ SCSS
 
   # Regression
 
+  # Regression test for #2031.
+  def test_no_interpolation_warning_in_nested_selector
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+z a:b(n+1) {
+  x: y; }
+CSS
+z {
+  a:b(n+\#{1}) {
+    x: y;
+  }
+}
+SCSS
+  end
+
+  # Ensures that the fix for #2031 doesn't hide legitimate warnings.
+  def test_interpolation_warning_in_selector_like_property
+    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 2 of #{filename_for_test :scss}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
+
+  unquote("n+1")
+
+You can use the sass-convert command to automatically fix most cases.
+WARNING
+z {
+  a: b(n+1); }
+CSS
+z {
+  a:b(n+\#{1});
+}
+SCSS
+  end
+
   def test_escape_in_selector
     assert_equal(<<CSS, render(".\\!foo {a: b}"))
 .\\!foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.22
+  version: 3.4.23
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -80,6 +80,7 @@ files:
 - bin/sass
 - bin/sass-convert
 - bin/scss
+- extra/sass-spec-ref.sh
 - extra/update_watch.rb
 - init.rb
 - lib/sass.rb
@@ -105,6 +106,7 @@ files:
 - lib/sass/importers/filesystem.rb
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
+- lib/sass/logger/delayed.rb
 - lib/sass/logger/log_level.rb
 - lib/sass/media.rb
 - lib/sass/plugin.rb
@@ -394,34 +396,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/cache_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/compiler_test.rb
-- test/sass/conversion_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/css_variable_test.rb
-- test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
 - test/sass/extend_test.rb
-- test/sass/functions_test.rb
-- test/sass/importer_test.rb
-- test/sass/logger_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/util_test.rb
+- test/sass/superselector_test.rb
+- test/sass/value_helpers_test.rb
 - test/sass/plugin_test.rb
-- test/sass/script_conversion_test.rb
+- test/sass/logger_test.rb
+- test/sass/functions_test.rb
+- test/sass/conversion_test.rb
+- test/sass/source_map_test.rb
+- test/sass/cache_test.rb
+- test/sass/encoding_test.rb
 - test/sass/script_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/source_map_test.rb
-- test/sass/superselector_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
+- test/sass/exec_test.rb
+- test/sass/importer_test.rb
+- test/sass/engine_test.rb
+- test/sass/css_variable_test.rb
+- test/sass/compiler_test.rb
 - test/sass/util/subset_map_test.rb
-- test/sass/util_test.rb
-- test/sass/value_helpers_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb