sass 3.4.15 → 3.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00cf7afef986f13c1fccaf0cf889a398d7b86910
-  data.tar.gz: 34e170181ba5a960190d6e87f2e6707557383ed9
+  metadata.gz: 0dff26b06c7065753c46919a6edcabb5eba41d14
+  data.tar.gz: 55acb3b26ba3d248bdf3e2e3e1c8263e41405faa
 SHA512:
-  metadata.gz: 363cd78182ff5dd174b78914436f98cd7c14bb60418103a0f1a46392aa3ef6daf5cd0c09e9ca43ce3b3762ca90046d3d31ee0246f3beaa52ee35828d4306be27
-  data.tar.gz: 231f3556d06f74cd61b355cfb4143549100bb01efd944de3b781e6f256d6feed534582460f9abfcc9ec994cd901bdfcbf110019eb6db33e11b8794483d38bcad
+  metadata.gz: 8d763cdfcb6c8b78626b39101f0d92cc48f2c038307f96de6929fcd5b51a3e7ec03f889e55b0dbb4cbfdfcd8848469476ad6950e9c41b40efd7f3bdefe36a31b
+  data.tar.gz: a5e4c150a05613f1a40fc3b7f380e62aa4e693aadf674b6361fad3205b126ce39bd9912ac21965e70997ffe0f52c29c0261bece728e6d374ce8ad735f1b93205

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+Sass is more than a technology; Sass is driven by the community of individuals
+that power its development and use every day. As a community, we want to embrace
+the very differences that have made our collaboration so powerful, and work
+together to provide the best environment for learning, growing, and sharing of
+ideas. It is imperative that we keep Sass a fun, welcoming, challenging, and
+fair place to play.
+
+[The full community guidelines can be found on the Sass website.][link]
+
+[link]: http://sass-lang.com/community-guidelines

data/VERSION

@@ -1 +1 @@
-3.4.15
+3.4.16

data/VERSION_DATE

@@ -1 +1 @@
-23 June 2015 00:43:28 UTC
+10 July 2015 23:22:27 UTC

data/lib/sass/scss/rx.rb

@@ -96,8 +96,13 @@ module Sass
 
       IMPORTANT = /!#{W}important/i
 
+      # A unit is like an IDENT, but disallows a hyphen followed by a digit.
+      # This allows "1px-2px" to be interpreted as subtraction rather than "1"
+      # with the unit "px-2px". It also allows "%".
+      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\d))*|%/
+
       UNITLESS_NUMBER = /(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?\d+)?/
-      NUMBER = /#{UNITLESS_NUMBER}(?:#{IDENT}|%)?/
+      NUMBER = /#{UNITLESS_NUMBER}(?:#{UNIT})?/
       PERCENTAGE = /#{UNITLESS_NUMBER}%/
 
       URI = /url\(#{W}(?:#{STRING}|#{URL})#{W}\)/i
@@ -123,11 +128,6 @@ module Sass
       OPTIONAL = /!#{W}optional/i
       IDENT_START = /-|#{NMSTART}/
 
-      # A unit is like an IDENT, but disallows a hyphen followed by a digit.
-      # This allows "1px-2px" to be interpreted as subtraction rather than "1"
-      # with the unit "px-2px". It also allows "%".
-      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\d))*|%/
-
       IDENT_HYPHEN_INTERP = /-(#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/

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

@@ -23,10 +23,13 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_children(parent)
     @tabs += 1
     return @format == :sass ? "\n" : " {}\n" if parent.children.empty?
+
+    res = visit_rule_level(parent.children)
+
     if @format == :sass
-      "\n"  + super.join.rstrip + "\n"
+      "\n"  + res.rstrip + "\n"
     else
-      " {\n" + super.join.rstrip + "\n#{ @tab_chars * (@tabs - 1)}}\n"
+      " {\n" + res.rstrip + "\n#{ @tab_chars * (@tabs - 1)}}\n"
     end
   ensure
     @tabs -= 1
@@ -34,20 +37,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   # Ensures proper spacing between top-level nodes.
   def visit_root(node)
-    Sass::Util.enum_cons(node.children + [nil], 2).map do |child, nxt|
-      visit(child) +
-        if nxt &&
-            (child.is_a?(Sass::Tree::CommentNode) &&
-              child.line + child.lines + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::ImportNode) && nxt.is_a?(Sass::Tree::ImportNode) &&
-              child.line + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
-              child.line + 1 == nxt.line)
-          ""
-        else
-          "\n"
-        end
-    end.join.rstrip + "\n"
+    visit_rule_level(node.children)
   end
 
   def visit_charset(node)
@@ -104,7 +94,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     res = "#{tab_str}#{interp_to_src(node.value)}"
     res.gsub!(/^@import \#\{(.*)\}([^}]*)$/, '@import \1\2')
     return res + "#{semi}\n" unless node.has_children
-    res + yield + "\n"
+    res + yield
   end
 
   def visit_each(node)
@@ -281,11 +271,30 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_keyframerule(node)
-    "#{tab_str}#{node.resolved_value}#{yield}\n"
+    "#{tab_str}#{node.resolved_value}#{yield}"
   end
 
   private
 
+  # Visit rule-level nodes and return their conversion with appropriate
+  # whitespace added.
+  def visit_rule_level(nodes)
+    Sass::Util.enum_cons(nodes + [nil], 2).map do |child, nxt|
+      visit(child) +
+        if nxt &&
+            (child.is_a?(Sass::Tree::CommentNode) && child.line + child.lines + 1 == nxt.line) ||
+            (child.is_a?(Sass::Tree::ImportNode) && nxt.is_a?(Sass::Tree::ImportNode) &&
+              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))
+          ""
+        else
+          "\n"
+        end
+    end.join.rstrip + "\n"
+  end
+
   def interp_to_src(interp)
     interp.map {|r| r.is_a?(String) ? r : r.to_sass(@options)}.join
   end

data/lib/sass/util.rb

@@ -571,6 +571,9 @@ module Sass
       return @listen_geq_2 unless @listen_geq_2.nil?
       @listen_geq_2 =
         begin
+          # Make sure we're loading listen/version from the same place that
+          # we're loading listen itself.
+          load_listen!
           require 'listen/version'
           version_geq(::Listen::VERSION, '2.0.0')
         rescue LoadError
@@ -1292,7 +1295,7 @@ module Sass
             require 'listen'
           rescue LoadError => e
             if version_geq(RUBY_VERSION, "1.9.3")
-              version_constraint = "~> 2.7"
+              version_constraint = "~> 3.0"
             else
               version_constraint = "~> 1.1"
             end

data/test/sass/conversion_test.rb

