sass 3.3.0.alpha.222 → 3.3.0.alpha.224

data/README.md

@@ -1,4 +1,4 @@
-# Sass
+# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS3,
 adding nested rules, variables, mixins, selector inheritance, and more.

data/REVISION

@@ -1 +1 @@
-0ef77dc0e3cff821aadca09aca98cac46354093d
+4dfbda0a8021961739f233828fef25363147c4f2

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.222
+3.3.0.alpha.224

data/VERSION_DATE

@@ -1 +1 @@
-30 July 2013 17:39:38 GMT
+06 August 2013 20:03:17 GMT

data/lib/sass/selector.rb

@@ -344,19 +344,19 @@ module Sass
     # A pseudoclass (e.g. `:visited`) or pseudoelement (e.g. `::first-line`) selector.
     # It can have arguments (e.g. `:nth-child(2n+1)`).
     class Pseudo < Simple
-      # The type of the selector.
-      # `:class` if this is a pseudoclass selector,
-      # `:element` if it's a pseudoelement.
+      # Some psuedo-class-syntax selectors are actually considered
+      # pseudo-elements and must be treated differently. This is a list of such
+      # selectors
       #
-      # @return [Symbol]
-      attr_reader :type
+      # @return [Array<String>]
+      ACTUALLY_ELEMENTS = %w[after before first-line first-letter]
 
-      # 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.
+      # Like \{#type}, but returns the type of selector this looks like, rather
+      # than the type it is semantically. This only differs from type for
+      # selectors in \{ACTUALLY\_ELEMENTS}.
       #
-      # @return [Array<String>]
-      FINAL_SELECTORS = %w[after before]
+      # @return [Symbol]
+      attr_reader :syntactic_type
 
       # The name of the selector.
       #
@@ -378,18 +378,22 @@ module Sass
       # @param arg [nil, Array<String, Sass::Script::Tree::Node>] The argument to the selector,
       #   or nil if no argument was given
       def initialize(type, name, arg)
-        @type = type
+        @syntactic_type = type
         @name = name
         @arg = arg
       end
 
-      def final?
-        type == :class && FINAL_SELECTORS.include?(name.first)
+      # The type of the selector. `:class` if this is a pseudoclass selector,
+      # `:element` if it's a pseudoelement.
+      #
+      # @return [Symbol]
+      def type
+        ACTUALLY_ELEMENTS.include?(name.first) ? :element : syntactic_type
       end
 
       # @see Selector#to_a
       def to_a
-        res = [@type == :class ? ":" : "::"] + @name
+        res = [syntactic_type == :class ? ":" : "::"] + @name
         (res << "(").concat(Sass::Util.strip_string_array(@arg)) << ")" if @arg
         res
       end
@@ -403,7 +407,6 @@ 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
 

data/lib/sass/selector/simple.rb

@@ -84,7 +84,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.final? || sels.last.type == :element)}
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.type == :element)}
           else
             sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(SelectorPseudoClass)}
           end

data/lib/sass/selector/simple_sequence.rb

@@ -42,11 +42,16 @@ module Sass
         @base ||= (members.first if members.first.is_a?(Element) || members.first.is_a?(Universal))
       end
 
-      # Returns the non-base selectors in this sequence.
+      def pseudo_elements
+        @pseudo_elements ||= (members - [base]).
+          select {|sel| sel.is_a?(Pseudo) && sel.type == :element}
+      end
+
+      # Returns the non-base, non-pseudo-class selectors in this sequence.
       #
       # @return [Set<Simple>]
       def rest
-        @rest ||= Set.new(base ? members[1..-1] : members)
+        @rest ||= Set.new(members - [base] - pseudo_elements)
       end
 
       # Whether or not this compound selector is the subject of the parent
@@ -151,7 +156,9 @@ module Sass
       # @param sseq [SimpleSequence]
       # @return [Boolean]
       def superselector?(sseq)
-        (base.nil? || base.eql?(sseq.base)) && rest.subset?(sseq.rest)
+        (base.nil? || base.eql?(sseq.base)) &&
+          pseudo_elements.eql?(sseq.pseudo_elements) &&
+          rest.subset?(sseq.rest)
       end
 
       # @see Simple#to_a
@@ -202,8 +209,8 @@ MESSAGE
       end
 
       def _eql?(other)
-        other.base.eql?(self.base) && Sass::Util.set_eql?(other.rest, self.rest) &&
-          other.subject? == self.subject?
+        other.base.eql?(self.base) && other.pseudo_elements == pseudo_elements &&
+          Sass::Util.set_eql?(other.rest, self.rest) && other.subject? == self.subject?
       end
     end
   end

data/test/sass/extend_test.rb

@@ -1116,6 +1116,41 @@ SCSS
 
   # Regression Tests
 
+  def test_pseudo_element_superselector
+    # Pseudo-elements shouldn't be removed in superselector calculations.
+    assert_equal <<CSS, render(<<SCSS)
+a#bar, a#bar::fblthp {
+  a: b; }
+CSS
+%x#bar {a: b} // Add an id to make the results have high specificity
+%y, %y::fblthp {@extend %x}
+a {@extend %y}
+SCSS
+
+    # Pseudo-classes can be removed when the second law allows.
+    assert_equal <<CSS, render(<<SCSS)
+a#bar {
+  a: b; }
+CSS
+%x#bar {a: b}
+%y, %y:fblthp {@extend %x}
+a {@extend %y}
+SCSS
+
+    # A few pseudo-elements can be written as pseudo-elements for historical
+    # reasons. See http://www.w3.org/TR/selectors4/#pseudo-elements.
+    %w[first-line first-letter before after].each do |pseudo|
+      assert_equal <<CSS, render(<<SCSS)
+a#bar, a#bar:#{pseudo} {
+  a: b; }
+CSS
+%x#bar {a: b}
+%y, %y:#{pseudo} {@extend %x}
+a {@extend %y}
+SCSS
+    end
+  end
+
   def test_nested_sibling_extend
     assert_equal <<CSS, render(<<SCSS)
 .parent .bar, .parent .foo {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302769
+  hash: 592302797
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 222
-  version: 3.3.0.alpha.222
+  - 224
+  version: 3.3.0.alpha.224
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-30 00:00:00 -04:00
+date: 2013-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,10 +193,10 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/util/test.rb
 - lib/sass/util/normalized_map.rb
 - lib/sass/util/ordered_hash.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/util/test.rb
 - lib/sass/version.rb
 - lib/sass/features.rb
 - bin/sass
@@ -209,8 +209,8 @@ files:
 - test/sass/engine_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/data/hsl-rgb.txt
-- test/sass/extend_test.rb
 - test/sass/exec_test.rb
+- test/sass/extend_test.rb
 - test/sass/importer_test.rb
 - test/sass/fixtures/test_staleness_check_across_importers.css
 - test/sass/fixtures/test_staleness_check_across_importers.scss
@@ -318,8 +318,8 @@ files:
 - test/sass/templates/warn_imported.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/subset_map_test.rb
 - test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
 - test/sass/source_map_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
@@ -377,8 +377,8 @@ test_files:
 - test/sass/conversion_test.rb
 - test/sass/engine_test.rb
 - test/sass/css2sass_test.rb
-- test/sass/extend_test.rb
 - test/sass/exec_test.rb
+- test/sass/extend_test.rb
 - test/sass/importer_test.rb
 - test/sass/functions_test.rb
 - test/sass/plugin_test.rb
@@ -391,6 +391,6 @@ test_files:
 - test/sass/scss/scss_test.rb
 - test/sass/compiler_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/subset_map_test.rb
 - test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
 - test/sass/source_map_test.rb