sass 3.2.11 → 3.2.12

data/VERSION

@@ -1 +1 @@
-3.2.11
+3.2.12

data/VERSION_DATE

@@ -1 +1 @@
-28 September 2013 01:15:19 UTC
+05 October 2013 01:29:11 UTC

data/lib/sass/plugin/staleness_checker.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Sass
   module Plugin
     # The class handles `.s[ca]ss` file staleness checks via their mtime timestamps.

data/lib/sass/selector.rb

@@ -120,7 +120,7 @@ module Sass
 
       # @see AbstractSequence#specificity
       def specificity
-        0
+        SPECIFICITY_BASE
       end
     end
 

data/lib/sass/selector/sequence.rb

@@ -450,7 +450,7 @@ module Sass
         # separate sequences should limit the quadratic behavior.
         seqses.each_with_index do |seqs1, i|
           result[i] = seqs1.reject do |seq1|
-            min_spec = _sources(seq1).map {|seq| seq.specificity}.min || 0
+            max_spec = _sources(seq1).map {|seq| seq.specificity}.max || 0
             result.any? do |seqs2|
               next if seqs1.equal?(seqs2)
               # Second Law of Extend: the specificity of a generated selector
@@ -458,7 +458,7 @@ module Sass
               # selector.
               #
               # See https://github.com/nex3/sass/issues/324.
-              seqs2.any? {|seq2| _specificity(seq2) >= min_spec && _superselector?(seq2, seq1)}
+              seqs2.any? {|seq2| _specificity(seq2) >= max_spec && _superselector?(seq2, seq1)}
             end
           end
         end

data/lib/sass/util.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'enumerator'
 require 'stringio'
 require 'rbconfig'
+require 'thread'
 
 require 'sass/root'
 require 'sass/util/subset_map'

data/test/sass/extend_test.rb

@@ -1207,6 +1207,27 @@ SCSS
     end
   end
 
+  def test_multiple_source_redundancy_elimination
+    assert_equal <<CSS, render(<<SCSS)
+.test-case, .test-case:active {
+  color: red; }
+
+.test-case:hover {
+  color: green; }
+CSS
+%default-color {color: red}
+%alt-color {color: green}
+
+%default-style {
+  @extend %default-color;
+  &:hover {@extend %alt-color}
+  &:active {@extend %default-color}
+}
+
+.test-case {@extend %default-style}
+SCSS
+  end
+
   def test_nested_sibling_extend
     assert_equal <<CSS, render(<<SCSS)
 .parent .bar, .parent .foo {
@@ -1397,22 +1418,22 @@ SCSS
 
   def test_extend_cross_branch_redundancy_elimination
     assert_equal <<CSS, render(<<SCSS)
-a c d, b c a d {
+.a .c .d, .b .c .a .d {
   a: b; }
 CSS
-%x c %y {a: b}
-a, b {@extend %x}
-a d {@extend %y}
+%x .c %y {a: b}
+.a, .b {@extend %x}
+.a .d {@extend %y}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-e a c d, a c e d, e b c a d, b c a e d {
+.e .a .c .d, .a .c .e .d, .e .b .c .a .d, .b .c .a .e .d {
   a: b; }
 CSS
-e %z {a: b}
-%x c %y {@extend %z}
-a, b {@extend %x}
-a d {@extend %y}
+.e %z {a: b}
+%x .c %y {@extend %z}
+.a, .b {@extend %x}
+.a .d {@extend %y}
 SCSS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.11
+  version: 3.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard