sass 3.3.0.alpha.353 → 3.3.0.alpha.354

data/REVISION

@@ -1 +1 @@
-da2d3e225bd2eb195eef404a6dc5ae48e51b1fdc
+77ed5f71b755020c48ab0243b667a064b0510efb

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.353
+3.3.0.alpha.354

data/VERSION_DATE

@@ -1 +1 @@
-04 October 2013 22:23:30 GMT
+05 October 2013 01:29:09 GMT

data/lib/sass/selector.rb

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

data/lib/sass/selector/sequence.rb

@@ -464,7 +464,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
@@ -472,7 +472,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/test/sass/extend_test.rb

@@ -1151,6 +1151,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 {
@@ -1341,22 +1362,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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302543
+  hash: 592302537
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 353
-  version: 3.3.0.alpha.353
+  - 354
+  version: 3.3.0.alpha.354
 platform: ruby
 authors: 
 - Nathan Weizenbaum