sass 3.2.0.alpha.56 → 3.2.0.alpha.57

data/REVISION

@@ -1 +1 @@
-ade170e613352cd597338cf29e865d98e8316f9b
+a9d57b52dc7bfa8a777cf22d6ca36645855757ce

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.56
+3.2.0.alpha.57

data/lib/sass/selector.rb

@@ -308,6 +308,13 @@ module Sass
       # @return [Symbol]
       attr_reader :type
 
+      # Some psuedo-class-syntax selectors (`:after` and `:before)
+      # are actually considered pseudo-elements
+      # and must be at the end of the selector to function properly.
+      #
+      # @return [Array<String>]
+      FINAL_SELECTORS = %w[after before]
+
       # The name of the selector.
       #
       # @return [Array<String, Sass::Script::Node>]
@@ -333,6 +340,10 @@ module Sass
         @arg = arg
       end
 
+      def final?
+        type == :class && FINAL_SELECTORS.include?(name.first)
+      end
+
       # @see Selector#to_a
       def to_a
         res = [@type == :class ? ":" : "::"] + @name
@@ -340,8 +351,8 @@ module Sass
         res
       end
 
-      # Returns `nil` if this is a pseudoclass selector
-      # and `sels` contains a pseudoclass selector different than this one.
+      # Returns `nil` if this is a pseudoelement selector
+      # and `sels` contains a pseudoelement selector different than this one.
       #
       # @see Selector#unify
       def unify(sels)
@@ -349,6 +360,7 @@ module Sass
           sel.is_a?(Pseudo) && sel.type == :element &&
             (sel.name != self.name || sel.arg != self.arg)
         end
+        return sels + [self] if final?
         super
       end
     end

data/lib/sass/selector/simple.rb

@@ -79,7 +79,7 @@ module Sass
         sels_with_ix = Sass::Util.enum_with_index(sels)
         _, i =
           if self.is_a?(Pseudo) || self.is_a?(SelectorPseudoClass)
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && sels.last.type == :element}
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.final? || sels.last.type == :element)}
           else
             sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(SelectorPseudoClass)}
           end

data/test/sass/extend_test.rb

@@ -741,6 +741,22 @@ SCSS
 CSS
 :foo.baz {a: b}
 :bar {@extend .baz}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.baz:foo, :foo:after {
+  a: b; }
+CSS
+.baz:foo {a: b}
+:after {@extend .baz}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.baz:after, :foo:after {
+  a: b; }
+CSS
+.baz:after {a: b}
+:foo {@extend .baz}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302957
+  hash: 592302959
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 56
-  version: 3.2.0.alpha.56
+  - 57
+  version: 3.2.0.alpha.57
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 -05:00
+date: 2012-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,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
@@ -162,6 +161,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