@@ -43,6 +43,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 foo bar {
@@ -50,6 +51,7 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
@@ -310,17 +312,21 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   bar: baz
+
   // bip bop
   // beep boop
   bang: bizz
+
   // bubble bubble
   // toil trouble
 SASS
 foo {
   bar: baz;
+
   // bip bop
   // beep boop
   bang: bizz;
+
   // bubble bubble
   // toil trouble
 }
@@ -329,10 +335,12 @@ SCSS
     assert_sass_to_scss <<SCSS, <<SASS
 foo {
   bar: baz;
+
   // bip bop
   // beep boop
   //   bap blimp
   bang: bizz;
+
   // bubble bubble
   // toil trouble
   //    gorp
@@ -340,10 +348,12 @@ foo {
 SCSS
 foo
   bar: baz
+
   // bip bop
      beep boop
        bap blimp
   bang: bizz
+
   // bubble bubble
     toil trouble
        gorp
@@ -443,17 +453,21 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   bar: baz
+
   /* bip bop
    * beep boop
   bang: bizz
+
   /* bubble bubble
    * toil trouble
 SASS
 foo {
   bar: baz;
+
   /* bip bop
    * beep boop */
   bang: bizz;
+
   /* bubble bubble
    * toil trouble */
 }
@@ -462,10 +476,12 @@ SCSS
     assert_sass_to_scss <<SCSS, <<SASS
 foo {
   bar: baz;
+
   /* bip bop
    * beep boop
    *   bap blimp */
   bang: bizz;
+
   /* bubble bubble
    * toil trouble
    *    gorp */
@@ -473,10 +489,12 @@ foo {
 SCSS
 foo
   bar: baz
+
   /* bip bop
      beep boop
        bap blimp
   bang: bizz
+
   /* bubble bubble
     toil trouble
        gorp
@@ -613,10 +631,12 @@ SASS
     assert_renders <<SASS, <<SCSS
 foo
   @debug 12px
+
   bar: baz
 SASS
 foo {
   @debug 12px;
+
   bar: baz;
 }
 SCSS
@@ -626,10 +646,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   @error "oh no!"
+
   bar: baz
 SASS
 foo {
   @error "oh no!";
+
   bar: baz;
 }
 SCSS
@@ -639,10 +661,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   @foo #bar "baz"
+
   bar: baz
 SASS
 foo {
   @foo #bar "baz";
+
   bar: baz;
 }
 SCSS
@@ -674,6 +698,7 @@ foo
   @foo #bar "baz"
     #blat
       a: b
+
     .bang
       c: d
       e: f
@@ -685,6 +710,7 @@ foo {
     #blat {
       a: b;
     }
+
     .bang {
       c: d;
       e: f;
@@ -701,11 +727,14 @@ SCSS
 foo
   @foo #bar "baz"
     g: h
+
     #blat
       a: b
+
     .bang
       c: d
       e: f
+
     i: j
 
   bar: baz
@@ -713,13 +742,16 @@ SASS
 foo {
   @foo #bar "baz" {
     g: h;
+
     #blat {
       a: b;
     }
+
     .bang {
       c: d;
       e: f;
     }
+
     i: j;
   }
 
@@ -741,6 +773,7 @@ SCSS
 foo
   @for $a from $b to $c
     a: b
+
   @for $c from 1 to 16
     d: e
     f: g
@@ -749,6 +782,7 @@ foo {
   @for $a from $b to $c {
     a: b;
   }
+
   @for $c from 1 to 16 {
     d: e;
     f: g;
@@ -762,6 +796,7 @@ SCSS
 foo
   @while flaz($a + $b)
     a: b
+
   @while 1
     d: e
     f: g
@@ -770,6 +805,7 @@ foo {
   @while flaz($a + $b) {
     a: b;
   }
+
   @while 1 {
     d: e;
     f: g;
@@ -783,6 +819,7 @@ SCSS
 foo
   @if $foo or $bar
     a: b
+
   @if $baz
     d: e
   @else if $bang
@@ -794,6 +831,7 @@ foo {
   @if $foo or $bar {
     a: b;
   }
+
   @if $baz {
     d: e;
   }
@@ -939,10 +977,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 .foo
   @extend .bar
+
   @extend .baz:bang
 SASS
 .foo {
   @extend .bar;
+
   @extend .baz:bang;
 }
 SCSS
@@ -1041,10 +1081,12 @@ SASS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar
+
   a: blip
 SASS
 foo {
   @include foo-bar;
+
   a: blip;
 }
 SCSS
@@ -1054,10 +1096,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz")
+
   a: blip
 SASS
 foo {
   @include foo-bar(12px, "blaz");
+
   a: blip;
 }
 SCSS
@@ -1067,12 +1111,16 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz", $blip: blap, $bloop: blop)
+
   +foo-bar($blip: blap, $bloop: blop)
+
   a: blip
 SASS
 foo {
   @include foo-bar(12px, "blaz", $blip: blap, $bloop: blop);
+
   @include foo-bar($blip: blap, $bloop: blop);
+
   a: blip;
 }
 SCSS
@@ -1082,10 +1130,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar($a-b_c: val)
+
   a: blip
 SASS
 foo {
   @include foo-bar($a-b_c: val);
+
   a: blip;
 }
 SCSS
@@ -1095,10 +1145,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @function foo()
   $var: 1 + 1
+
   @return $var
 SASS
 @function foo() {
   $var: 1 + 1;
+
   @return $var;
 }
 SCSS
@@ -1138,12 +1190,14 @@ $var1: 12px + 15px
 
 foo
   $var2: flaz(#abcdef)
+
   val: $var1 $var2
 SASS
 $var1: 12px + 15px;
 
 foo {
   $var2: flaz(#abcdef);
+
   val: $var1 $var2;
 }
 SCSS
@@ -1155,12 +1209,14 @@ $var1: 12px + 15px !default
 
 foo
   $var2: flaz(#abcdef) !default
+
   val: $var1 $var2
 SASS
 $var1: 12px + 15px !default;
 
 foo {
   $var2: flaz(#abcdef) !default;
+
   val: $var1 $var2;
 }
 SCSS
@@ -1428,7 +1484,9 @@ SCSS
 
 div {
   foo: under-scored-fn($under-scored-var + "before\#{$another-under-scored-var}after");
+
   @include under-scored-mixin($passed-arg);
+
   selector-\#{$under-scored-interp}: bold;
 }
 
@@ -1468,7 +1526,9 @@ $color: blue
 =context($class, $color: red)
   .\#{$class}
     background-color: $color
+
     @content
+
     border-color: $color
 
 +context(parent)
@@ -1480,7 +1540,9 @@ $color: blue;
 @mixin context($class, $color: red) {
   .\#{$class} {
     background-color: $color;
+
     @content;
+
     border-color: $color;
   }
 }
@@ -1565,6 +1627,7 @@ foo bar
     baz bang
         baz: bang
         bip: bop
+
     blat: boo
 SASS
 foo bar {
@@ -1572,6 +1635,7 @@ foo bar {
         baz: bang;
         bip: bop;
     }
+
     blat: boo;
 }
 SCSS
@@ -1581,6 +1645,7 @@ foo bar
 	baz bang
 		baz: bang
 		bip: bop
+
 	blat: boo
 SASS
 foo bar {
@@ -1588,6 +1653,7 @@ foo bar {
 		baz: bang;
 		bip: bop;
 	}
+
 	blat: boo;
 }
 SCSS
@@ -1598,6 +1664,7 @@ foo bar {
         baz: bang;
         bip: bop;
     }
+
     blat: boo;
 }
 SCSS
@@ -1605,6 +1672,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 
@@ -1614,6 +1682,7 @@ foo bar {
 		baz: bang;
 		bip: bop;
 	}
+
 	blat: boo;
 }
 SCSS
@@ -1621,6 +1690,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 
@@ -1629,6 +1699,7 @@ foo bar
     baz bang
         baz: bang
         bip: bop
+
     blat: boo
 SASS
 foo bar {
@@ -1636,6 +1707,7 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
@@ -1645,6 +1717,7 @@ foo bar
 	baz bang
 		baz: bang
 		bip: bop
+
 	blat: boo
 SASS
 foo bar {
@@ -1652,6 +1725,7 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
@@ -1678,6 +1752,7 @@ SCSS
 
 .foo
   +foo($list...)
+
   +bar(1, $list...)
 SASS
 @mixin foo($args...) {
@@ -1690,6 +1765,7 @@ SASS
 
 .foo {
   @include foo($list...);
+
   @include bar(1, $list...);
 }
 SCSS
@@ -1703,6 +1779,7 @@ SCSS
 
 .foo
   +foo($list..., $map...)
+
   +foo(pos, $list..., $kwd: val, $map...)
 SASS
 @mixin foo($a: b, $c: d) {
@@ -1712,6 +1789,7 @@ SASS
 
 .foo {
   @include foo($list..., $map...);
+
   @include foo(pos, $list..., $kwd: val, $map...);
 }
 SCSS
@@ -1770,6 +1848,7 @@ SCSS
   @at-root
     .bar
       a: b
+
     .baz
       c: d
 SASS
@@ -1778,6 +1857,7 @@ SASS
     .bar {
       a: b;
     }
+
     .baz {
       c: d;
     }
@@ -1852,10 +1932,13 @@ SCSS
   0%
     top: 0
     left: 0
+
   30%
     top: 50px
+
   68%, 72%
     left: 50px
+
   100%
     top: 100px
     left: 100%
@@ -1865,12 +1948,15 @@ SASS
     top: 0;
     left: 0;
   }
+
   30% {
     top: 50px;
   }
+
   68%, 72% {
     left: 50px;
   }
+
   100% {
     top: 100px;
     left: 100%;

data/test/sass/css2sass_test.rb

@@ -24,10 +24,13 @@ SASS
     assert_equal(<<SASS, css2sass(<<CSS))
 li
   display: none
+
   a
     text-decoration: none
+
     span
       color: yellow
+
     &:hover
       text-decoration: underline
 SASS
@@ -117,6 +120,7 @@ span.turkey
 
 #overhere
   bored: sorta
+
   /*                  it's for a good
    * cause
   better_than: thread_pools
@@ -168,12 +172,16 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 hello
   parent: true
+
   there
     parent: false
+
   who
     hoo: false
+
   why
     y: true
+
   when
     wen: nao
 
@@ -229,6 +237,7 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 \\:focus
   a: b
+
   \\:foo
     bar: baz
 SASS
@@ -243,14 +252,17 @@ CSS
   .bar!
     .baz
       a: b
+
     .bip
       c: d
+
   .bar .bonk
     e: f
 
 .flip!
   &.bar
     a: b
+
   &.baz
     c: d
 SASS
@@ -301,11 +313,13 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 ul
   width: 10px
+
   div
     width: 20px
 
 article
   width: 10px
+
   p
     width: 20px
 SASS
@@ -328,6 +342,7 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 a
   color: red
+
   > b
 SASS
 a {color: red}
@@ -378,6 +393,7 @@ CSS
 .foo >
   .bar
     a: b
+
   .baz
     c: d
 SASS
@@ -389,6 +405,7 @@ CSS
 .foo
   &::bar
     a: b
+
   &::baz
     c: d
 SASS

data/test/sass/scss/rx_test.rb

@@ -141,6 +141,10 @@ class ScssRxTest < MiniTest::Test
     assert_equal "foo\\00007fbar", Sass::SCSS::RX.escape_ident("foo\177bar")
   end
 
+  def test_no_static_hyphenated_units
+    assert_no_match STATIC_VALUE, "20px-20px"
+  end
+
   private
 
   def assert_match(rx, str)

data/test/sass/scss/scss_test.rb

@@ -457,6 +457,15 @@ foo {a: 1 + // flang }
 SCSS
   end
 
+  def test_static_hyphenated_unit
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: 0px; }
+CSS
+foo {a: 10px-10px }
+SCSS
+  end
+
   ## Nested Rules
 
   def test_nested_rules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.15
+  version: 3.4.16
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-10 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
@@ -67,7 +67,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
+- .yardopts
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - MIT-LICENSE
 - README.md
@@ -382,43 +383,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.4.5
+rubygems_version: 2.2.2
 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/superselector_test.rb
-- test/sass/logger_test.rb
-- test/sass/util_test.rb
+- test/sass/conversion_test.rb
 - test/sass/cache_test.rb
-- test/sass/encoding_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/css2sass_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/util_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/extend_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/scss/scss_test.rb
+- test/sass/logger_test.rb
+- test/sass/importer_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/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_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