sass 3.4.13 → 3.4.14

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8d20c295937040233d2c011ca20001285180ba16
-  data.tar.gz: 6335a222a12384382336d048635bcd0e0b3b473f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDA5ZDI0Y2RkM2M2NTNkZjI1YzFiMDhkNGM0MmRiNTA4NDE4NThiMw==
+  data.tar.gz: !binary |-
+    MzMxNGY0ZTk1ZDdhYjFmNTYwOGY3MjUyN2I2NjQ5NGIwNGIxZDlhNg==
 SHA512:
-  metadata.gz: 36072d55532236efa0e689550fddd097ae58e3bfa1e889e609d91fabf31f05b12c02cf04fa2803c0dce1b42ae0f460e110efb55b3614f1205da0daf848b7fee7
-  data.tar.gz: 7fd86b668d23751664fb507def2a7dec79ccbb311b756abcded9963a3a5422d4177798e3af9a0db17c8ec5858943bef8302ae6f92cdbe0f12d57b9013431692c
+  metadata.gz: !binary |-
+    YzFkYzMyZDgzM2ZlZjUzOWE4NDZkNTI1ZjI1ZGY2OTNkNjQxMTRmZGNmMWRh
+    MWEwMzdmY2M1ZmZmYTg3NmY0NDZlYTEzYjgxYTlkZjA4NzkwN2RkNjAxNDFh
+    Yjk5MGVjMGY5MTIyYjgwYjdkMmI1YTU5MzM0Zjg2ODY5YWY0ZTc=
+  data.tar.gz: !binary |-
+    Yzc0NTE0NWMwMjg4MWY5MTkwMjY4ODY0ZTBmOTIzZWJiMDJkNWM5NzJjYWEy
+    OTBiYzBiYTRlYTFjODdmNThmOTMxMzI0ZmM5ZjYxMDk4NWY5OThkNTJmMGZl
+    NTcyNjQ1NGJjZGQ4MTQ5NjhmMzc1OGQ1NTIyMTMwZTRlYmJmMmQ=

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2015 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-3.4.13
+3.4.14

data/VERSION_DATE

@@ -1 +1 @@
-27 February 2015 02:28:58 UTC
+23 May 2015 02:17:06 UTC

data/lib/sass/cache_stores/filesystem.rb

@@ -17,12 +17,12 @@ module Sass
       # @see Base#\_retrieve
       def _retrieve(key, version, sha)
         return unless File.readable?(path_to(key))
-        File.open(path_to(key), "rb") do |f|
-          if f.readline("\n").strip == version && f.readline("\n").strip == sha
-            return f.read
-          end
-        end
         begin
+          File.open(path_to(key), "rb") do |f|
+            if f.readline("\n").strip == version && f.readline("\n").strip == sha
+              return f.read
+            end
+          end
           File.unlink path_to(key)
         rescue Errno::ENOENT
           # Already deleted. Race condition?

data/lib/sass/engine.rb

@@ -84,7 +84,7 @@ module Sass
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
   #
-  #     template = File.load('stylesheets/sassy.sass')
+  #     template = File.read('stylesheets/sassy.sass')
   #     sass_engine = Sass::Engine.new(template)
   #     output = sass_engine.render
   #     puts output
@@ -157,7 +157,7 @@ module Sass
     # @api public
     DEFAULT_OPTIONS = {
       :style => :nested,
-      :load_paths => ['.'],
+      :load_paths => [],
       :cache => true,
       :cache_location => './.sass-cache',
       :syntax => :sass,

data/lib/sass/script/functions.rb

@@ -217,7 +217,7 @@ module Sass::Script
   # for selector arguments. They can take a plain string, a list of
   # lists as returned by `&` or anything in between:
   #
-  # * A plain sring, such as `".foo .bar, .baz .bang"`.
+  # * A plain string, such as `".foo .bar, .baz .bang"`.
   # * A space-separated list of strings such as `(".foo" ".bar")`.
   # * A comma-separated list of strings such as `(".foo .bar", ".baz .bang")`.
   # * A comma-separated list of space-separated lists of strings such
@@ -1398,6 +1398,15 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def unquote(string)
       unless string.is_a?(Sass::Script::Value::String)
+        # Don't warn multiple times for the same source line.
+        # rubocop:disable GlobalVars
+        $_sass_warned_for_unquote ||= Set.new
+        frame = environment.stack.frames.last
+        key = [frame.filename, frame.line] if frame
+        return string if frame && $_sass_warned_for_unquote.include?(key)
+        $_sass_warned_for_unquote << key if frame
+        # rubocop:enable GlobalVars
+
         Sass::Util.sass_warn(<<MESSAGE.strip)
 DEPRECATION WARNING: Passing #{string.to_sass}, a non-string value, to unquote()
 will be an error in future versions of Sass.

data/lib/sass/script/tree/operation.rb

@@ -85,12 +85,19 @@ module Sass::Script::Tree
         raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
       end
 
-      if @operator == :eq && value1.is_a?(Sass::Script::Value::Number) &&
-          value2.is_a?(Sass::Script::Value::Number) && result == Sass::Script::Value::Bool::TRUE &&
-          value1.unitless? != value2.unitless?
+      if (@operator == :eq || @operator == :neq) && value1.is_a?(Sass::Script::Value::Number) &&
+         value2.is_a?(Sass::Script::Value::Number) && value1.unitless? != value2.unitless? &&
+         result == (if @operator == :eq
+                      Sass::Script::Value::Bool::TRUE
+                    else
+                      Sass::Script::Value::Bool::FALSE
+                    end)
+
+        operation = "#{value1} #{@operator == :eq ? '==' : '!='} #{value2}"
+        future_value = @operator == :neq
         Sass::Util.sass_warn <<WARNING
 DEPRECATION WARNING on line #{line}#{" of #{filename}" if filename}:
-The result of `#{value1} == #{value2}` will be `false` in future releases of Sass.
+The result of `#{operation}` will be `#{future_value}` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
       end

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

@@ -232,7 +232,7 @@ module Sass::Script::Value
           raise ArgumentError.new("Color.new(array) expects a three- or four-element array")
         end
 
-        red, green, blue = attrs[0...3].map {|c| c.to_i}
+        red, green, blue = attrs[0...3].map {|c| c.round}
         @attrs = {:red => red, :green => green, :blue => blue}
         @attrs[:alpha] = attrs[3] ? attrs[3].to_f : 1
         @representation = representation
@@ -258,7 +258,7 @@ module Sass::Script::Value
 
       [:red, :green, :blue].each do |k|
         next if @attrs[k].nil?
-        @attrs[k] = Sass::Util.restrict(@attrs[k].to_i, 0..255)
+        @attrs[k] = Sass::Util.restrict(@attrs[k].round, 0..255)
       end
 
       [:saturation, :lightness].each do |k|
@@ -283,7 +283,7 @@ module Sass::Script::Value
       green = $2.ljust(2, $2).to_i(16)
       blue  = $3.ljust(2, $3).to_i(16)
 
-      hex_string = '##{hex_string}' unless hex_string[0] == ?#
+      hex_string = "##{hex_string}" unless hex_string[0] == ?#
       attrs = {:red => red, :green => green, :blue => blue, :representation => hex_string}
       attrs[:alpha] = alpha if alpha
       new(attrs)
@@ -382,7 +382,7 @@ module Sass::Script::Value
     # @return [Array<Fixnum>] A frozen four-element array of the hue,
     #   saturation, lightness, and alpha values (respectively) of the color
     def hsla
-      [hue, saturation, lightness].freeze
+      [hue, saturation, lightness, alpha].freeze
     end
 
     # The SassScript `==` operation.

data/lib/sass/scss/parser.rb

@@ -562,7 +562,9 @@ module Sass
       def supports_operator
         cond = supports_condition_in_parens
         return unless cond
-        while (op = tok(/and|or/i))
+        re = /and|or/i
+        while (op = tok(re))
+          re = /#{op}/i
           ss
           cond = Sass::Supports::Operator.new(
             cond, expr!(:supports_condition_in_parens), op)
@@ -586,11 +588,6 @@ module Sass
         end
       end
 
-      def supports_declaration_condition
-        return unless tok(/\(/); ss
-        supports_declaration_body
-      end
-
       def supports_interpolation
         interp = interpolation
         return unless interp

data/lib/sass/supports.rb

@@ -58,11 +58,11 @@ module Sass::Supports
     end
 
     def to_css
-      "#{left_parens @left.to_css} #{op} #{right_parens @right.to_css}"
+      "#{parens @left, @left.to_css} #{op} #{parens @right, @right.to_css}"
     end
 
     def to_src(options)
-      "#{left_parens @left.to_src(options)} #{op} #{right_parens @right.to_src(options)}"
+      "#{parens @left, @left.to_src(options)} #{op} #{parens @right, @right.to_src(options)}"
     end
 
     def deep_copy
@@ -79,14 +79,12 @@ module Sass::Supports
 
     private
 
-    def left_parens(str)
-      return "(#{str})" if @left.is_a?(Negation)
-      str
-    end
-
-    def right_parens(str)
-      return "(#{str})" if @right.is_a?(Negation) || @right.is_a?(Operator)
-      str
+    def parens(condition, str)
+      if condition.is_a?(Negation) || (condition.is_a?(Operator) && condition.op != op)
+        return "(#{str})"
+      else
+        return str
+      end
     end
   end
 

data/lib/sass/tree/import_node.rb

@@ -55,13 +55,14 @@ module Sass
           return f if f
         end
 
-        message = "File to import not found or unreadable: #{@imported_filename}.\n"
+        lines = ["File to import not found or unreadable: #{@imported_filename}."]
+
         if paths.size == 1
-          message << "Load path: #{paths.first}"
-        else
-          message << "Load paths:\n  " << paths.join("\n  ")
+          lines << "Load path: #{paths.first}"
+        elsif !paths.empty?
+          lines << "Load paths:\n  #{paths.join("\n  ")}"
         end
-        raise SyntaxError.new(message)
+        raise SyntaxError.new(lines.join("\n"))
       rescue SyntaxError => e
         raise SyntaxError.new(e.message, :line => line, :filename => @filename)
       end

data/test/sass/conversion_test.rb

@@ -1311,7 +1311,7 @@ $query: "(feature1: val)"
 $feature: feature2
 $val: val
 
-@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4))
+@supports (\#{$query} and ($feature: $val)) or (not ($feature + 3: $val + 4))
   foo
     a: b
 SASS
@@ -1319,7 +1319,7 @@ $query: "(feature1: val)";
 $feature: feature2;
 $val: val;
 
-@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4)) {
+@supports (\#{$query} and ($feature: $val)) or (not ($feature + 3: $val + 4)) {
   foo {
     a: b;
   }

data/test/sass/engine_test.rb

@@ -680,7 +680,6 @@ SASS
   def test_nonexistent_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.sass.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent.sass")
     end
@@ -689,7 +688,6 @@ ERR
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent")
     end

data/test/sass/functions_test.rb

@@ -220,10 +220,10 @@ WARNING
   end
 
   def test_rgb_percent
-    assert_equal("#123456", evaluate("rgb(7.1%, 20.4%, 34%)"))
+    assert_equal("#123457", evaluate("rgb(7.1%, 20.4%, 34%)"))
     assert_equal("#beaded", evaluate("rgb(74.7%, 173, 93%)"))
     assert_equal("#beaded", evaluate("rgb(190, 68%, 237)"))
-    assert_equal("springgreen", evaluate("rgb(0%, 100%, 50%)"))
+    assert_equal("#00ff80", evaluate("rgb(0%, 100%, 50%)"))
   end
 
   def test_rgb_clamps_bounds
@@ -813,11 +813,11 @@ WARNING
   end
 
   def test_mix
-    assert_equal("#7f007f", evaluate("mix(#f00, #00f)"))
-    assert_equal("#7f7f7f", evaluate("mix(#f00, #0ff)"))
-    assert_equal("#7f9055", evaluate("mix(#f70, #0aa)"))
-    assert_equal("#3f00bf", evaluate("mix(#f00, #00f, 25%)"))
-    assert_equal("rgba(63, 0, 191, 0.75)", evaluate("mix(rgba(255, 0, 0, 0.5), #00f)"))
+    assert_equal("purple", evaluate("mix(#f00, #00f)"))
+    assert_equal("gray", evaluate("mix(#f00, #0ff)"))
+    assert_equal("#809155", evaluate("mix(#f70, #0aa)"))
+    assert_equal("#4000bf", evaluate("mix(#f00, #00f, 25%)"))
+    assert_equal("rgba(64, 0, 191, 0.75)", evaluate("mix(rgba(255, 0, 0, 0.5), #00f)"))
     assert_equal("red", evaluate("mix(#f00, #00f, 100%)"))
     assert_equal("blue", evaluate("mix(#f00, #00f, 0%)"))
     assert_equal("rgba(255, 0, 0, 0.5)", evaluate("mix(#f00, transparentize(#00f, 1))"))

data/test/sass/results/script.css

@@ -1,9 +1,9 @@
 #main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: #000; color: #ffa; short-color: #123; 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 #123"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
+#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 #123"; str-num: "times: 13"; col-num: #ff7c9e; col-col: #5173ff; }
 
-#minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
+#minus { num-num: 900; col-num: #fafaf5; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
 #times { num-num: 7; num-col: #7496b8; col-num: #092345; col-col: #243648; }
 

data/test/sass/script_test.rb

@@ -31,6 +31,11 @@ class SassScriptTest < MiniTest::Test
     assert_equal 0, Sass::Script::Value::Color.new([1, 2, 3, -0.1]).alpha
   end
 
+  def test_color_from_hex
+    assert_equal Sass::Script::Value::Color.new([0,0,0]), Sass::Script::Value::Color.from_hex('000000')
+    assert_equal Sass::Script::Value::Color.new([0,0,0]), Sass::Script::Value::Color.from_hex('#000000')
+  end
+
   def test_string_escapes
     assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
@@ -471,6 +476,12 @@ SASS
 DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
 The result of `1 == 1cm` will be `false` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+
+    assert_warning(<<WARNING) {assert_equal "false", resolve("1 != 1cm")}
+DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
+The result of `1 != 1cm` will be `true` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
   end
 
@@ -552,7 +563,7 @@ WARNING
   def test_case_insensitive_color_names
     assert_equal "BLUE", resolve("BLUE")
     assert_equal "rEd", resolve("rEd")
-    assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
+    assert_equal "#804000", resolve("mix(GrEeN, ReD)")
   end
 
   def test_empty_list

data/test/sass/scss/css_test.rb

@@ -634,14 +634,14 @@ SCSS
 
   def test_supports
     assert_equal <<CSS, render(<<SCSS)
-@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+@supports (((a: b) and (c: d)) or (not (d: e))) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
   .foo {
     a: b; } }
 @supports (a: b) {
   .foo {
     a: b; } }
 CSS
-@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+@supports (((a: b) and (c: d)) or (not (d: e))) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
   .foo {
     a: b;
   }
@@ -653,13 +653,38 @@ CSS
   }
 }
 SCSS
+  end
 
+  def test_supports_with_prefix
     assert_equal <<CSS, render(<<SCSS)
-@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+@-prefix-supports (((a: b) and (c: d)) or (not (d: e))) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
   .foo {
     a: b; } }
 CSS
-@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+@-prefix-supports (((a: b) and (c: d)) or (not (d: e))) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+  .foo {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_supports_allows_similar_operators_without_parens
+    assert_equal <<CSS, render(<<SCSS)
+@supports (a: b) and (c: d) and (e: f) {
+  .foo {
+    a: b; } }
+@supports (a: b) or (c: d) or (e: f) {
+  .foo {
+    a: b; } }
+CSS
+@supports (a: b) and (c: d) and (e: f) {
+  .foo {
+    a: b;
+  }
+}
+
+@supports (a: b) or (c: d) or (e: f) {
   .foo {
     a: b;
   }

data/test/sass/scss/scss_test.rb

@@ -2296,14 +2296,14 @@ SCSS
 
   def test_supports_with_expressions
     assert_equal <<CSS, render(<<SCSS)
-@supports (feature1: val) and (feature2: val) or (not (feature23: val4)) {
+@supports ((feature1: val) and (feature2: val)) or (not (feature23: val4)) {
   foo {
     a: b; } }
 CSS
 $query: "(feature1: val)";
 $feature: feature2;
 $val: val;
-@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4)) {
+@supports (\#{$query} and ($feature: $val)) or (not ($feature + 3: $val + 4)) {
   foo {a: b}
 }
 SCSS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.13
+  version: 3.4.14
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,55 +10,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '5'
-description: |2
-        Sass makes CSS fun again. Sass is an extension of CSS3, adding
-        nested rules, variables, mixins, selector inheritance, and more.
-        It's translated to well-formatted, standard CSS using the
-        command line tool or a web-framework plugin.
+description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n
+  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
+  translated to well-formatted, standard CSS using the\n      command line tool or
+  a web-framework plugin.\n"
 email: sass-lang@googlegroups.com
 executables:
 - sass
@@ -381,43 +380,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
+- test/sass/importer_test.rb
+- test/sass/engine_test.rb
 - test/sass/value_helpers_test.rb
-- test/sass/conversion_test.rb
-- test/sass/cache_test.rb
-- test/sass/script_test.rb
 - test/sass/superselector_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/source_map_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/util_test.rb
-- test/sass/plugin_test.rb
-- test/sass/extend_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/scss_test.rb
 - test/sass/logger_test.rb
-- test/sass/importer_test.rb
+- test/sass/util_test.rb
+- test/sass/cache_test.rb
 - test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/util/normalized_map_test.rb
+- test/sass/source_map_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/plugin_test.rb
+- test/sass/conversion_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/exec_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/callbacks_test.rb
 - test/sass/functions_test.rb
+- test/sass/extend_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/script_test.rb
 - test/sass/compiler_test.rb
-- test/sass/css2sass_test.rb