sass 3.2.0.alpha.72 → 3.2.0.alpha.74

data/REVISION

@@ -1 +1 @@
-8a93d8c65baabeb6f3251d560095ff83b52308bf
+db51415a323a4fc284f38881ac839f3bbf5e7e31

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.72
+3.2.0.alpha.74

data/lib/sass/selector/simple_sequence.rb

@@ -61,7 +61,8 @@ module Sass
       #   by extending this selector with `extends`.
       # @see CommaSequence#do_extend
       def do_extend(extends, seen = Set.new)
-        extends.get(members.to_set).map do |seq, sels|
+        Sass::Util.group_by_to_a(extends.get(members.to_set)) {|seq, _| seq}.map do |seq, group|
+          sels = group.map {|_, s| s}.flatten
           # If A {@extend B} and C {...},
           # seq is A, sels is B, and self is C
 

data/lib/sass/util.rb

@@ -232,6 +232,29 @@ module Sass
       return hash.sort_by {|k, v| k}
     end
 
+    # Performs the equivalent of `enum.group_by.to_a`, but with a guaranteed
+    # order. Unlike [#hash_to_a], the resulting order isn't sorted key order;
+    # instead, it's the same order as `#group_by` has under Ruby 1.9 (key
+    # appearance order).
+    #
+    # @param enum [Enumerable]
+    # @return [Array<[Object, Array]>] An array of pairs.
+    def group_by_to_a(enum, &block)
+      return enum.group_by(&block).to_a unless ruby1_8?
+      order = {}
+      arr = []
+      enum.group_by do |e|
+        res = block[e]
+        unless order.include?(res)
+          order[res] = order.size
+        end
+        res
+      end.each do |key, vals|
+        arr[order[key]] = [key, vals]
+      end
+      arr
+    end
+
     # Returns information about the caller of the previous method.
     #
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string

data/test/sass/extend_test.rb

@@ -890,6 +890,17 @@ CSS
 SCSS
   end
 
+  def test_redundant_selector_elimination
+    assert_equal <<CSS, render(<<SCSS)
+.foo.bar, .x, .y {
+  a: b; }
+CSS
+.foo.bar {a: b}
+.x {@extend .foo, .bar}
+.y {@extend .foo, .bar}
+SCSS
+  end
+
   ## Long Extendees
 
   def test_long_extendee

data/test/sass/util_test.rb

@@ -120,6 +120,13 @@ class UtilTest < Test::Unit::TestCase
       lcs([-5, 3, 2, 8], [-4, 1, 8]) {|a, b| (a - b).abs <= 1 && [a, b].max})
   end
 
+  def test_group_by_to_a
+    assert_equal([[1, [1, 3, 5, 7]], [0, [2, 4, 6, 8]]],
+      group_by_to_a(1..8) {|i| i % 2})
+    assert_equal([[1, [1, 4, 7, 10]], [2, [2, 5, 8, 11]], [0, [3, 6, 9, 12]]],
+      group_by_to_a(1..12) {|i| i % 3})
+  end
+
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302989
+  hash: 592302985
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 72
-  version: 3.2.0.alpha.72
+  - 74
+  version: 3.2.0.alpha.74
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 -05:00
+date: 2012-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,6 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -163,6 +162,7 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/util.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb