sass 3.2.0.alpha.247 → 3.2.0.alpha.258

data/REVISION

@@ -1 +1 @@
-5cc7590756da94e5c6df3da3be9ca8ff946d7279
+77bf74d8fe5dc1ee1301f5e06676ae8581ddfd73

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.247
+3.2.0.alpha.258

data/lib/sass/css.rb

@@ -82,6 +82,7 @@ module Sass
       nest_seqs          root
       parent_ref_rules   root
       flatten_rules      root
+      bubble_subject     root
       fold_commas        root
       dump_selectors     root
       root
@@ -212,14 +213,16 @@ module Sass
         firsts, rest = [sseq.members.first], sseq.members[1..-1]
         firsts.push rest.shift if firsts.first.is_a?(Sass::Selector::Parent)
 
-        if current_rule.nil? || first_sseq(current_rule).members != firsts
+        last_simple_subject = rest.empty? && sseq.subject?
+        if current_rule.nil? || first_sseq(current_rule).members != firsts ||
+            !!first_sseq(current_rule).subject? != !!last_simple_subject
           current_rule = Tree::RuleNode.new([])
-          current_rule.parsed_rules = make_sseq(*firsts)
+          current_rule.parsed_rules = make_sseq(last_simple_subject, *firsts)
         end
 
         unless rest.empty?
           rest.unshift Sass::Selector::Parent.new
-          child.parsed_rules = make_sseq(*rest)
+          child.parsed_rules = make_sseq(sseq.subject?, *rest)
           current_rule << child
         else
           current_rule.children += child.children
@@ -287,6 +290,19 @@ module Sass
       flatten_rules(rule)
     end
 
+    def bubble_subject(root)
+      root.children.each do |child|
+        bubble_subject(child) if child.is_a?(Tree::RuleNode) || child.is_a?(Tree::DirectiveNode)
+        next unless child.is_a?(Tree::RuleNode)
+        next unless child.children.all? do |c|
+          next unless c.is_a?(Tree::RuleNode)
+          first_simple_sel(c).is_a?(Sass::Selector::Parent) && first_sseq(c).subject?
+        end
+        first_sseq(child).subject = true
+        child.children.each {|c| first_sseq(c).subject = false}
+      end
+    end
+
     # Transform
     #
     #     foo
@@ -355,10 +371,11 @@ module Sass
     # {Sass::Selector::Sequence} which in turn contains only a single
     # {Sass::Selector::SimpleSequence}.
     #
+    # @param subject [Boolean] Whether this is a subject selector
     # @param sseqs [Array<Sass::Selector::Sequence, String>]
     # @return [Sass::Selector::CommaSequence]
-    def make_sseq(*sseqs)
-      make_seq(Sass::Selector::SimpleSequence.new(sseqs))
+    def make_sseq(subject, *sseqs)
+      make_seq(Sass::Selector::SimpleSequence.new(sseqs, subject))
     end
 
     # Return the first {Sass::Selector::Sequence} in a {Sass::Tree::RuleNode}.

data/lib/sass/script/functions.rb

@@ -144,6 +144,9 @@ module Sass::Script
   # \{#join join($list1, $list2, \[$separator\])}
   # : Joins together two lists into one.
   #
+  # \{#append append($list1, $val, \[$separator\])}
+  # : Appends a single value onto the end of a list.
+  #
   # ## Introspection Functions
   #
   # \{#type_of type-of($value)}
@@ -582,7 +585,10 @@ module Sass::Script
         return Sass::Script::String.new("alpha(#{args.map {|a| a.to_s}.join(", ")})")
       end
 
-      opacity(*args)
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1)") if args.size != 1
+
+      assert_type args.first, :Color
+      Sass::Script::Number.new(args.first.alpha)
     end
     declare :alpha, [:color]
 
@@ -595,6 +601,7 @@ module Sass::Script
     # @see #transparentize
     # @raise [ArgumentError] If `color` isn't a color
     def opacity(color)
+      return Sass::Script::String.new("opacity(#{color})") if color.is_a?(Sass::Script::Number)
       assert_type color, :Color
       Sass::Script::Number.new(color.alpha)
     end
@@ -685,16 +692,21 @@ module Sass::Script
     # @example
     #   saturate(hsl(120, 30%, 90%), 20%) => hsl(120, 50%, 90%)
     #   saturate(#855, 20%) => #9e3f3f
-    # @param color [Color]
-    # @param amount [Number]
-    # @return [Color]
-    # @see #desaturate
-    # @raise [ArgumentError] If `color` isn't a color,
-    #   or `number` isn't a number between 0% and 100%
-    def saturate(color, amount)
+    # @overload saturate(color, amount)
+    #   @param color [Color]
+    #   @param amount [Number]
+    #   @return [Color]
+    #   @see #desaturate
+    #   @raise [ArgumentError] If `color` isn't a color,
+    #     or `number` isn't a number between 0% and 100%
+    def saturate(color, amount = nil)
+      # Support the filter effects definition of saturate.
+      # https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html
+      return Sass::Script::String.new("saturate(#{color})") if amount.nil?
       _adjust(color, amount, :saturation, 0..100, :+, "%")
     end
     declare :saturate, [:color, :amount]
+    declare :saturate, [:amount]
 
     # Makes a color less saturated.
     # Takes a color and an amount between 0% and 100%,
@@ -995,21 +1007,13 @@ module Sass::Script
     declare :mix, [:color_1, :color_2]
     declare :mix, [:color_1, :color_2, :weight]
 
-    # @overload grayscale(color)
-    #   Converts a color to grayscale.
-    #   This is identical to `desaturate(color, 100%)`.
-    #
-    #   @param color [Color]
-    #   @return [Color]
-    #   @raise [ArgumentError] if `color` isn't a color
-    #   @see #desaturate
-    # @overload grayscale(number)
-    #   Returns an unquoted string `grayscale(number)`, as though the function
-    #   were not defined. This is for the `grayscale` function used in
-    #   `-webkit-filter`.
+    # Converts a color to grayscale.
+    # This is identical to `desaturate(color, 100%)`.
     #
-    #   @param number [Number]
-    #   @return [Sass::Script::String]
+    # @param color [Color]
+    # @return [Color]
+    # @raise [ArgumentError] if `color` isn't a color
+    # @see #desaturate
     def grayscale(color)
       return Sass::Script::String.new("grayscale(#{color})") if color.is_a?(Sass::Script::Number)
       desaturate color, Number.new(100)
@@ -1035,6 +1039,8 @@ module Sass::Script
     # @return [Color]
     # @raise [ArgumentError] if `color` isn't a color
     def invert(color)
+      return Sass::Script::String.new("invert(#{color})") if color.is_a?(Sass::Script::Number)
+
       assert_type color, :Color
       color.with(
         :red => (255 - color.red),
@@ -1328,14 +1334,14 @@ module Sass::Script
     #   append(10px 20px, 30px) => 10px 20px 30px
     #   append((blue, red), green) => blue, red, green
     #   append(10px 20px, 30px 40px) => 10px 20px (30px 40px)
-    #   join(10px, 20px, comma) => 10px, 20px
-    #   join((blue, red), green, space) => blue red green
-    # @overload join(list, val, separator: auto)
-    #   @param list1 [Literal] The first list to join
-    #   @param list2 [Literal] The second list to join
+    #   append(10px, 20px, comma) => 10px, 20px
+    #   append((blue, red), green, space) => blue red green
+    # @overload append(list, val, separator: auto)
+    #   @param list [Literal] The list to add the value to
+    #   @param val [Literal] The value to add to the end of the list
     #   @param separator [String] How the list separator (comma or space) should be determined.
     #     If this is `comma` or `space`, that is always the separator;
-    #     if this is `auto` (the default), the separator is determined as explained above.
+    #     if this is `auto` (the default), the separator is the same as that used by the list.
     def append(list, val, separator = Sass::Script::String.new("auto"))
       assert_type separator, :String
       unless %w[auto space comma].include?(separator.value)

data/lib/sass/script/operation.rb

@@ -82,7 +82,7 @@ module Sass::Script
 
       literal2 = @operand2.perform(environment)
 
-      if literal1.is_a?(Null) || literal2.is_a?(Null)
+      if (literal1.is_a?(Null) || literal2.is_a?(Null)) && @operator != :eq && @operator != :neq
         raise Sass::SyntaxError.new("Invalid null operation: \"#{literal1.inspect} #{@operator} #{literal2.inspect}\".")
       end
 

data/lib/sass/scss/parser.rb

@@ -541,7 +541,7 @@ module Sass
       end
 
       # This is a nasty hack, and the only place in the parser
-      # that requires backtracking.
+      # that requires a large amount of backtracking.
       # The reason is that we can't figure out if certain strings
       # are declarations or rulesets with fixed finite lookahead.
       # For example, "foo:bar baz baz baz..." could be either a property
@@ -631,19 +631,31 @@ module Sass
       end
 
       def combinator
-        tok(PLUS) || tok(GREATER) || tok(TILDE)
+        tok(PLUS) || tok(GREATER) || tok(TILDE) || reference_combinator
+      end
+
+      def reference_combinator
+        return unless tok(/\//)
+        res = ['/']
+        ns, name = expr!(:qualified_name)
+        res << ns << '|' if ns
+        res << name << tok!(/\//)
+        res = res.flatten
+        res = res.join '' if res.all? {|e| e.is_a?(String)}
+        res
       end
 
       def simple_selector_sequence
-        # This allows for stuff like http://www.w3.org/TR/css3-animations/#keyframes-
+        # Returning expr by default allows for stuff like
+        # http://www.w3.org/TR/css3-animations/#keyframes-
         return expr(!:allow_var) unless e = element_name || id_selector ||
-          class_selector || placeholder_selector || attrib || negation ||
-          pseudo || parent_selector || interpolation_selector
+          class_selector || placeholder_selector || attrib || pseudo ||
+          parent_selector || interpolation_selector
         res = [e]
 
         # The tok(/\*/) allows the "E*" hack
         while v = id_selector || class_selector || placeholder_selector || attrib ||
-            negation || pseudo || interpolation_selector ||
+            pseudo || interpolation_selector ||
             (tok(/\*/) && Selector::Universal.new(nil))
           res << v
         end
@@ -664,7 +676,7 @@ module Sass
           end
         end
 
-        Selector::SimpleSequence.new(res)
+        Selector::SimpleSequence.new(res, tok(/!/))
       end
 
       def parent_selector
@@ -691,12 +703,8 @@ module Sass
       end
 
       def element_name
-        return unless name = interp_ident || tok(/\*/) || (tok?(/\|/) && "")
-        if tok(/\|/)
-          @expected = "element name or *"
-          ns = name
-          name = interp_ident || tok!(/\*/)
-        end
+        ns, name = qualified_name(:allow_star_name)
+        return unless ns || name
 
         if name == '*'
           Selector::Universal.new(merge(ns))
@@ -705,6 +713,15 @@ module Sass
         end
       end
 
+      def qualified_name(allow_star_name=false)
+        return unless name = interp_ident || tok(/\*/) || (tok?(/\|/) && "")
+        return nil, name unless tok(/\|/)
+
+        return name, expr!(:interp_ident) unless allow_star_name
+        @expected = "identifier or *"
+        return name, interp_ident || tok!(/\*/)
+      end
+
       def interpolation_selector
         return unless script = interpolation
         Selector::Interpolation.new(script)
@@ -727,9 +744,10 @@ module Sass
           val = interp_ident || expr!(:interp_string)
           ss
         end
+        flags = interp_ident || interp_string
         tok!(/\]/)
 
-        Selector::Attribute.new(merge(name), merge(ns), op, merge(val))
+        Selector::Attribute.new(merge(name), merge(ns), op, merge(val), merge(flags))
       end
 
       def attrib_name!
@@ -756,32 +774,53 @@ module Sass
         name = expr!(:interp_ident)
         if tok(/\(/)
           ss
-          arg = expr!(:pseudo_expr)
+          arg = expr!(:pseudo_arg)
+          while tok(/,/)
+            arg << ',' << str{ss}
+            arg.concat expr!(:pseudo_arg)
+          end
           tok!(/\)/)
         end
         Selector::Pseudo.new(s == ':' ? :class : :element, merge(name), merge(arg))
       end
 
+      def pseudo_arg
+        # In the CSS spec, every pseudo-class/element either takes a pseudo
+        # expression or a selector comma sequence as an argument. However, we
+        # don't want to have to know which takes which, so we handle both at
+        # once.
+        #
+        # However, there are some ambiguities between the two. For instance, "n"
+        # could start a pseudo expression like "n+1", or it could start a
+        # selector like "n|m". In order to handle this, we must regrettably
+        # backtrack.
+        expr, sel = nil
+        pseudo_err = catch_error do
+          expr = pseudo_expr
+          next if tok?(/[,)]/)
+          expr = nil
+          expected '")"'
+        end
+
+        return expr if expr
+        sel_err = catch_error {sel = selector}
+        return sel if sel
+        rethrow pseudo_err if pseudo_err
+        rethrow sel_err if sel_err
+        return
+      end
+
       def pseudo_expr
-        return unless e = tok(PLUS) || tok(/-/) || tok(NUMBER) ||
+        return unless e = tok(PLUS) || tok(/[-*]/) || tok(NUMBER) ||
           interp_string || tok(IDENT) || interpolation
         res = [e, str{ss}]
-        while e = tok(PLUS) || tok(/-/) || tok(NUMBER) ||
+        while e = tok(PLUS) || tok(/[-*]/) || tok(NUMBER) ||
             interp_string || tok(IDENT) || interpolation
           res << e << str{ss}
         end
         res
       end
 
-      def negation
-        return unless name = tok(NOT) || tok(ANY)
-        ss
-        @expected = "selector"
-        sel = selector_comma_sequence
-        tok!(/\)/)
-        Selector::SelectorPseudoClass.new(name[1...-1], sel)
-      end
-
       def declaration
         # This allows the "*prop: val", ":prop: val", and ".prop: val" hacks
         if s = tok(/[:\*\.]|\#(?!\{)/)
@@ -980,12 +1019,12 @@ MESSAGE
       EXPR_NAMES = {
         :media_query => "media query (e.g. print, screen, print and screen)",
         :media_expr => "media expression (e.g. (min-device-width: 800px))",
-        :pseudo_expr => "expression (e.g. fr, 2n+1)",
+        :pseudo_arg => "expression (e.g. fr, 2n+1)",
         :interp_ident => "identifier",
         :interp_name => "identifier",
+        :qualified_name => "identifier",
         :expr => "expression (e.g. 1px, bold)",
         :_selector => "selector",
-        :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
         :import_arg => "file to import (string or url())",
         :moz_document_function => "matching function (e.g. url-prefix(), domain())",
@@ -1041,7 +1080,7 @@ MESSAGE
         pos = @scanner.pos
         line = @line
         expected = @expected
-        if catch(:_sass_parser_error, &block)
+        if catch(:_sass_parser_error) {yield; false}
           @scanner.pos = pos
           @line = line
           @expected = expected

data/lib/sass/selector.rb

@@ -309,15 +309,22 @@ module Sass
       # @return [Array<String, Sass::Script::Node>]
       attr_reader :value
 
+      # Flags for the attribute selector (e.g. `i`).
+      #
+      # @return [Array<String, Sass::Script::Node>]
+      attr_reader :flags
+
       # @param name [Array<String, Sass::Script::Node>] The attribute name
       # @param namespace [Array<String, Sass::Script::Node>, nil] See \{#namespace}
       # @param operator [String] The matching operator, e.g. `"="` or `"^="`
       # @param value [Array<String, Sass::Script::Node>] See \{#value}
-      def initialize(name, namespace, operator, value)
+      # @param value [Array<String, Sass::Script::Node>] See \{#flags}
+      def initialize(name, namespace, operator, value, flags)
         @name = name
         @namespace = namespace
         @operator = operator
         @value = value
+        @flags = flags
       end
 
       # @see Selector#to_a
@@ -326,6 +333,7 @@ module Sass
         res.concat(@namespace) << "|" if @namespace
         res.concat @name
         (res << @operator).concat @value if @value
+        (res << " ").concat @flags if @flags
         res << "]"
       end
 

data/lib/sass/selector/sequence.rb

@@ -24,17 +24,16 @@ module Sass
         filename
       end
 
-      # The array of {SimpleSequence simple selector sequences}, operators, and newlines.
-      # The operators are strings such as `"+"` and `">"`
-      # representing the corresponding CSS operators.
-      # Newlines are also newline strings;
-      # these aren't semantically relevant,
-      # but they do affect formatting.
+      # The array of {SimpleSequence simple selector sequences}, operators, and
+      # newlines. The operators are strings such as `"+"` and `">"` representing
+      # the corresponding CSS operators, or interpolated SassScript. Newlines
+      # are also newline strings; these aren't semantically relevant, but they
+      # do affect formatting.
       #
-      # @return [Array<SimpleSequence, String>]
+      # @return [Array<SimpleSequence, String|Array<Sass::Tree::Node, String>>]
       attr_reader :members
 
-      # @param seqs_and_ops [Array<SimpleSequence, String>] See \{#members}
+      # @param seqs_and_ops [Array<SimpleSequence, String|Array<Sass::Tree::Node, String>>] See \{#members}
       def initialize(seqs_and_ops)
         @members = seqs_and_ops
       end
@@ -54,7 +53,7 @@ module Sass
           end
           members = []
           members << nl if nl
-          members << SimpleSequence.new([Parent.new])
+          members << SimpleSequence.new([Parent.new], false)
           members += @members
         end
 
@@ -198,7 +197,7 @@ module Sass
         diff += fin.map {|sel| sel.is_a?(Array) ? sel : [sel]}
         diff.reject! {|c| c.empty?}
 
-        Sass::Util.paths(diff).map {|p| p.flatten}
+        Sass::Util.paths(diff).map {|p| p.flatten}.reject {|p| path_has_two_subjects?(p)}
       end
 
       # Extracts initial selector combinators (`"+"`, `">"`, `"~"`, and `"\n"`)
@@ -272,7 +271,7 @@ module Sass
             elsif sel2.superselector?(sel1)
               res.unshift sel1, '~'
             else
-              merged = sel1.unify(sel2.members)
+              merged = sel1.unify(sel2.members, sel2.subject?)
               res.unshift [
                 [sel1, '~', sel2, '~'],
                 [sel2, '~', sel1, '~'],
@@ -289,7 +288,7 @@ module Sass
             if tilde_sel.superselector?(plus_sel)
               res.unshift plus_sel, '+'
             else
-              merged = plus_sel.unify(tilde_sel.members)
+              merged = plus_sel.unify(tilde_sel.members, tilde_sel.subject?)
               res.unshift [
                 [tilde_sel, '~', plus_sel, '+'],
                 ([merged, '+'] if merged)
@@ -302,7 +301,7 @@ module Sass
             res.unshift sel1, op1
             seq2.push sel2, op2
           elsif op1 == op2
-            return unless merged = sel1.unify(sel2.members)
+            return unless merged = sel1.unify(sel2.members, sel2.subject?)
             res.unshift merged, op1
           else
             # Unknown selector combinators can't be unified
@@ -422,7 +421,7 @@ module Sass
       # @param seq2 [Array<SimpleSequence or String>]
       # @return [Boolean]
       def parent_superselector?(seq1, seq2)
-        base = Sass::Selector::SimpleSequence.new([Sass::Selector::Placeholder.new('<temp>')])
+        base = Sass::Selector::SimpleSequence.new([Sass::Selector::Placeholder.new('<temp>')], false)
         _superselector?(seq1 + [base], seq2 + [base])
       end
 
@@ -467,6 +466,17 @@ module Sass
 
       private
 
+      def path_has_two_subjects?(path)
+        subject = false
+        path.each do |sseq_or_op|
+          next unless sseq_or_op.is_a?(SimpleSequence)
+          next unless sseq_or_op.subject?
+          return true if subject
+          subject = true
+        end
+        false
+      end
+
       def _sources(seq)
         s = Set.new
         seq.map {|sseq_or_op| s.merge sseq_or_op.sources if sseq_or_op.is_a?(SimpleSequence)}

data/lib/sass/selector/simple_sequence.rb

@@ -26,6 +26,9 @@ module Sass
       # @return {Set<Sequence>}
       attr_accessor :sources
 
+      # @see \{#subject?}
+      attr_writer :subject
+
       # Returns the element or universal selector in this sequence,
       # if it exists.
       #
@@ -41,10 +44,21 @@ module Sass
         @rest ||= Set.new(base ? members[1..-1] : members)
       end
 
+      # Whether or not this compound selector is the subject of the parent
+      # selector; that is, whether it is prepended with `$` and represents the
+      # actual element that will be selected.
+      #
+      # @return [Boolean]
+      def subject?
+        @subject
+      end
+
       # @param selectors [Array<Simple>] See \{#members}
+      # @param subject [Boolean] See \{#subject?}
       # @param sources [Set<Sequence>]
-      def initialize(selectors, sources = Set.new)
+      def initialize(selectors, subject, sources = Set.new)
         @members = selectors
+        @subject = subject
         @sources = sources
       end
 
@@ -66,7 +80,7 @@ module Sass
         end
 
         super_seq.members[0...-1] +
-          [SimpleSequence.new(super_seq.members.last.members + @members[1..-1])]
+          [SimpleSequence.new(super_seq.members.last.members + @members[1..-1], subject?)]
       end
 
       # Non-destrucively extends this selector with the extensions specified in a hash
@@ -88,7 +102,7 @@ module Sass
           # seq is A, sels is B, and self is C
 
           self_without_sel = self.members - sels
-          next unless unified = seq.members.last.unify(self_without_sel)
+          next unless unified = seq.members.last.unify(self_without_sel, subject?)
           next if group.map {|e, _| check_directives_match!(e, parent_directives)}.none?
           new_seq = Sequence.new(seq.members[0...-1] + [unified])
           new_seq.add_sources!(sources + [seq])
@@ -103,6 +117,7 @@ module Sass
       # that matches both this selector and the input selector.
       #
       # @param sels [Array<Simple>] A {SimpleSequence}'s {SimpleSequence#members members array}
+      # @param subject [Boolean] Whether the {SimpleSequence} being merged is a subject.
       # @return [SimpleSequence, nil] A {SimpleSequence} matching both `sels` and this selector,
       #   or `nil` if this is impossible (e.g. unifying `#foo` and `#bar`)
       # @raise [Sass::SyntaxError] If this selector cannot be unified.
@@ -111,12 +126,12 @@ module Sass
       #   Since these selectors should be resolved
       #   by the time extension and unification happen,
       #   this exception will only ever be raised as a result of programmer error
-      def unify(sels)
+      def unify(sels, other_subject)
         return unless sseq = members.inject(sels) do |sseq, sel|
           return unless sseq
           sel.unify(sseq)
         end
-        SimpleSequence.new(sseq)
+        SimpleSequence.new(sseq, other_subject || subject?)
       end
 
       # Returns whether or not this selector matches all elements
@@ -133,7 +148,9 @@ module Sass
 
       # @see Simple#to_a
       def to_a
-        @members.map {|sel| sel.to_a}.flatten
+        res = @members.map {|sel| sel.to_a}.flatten
+        res << '!' if subject?
+        res
       end
 
       # Returns a string representation of the sequence.
@@ -178,7 +195,8 @@ WARNING
       end
 
       def _eql?(other)
-        other.base.eql?(self.base) && Sass::Util.set_eql?(other.rest, self.rest)
+        other.base.eql?(self.base) && Sass::Util.set_eql?(other.rest, self.rest) &&
+          other.subject? == self.subject?
       end
     end
   end

data/lib/sass/tree/visitors/to_css.rb

@@ -214,7 +214,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       rule.resolved_rules = Sass::Selector::CommaSequence.new(
         [Sass::Selector::Sequence.new(
             [Sass::Selector::SimpleSequence.new(
-                [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)])
+                [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)],
+                false)
             ])
         ])
       prop = Sass::Tree::PropNode.new([""], Sass::Script::String.new(''), :new)

data/lib/sass/util.rb

@@ -462,9 +462,9 @@ module Sass
     # Like `Dir.glob`, but works with backslash-separated paths on Windows.
     #
     # @param path [String]
-    def glob(path)
+    def glob(path, &block)
       path = path.gsub('\\', '/') if windows?
-      Dir.glob(path)
+      Dir.glob(path, &block)
     end
 
     ## Cross-Ruby-Version Compatibility

data/test/sass/conversion_test.rb

@@ -74,10 +74,17 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo \#{$bar + "baz"}.bip
   baz: bang
+
+foo /\#{$bar + "baz"}/ .bip
+  baz: bang
 SASS
 foo \#{$bar + "baz"}.bip {
   baz: bang;
 }
+
+foo /\#{$bar + "baz"}/ .bip {
+  baz: bang;
+}
 SCSS
   end
 
@@ -1403,6 +1410,28 @@ SASS
 SCSS
   end
 
+  def test_reference_selector
+    assert_renders(<<SASS, <<SCSS)
+foo /bar|baz/ bang
+  a: b
+SASS
+foo /bar|baz/ bang {
+  a: b;
+}
+SCSS
+  end
+
+  def test_subject
+    assert_renders(<<SASS, <<SCSS)
+foo bar! baz
+  a: b
+SASS
+foo bar! baz {
+  a: b;
+}
+SCSS
+  end
+
   def test_placeholder_interoplation_conversion
     assert_renders(<<SASS, <<SCSS)
 $foo: foo
@@ -1523,7 +1552,6 @@ foo bar {
 SCSS
   end
 
-
   ## Regression Tests
 
   def test_empty_lists

data/test/sass/css2sass_test.rb

@@ -237,6 +237,32 @@ SASS
 CSS
   end
 
+  def test_subject
+    assert_equal(<<SASS, css2sass(<<CSS))
+.foo
+  .bar!
+    .baz
+      a: b
+    .bip
+      c: d
+  .bar .bonk
+    e: f
+
+.flip!
+  &.bar
+    a: b
+  &.baz
+    c: d
+SASS
+.foo .bar! .baz {a: b;}
+.foo .bar! .bip {c: d;}
+.foo .bar .bonk {e: f;}
+
+.flip.bar! {a: b;}
+.flip.baz! {c: d;}
+CSS
+  end
+
   # Regressions
 
   def test_nesting_within_media

data/test/sass/engine_test.rb

@@ -2716,7 +2716,7 @@ SASS
   end
 
   def test_comment_like_selector
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected selector, was "/ foo"') {render(<<SASS)}
+    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "/": expected identifier, was " foo"') {render(<<SASS)}
 / foo
   a: b
 SASS

data/test/sass/extend_test.rb

@@ -414,6 +414,12 @@ SCSS
     assert_extends 'a ~ b c .c1', 'b c .c2 {@extend .c1}', 'a ~ b c .c1, a ~ b c .c2'
   end
 
+  def test_nested_extender_doesnt_find_common_selectors_around_reference_selector
+    assert_extends 'a /for/ b c .c1', 'a c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b a c .c2, a a /for/ b c .c2'
+    assert_extends 'a /for/ b c .c1', 'a b .c2 {@extend .c1}', 'a /for/ b c .c1, a a /for/ b c .c2'
+    assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'
+  end
+
   def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
     assert_extends('.bip > .bap .foo', '.grip > .bap .bar {@extend .foo}',
       '.bip > .bap .foo, .bip > .bap .grip > .bap .bar, .grip > .bap .bip > .bap .bar')
@@ -443,7 +449,9 @@ CSS
   > .baz {@extend .bar}
 }
 SCSS
+  end
 
+  def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
     assert_equal <<CSS, render(<<SCSS)
 .foo .bar, .foo .bip > .baz {
   a: b; }
@@ -1008,6 +1016,64 @@ CSS
 SCSS
   end
 
+  def test_extend_with_subject_transfers_subject_to_extender
+    assert_equal(<<CSS, render(<<SCSS))
+foo bar! baz, foo .bip .bap! baz, .bip foo .bap! baz {
+  a: b; }
+CSS
+foo bar! baz {a: b}
+.bip .bap {@extend bar}
+SCSS
+
+    assert_equal(<<CSS, render(<<SCSS))
+foo.x bar.y! baz.z, foo.x .bip bar.bap! baz.z, .bip foo.x bar.bap! baz.z {
+  a: b; }
+CSS
+foo.x bar.y! baz.z {a: b}
+.bip .bap {@extend .y}
+SCSS
+  end
+
+  def test_extend_with_subject_retains_subject_on_target
+    assert_equal(<<CSS, render(<<SCSS))
+.foo! .bar, .foo! .bip .bap, .bip .foo! .bap {
+  a: b; }
+CSS
+.foo! .bar {a: b}
+.bip .bap {@extend .bar}
+SCSS
+  end
+
+  def test_extend_with_subject_transfers_subject_to_target
+    assert_equal(<<CSS, render(<<SCSS))
+a.foo .bar, .bip a.bap! .bar {
+  a: b; }
+CSS
+a.foo .bar {a: b}
+.bip .bap! {@extend .foo}
+SCSS
+  end
+
+  def test_extend_with_subject_retains_subject_on_extender
+    assert_equal(<<CSS, render(<<SCSS))
+.foo .bar, .foo .bip! .bap, .bip! .foo .bap {
+  a: b; }
+CSS
+.foo .bar {a: b}
+.bip! .bap {@extend .bar}
+SCSS
+  end
+
+  def test_extend_with_subject_fails_with_conflicting_subject
+    assert_equal(<<CSS, render(<<SCSS))
+x! .bar {
+  a: b; }
+CSS
+x! .bar {a: b}
+y! .bap {@extend .bar}
+SCSS
+  end
+
   # Regression Tests
 
   def test_newline_near_combinator

data/test/sass/functions_test.rb

@@ -336,6 +336,18 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("12 is not a color for `alpha'", "alpha(12)")
   end
 
+  def test_opacity
+    assert_equal("1", evaluate("opacity(#123456)"))
+    assert_equal("0.34", evaluate("opacity(rgba(0, 1, 2, 0.34))"))
+    assert_equal("0", evaluate("opacity(hsla(0, 1, 2, 0))"))
+    assert_equal("0", evaluate("opacity($color: hsla(0, 1, 2, 0))"))
+    assert_equal("opacity(20%)", evaluate("opacity(20%)"))
+  end
+
+  def test_opacity_exception
+    assert_error_message("\"foo\" is not a color for `opacity'", "opacity(foo)")
+  end
+
   def test_opacify
     assert_equal("rgba(0, 0, 0, 0.75)", evaluate("opacify(rgba(0, 0, 0, 0.5), 0.25)"))
     assert_equal("rgba(0, 0, 0, 0.3)", evaluate("opacify(rgba(0, 0, 0, 0.2), 0.1)"))
@@ -435,6 +447,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#88aa88", evaluate("saturate(#8a8, 0%)"))
     assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate(rgba(136, 85, 85, 0.5), 20%)"))
     assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate($color: rgba(136, 85, 85, 0.5), $amount: 20%)"))
+    assert_equal("saturate(50%)", evaluate("saturate(50%)"))
   end
 
   def test_saturate_tests_bounds
@@ -828,6 +841,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_invert
     assert_equal("#112233", evaluate("invert(#edc)"))
     assert_equal("rgba(245, 235, 225, 0.5)", evaluate("invert(rgba(10, 20, 30, 0.5))"))
+    assert_equal("invert(20%)", evaluate("invert(20%)"))
   end
 
   def test_invert_tests_types

data/test/sass/script_test.rb

@@ -385,6 +385,16 @@ SASS
     assert_equal "false", resolve('(1 (2 3)) == (1 2 3)')
     assert_equal "false", resolve('((1, 2) (3, 4)) == (1, 2 3, 4)')
     assert_equal "false", resolve('(1 2 3) == (1, 2, 3)')
+
+    assert_equal "true", resolve('null == null')
+    assert_equal "false", resolve('"null" == null')
+    assert_equal "false", resolve('0 == null')
+    assert_equal "false", resolve('() == null')
+
+    assert_equal "false", resolve('null != null')
+    assert_equal "true", resolve('"null" != null')
+    assert_equal "true", resolve('0 != null')
+    assert_equal "true", resolve('() != null')
   end
 
   def test_operation_precedence

data/test/sass/scss/css_test.rb

@@ -650,91 +650,140 @@ SCSS
 
   ## Selectors
 
-  # Taken from http://www.w3.org/TR/css3-selectors/#selectors
+  # Taken from http://dev.w3.org/csswg/selectors4/#overview
   def test_summarized_selectors
     assert_selector_parses('*')
     assert_selector_parses('E')
+    assert_selector_parses('E:not(s)')
+    assert_selector_parses('E:not(s1, s2)')
+    assert_selector_parses('E:matches(s1, s2)')
+    assert_selector_parses('E.warning')
+    assert_selector_parses('E#myid')
     assert_selector_parses('E[foo]')
     assert_selector_parses('E[foo="bar"]')
+    assert_selector_parses('E[foo="bar" i]')
     assert_selector_parses('E[foo~="bar"]')
     assert_selector_parses('E[foo^="bar"]')
     assert_selector_parses('E[foo$="bar"]')
     assert_selector_parses('E[foo*="bar"]')
     assert_selector_parses('E[foo|="en"]')
-    assert_selector_parses('E:root')
-    assert_selector_parses('E:nth-child(n)')
-    assert_selector_parses('E:nth-last-child(n)')
-    assert_selector_parses('E:nth-of-type(n)')
-    assert_selector_parses('E:nth-last-of-type(n)')
-    assert_selector_parses('E:first-child')
-    assert_selector_parses('E:last-child')
-    assert_selector_parses('E:first-of-type')
-    assert_selector_parses('E:last-of-type')
-    assert_selector_parses('E:only-child')
-    assert_selector_parses('E:only-of-type')
-    assert_selector_parses('E:empty')
+    assert_selector_parses('E:dir(ltr)')
+    assert_selector_parses('E:lang(fr)')
+    assert_selector_parses('E:lang(zh, *-hant)')
+    assert_selector_parses('E:any-link')
     assert_selector_parses('E:link')
     assert_selector_parses('E:visited')
+    assert_selector_parses('E:local-link')
+    assert_selector_parses('E:local-link(0)')
+    assert_selector_parses('E:target')
+    assert_selector_parses('E:scope')
+    assert_selector_parses('E:current')
+    assert_selector_parses('E:current(s)')
+    assert_selector_parses('E:past')
+    assert_selector_parses('E:future')
     assert_selector_parses('E:active')
     assert_selector_parses('E:hover')
     assert_selector_parses('E:focus')
-    assert_selector_parses('E:target')
-    assert_selector_parses('E:lang(fr)')
     assert_selector_parses('E:enabled')
     assert_selector_parses('E:disabled')
     assert_selector_parses('E:checked')
-    assert_selector_parses('E::first-line')
-    assert_selector_parses('E::first-letter')
-    assert_selector_parses('E::before')
-    assert_selector_parses('E::after')
-    assert_selector_parses('E.warning')
-    assert_selector_parses('E#myid')
-    assert_selector_parses('E:not(s)')
+    assert_selector_parses('E:indeterminate')
+    assert_selector_parses('E:default')
+    assert_selector_parses('E:in-range')
+    assert_selector_parses('E:out-of-range')
+    assert_selector_parses('E:required')
+    assert_selector_parses('E:optional')
+    assert_selector_parses('E:read-only')
+    assert_selector_parses('E:read-write')
+    assert_selector_parses('E:root')
+    assert_selector_parses('E:empty')
+    assert_selector_parses('E:first-child')
+    assert_selector_parses('E:nth-child(n)')
+    assert_selector_parses('E:last-child')
+    assert_selector_parses('E:nth-last-child(n)')
+    assert_selector_parses('E:only-child')
+    assert_selector_parses('E:first-of-type')
+    assert_selector_parses('E:nth-of-type(n)')
+    assert_selector_parses('E:last-of-type')
+    assert_selector_parses('E:nth-last-of-type(n)')
+    assert_selector_parses('E:only-of-type')
+    assert_selector_parses('E:nth-match(n of selector)')
+    assert_selector_parses('E:nth-last-match(n of selector)')
+    assert_selector_parses('E:column(selector)')
+    assert_selector_parses('E:nth-column(n)')
+    assert_selector_parses('E:nth-last-column(n)')
     assert_selector_parses('E F')
     assert_selector_parses('E > F')
     assert_selector_parses('E + F')
     assert_selector_parses('E ~ F')
+    assert_selector_parses('E /foo/ F')
+    assert_selector_parses('E! > F')
+
+    assert_selector_parses('E /ns|foo/ F')
+    assert_selector_parses('E /*|foo/ F')
   end
 
-  # Taken from http://www.w3.org/TR/css3-selectors/#selectors,
-  # but without the element names
-  def test_lonely_selectors
+  # Taken from http://dev.w3.org/csswg/selectors4/#overview, but without element
+  # names.
+  def test_summarized_selectors
+    assert_selector_parses(':not(s)')
+    assert_selector_parses(':not(s1, s2)')
+    assert_selector_parses(':matches(s1, s2)')
+    assert_selector_parses('.warning')
+    assert_selector_parses('#myid')
     assert_selector_parses('[foo]')
     assert_selector_parses('[foo="bar"]')
+    assert_selector_parses('[foo="bar" i]')
     assert_selector_parses('[foo~="bar"]')
     assert_selector_parses('[foo^="bar"]')
     assert_selector_parses('[foo$="bar"]')
     assert_selector_parses('[foo*="bar"]')
     assert_selector_parses('[foo|="en"]')
-    assert_selector_parses(':root')
-    assert_selector_parses(':nth-child(n)')
-    assert_selector_parses(':nth-last-child(n)')
-    assert_selector_parses(':nth-of-type(n)')
-    assert_selector_parses(':nth-last-of-type(n)')
-    assert_selector_parses(':first-child')
-    assert_selector_parses(':last-child')
-    assert_selector_parses(':first-of-type')
-    assert_selector_parses(':last-of-type')
-    assert_selector_parses(':only-child')
-    assert_selector_parses(':only-of-type')
-    assert_selector_parses(':empty')
+    assert_selector_parses(':dir(ltr)')
+    assert_selector_parses(':lang(fr)')
+    assert_selector_parses(':lang(zh, *-hant)')
+    assert_selector_parses(':any-link')
     assert_selector_parses(':link')
     assert_selector_parses(':visited')
+    assert_selector_parses(':local-link')
+    assert_selector_parses(':local-link(0)')
+    assert_selector_parses(':target')
+    assert_selector_parses(':scope')
+    assert_selector_parses(':current')
+    assert_selector_parses(':current(s)')
+    assert_selector_parses(':past')
+    assert_selector_parses(':future')
     assert_selector_parses(':active')
     assert_selector_parses(':hover')
     assert_selector_parses(':focus')
-    assert_selector_parses(':target')
-    assert_selector_parses(':lang(fr)')
     assert_selector_parses(':enabled')
     assert_selector_parses(':disabled')
     assert_selector_parses(':checked')
-    assert_selector_parses('::first-line')
-    assert_selector_parses('::first-letter')
-    assert_selector_parses('::before')
-    assert_selector_parses('::after')
-    assert_selector_parses('.warning')
-    assert_selector_parses('#myid')
-    assert_selector_parses(':not(s)')
+    assert_selector_parses(':indeterminate')
+    assert_selector_parses(':default')
+    assert_selector_parses(':in-range')
+    assert_selector_parses(':out-of-range')
+    assert_selector_parses(':required')
+    assert_selector_parses(':optional')
+    assert_selector_parses(':read-only')
+    assert_selector_parses(':read-write')
+    assert_selector_parses(':root')
+    assert_selector_parses(':empty')
+    assert_selector_parses(':first-child')
+    assert_selector_parses(':nth-child(n)')
+    assert_selector_parses(':last-child')
+    assert_selector_parses(':nth-last-child(n)')
+    assert_selector_parses(':only-child')
+    assert_selector_parses(':first-of-type')
+    assert_selector_parses(':nth-of-type(n)')
+    assert_selector_parses(':last-of-type')
+    assert_selector_parses(':nth-last-of-type(n)')
+    assert_selector_parses(':only-of-type')
+    assert_selector_parses(':nth-match(n of selector)')
+    assert_selector_parses(':nth-last-match(n of selector)')
+    assert_selector_parses(':column(selector)')
+    assert_selector_parses(':nth-column(n)')
+    assert_selector_parses(':nth-last-column(n)')
   end
 
   def test_attribute_selectors_with_identifiers
@@ -771,36 +820,41 @@ CSS
 SCSS
   end
 
-  def test_negation_selectors
-    assert_selector_parses(':not(foo|bar)')
-    assert_selector_parses(':not(*|bar)')
+  def test_selectors_containing_selectors
+    assert_selector_can_contain_selectors(':not(<sel>)')
+    assert_selector_can_contain_selectors(':current(<sel>)')
+    assert_selector_can_contain_selectors(':nth-match(n of <sel>)')
+    assert_selector_can_contain_selectors(':nth-last-match(n of <sel>)')
+    assert_selector_can_contain_selectors(':column(<sel>)')
+    assert_selector_can_contain_selectors(':-moz-any(<sel>)')
+  end
+
+  def assert_selector_can_contain_selectors(sel)
+    try = lambda {|subsel| assert_selector_parses(sel.gsub('<sel>', subsel))}
+    
+    try['foo|bar']
+    try['*|bar']
 
-    assert_selector_parses(':not(foo|*)')
-    assert_selector_parses(':not(*|*)')
+    try['foo|*']
+    try['*|*']
 
-    assert_selector_parses(':not(#blah)')
-    assert_selector_parses(':not(.blah)')
+    try['#blah']
+    try['.blah']
 
-    assert_selector_parses(':not([foo])')
-    assert_selector_parses(':not([foo^="bar"])')
-    assert_selector_parses(':not([baz|foo~="bar"])')
+    try['[foo]']
+    try['[foo^="bar"]']
+    try['[baz|foo~="bar"]']
 
-    assert_selector_parses(':not(:hover)')
-    assert_selector_parses(':not(:nth-child(2n + 3))')
+    try[':hover']
+    try[':nth-child(2n + 3)']
 
-    # Not technically allowed, but what the heck
-    assert_selector_parses(':not(:not(#foo))')
-    assert_selector_parses(':not(a#foo.bar)')
-    assert_selector_parses(':not(#foo .bar > baz)')
-    assert_selector_parses(':not(h1, h2, h3)')
-  end
+    try['h1, h2, h3']
+    try['#foo, bar, [baz]']
 
-  def test_any_selector
-    assert_selector_parses(':-moz-any(h1, h2, h3)')
-    assert_selector_parses(':-moz-any(.foo)')
-    assert_selector_parses(':-moz-any(foo bar, .baz > .bang)')
-    assert_selector_parses(':-webkit-any(foo bar, .baz > .bang)')
-    assert_selector_parses(':any(foo bar, .baz > .bang)')
+    # Not technically allowed for most selectors, but what the heck
+    try[':not(#foo)']
+    try['a#foo.bar']
+    try['#foo .bar > baz']
   end
 
   def test_namespaced_selectors

data/test/sass/scss/scss_test.rb

@@ -517,6 +517,22 @@ foo {
 SCSS
   end
 
+  def test_parent_selector_with_subject
+    assert_equal <<CSS, render(<<SCSS)
+bar foo.baz! .bip {
+  a: b; }
+
+bar foo bar.baz! .bip {
+  c: d; }
+CSS
+foo {
+  bar &.baz! .bip {a: b}}
+
+foo bar {
+  bar &.baz! .bip {c: d}}
+SCSS
+  end
+
   ## Namespace Properties
 
   def test_namespace_properties
@@ -871,6 +887,29 @@ div { -foo-\#{$a}-\#{$b}-foo: foo }
 SCSS
   end
 
+  def test_selector_interpolation_in_reference_combinator
+    assert_equal <<CSS, render(<<SCSS)
+.foo /a/ .bar /b|c/ .baz {
+  a: b; }
+CSS
+$a: a;
+$b: b;
+$c: c;
+.foo /\#{$a}/ .bar /\#{$b}|\#{$c}/ .baz {a: b}
+SCSS
+  end
+
+  def test_parent_selector_with_parent_and_subject
+    assert_equal <<CSS, render(<<SCSS)
+bar foo.baz! .bip {
+  c: d; }
+CSS
+$subject: "!";
+foo {
+  bar &.baz\#{$subject} .bip {c: d}}
+SCSS
+  end
+
   def test_basic_prop_name_interpolation
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -1243,6 +1282,15 @@ SCSS
 
   # Regression
 
+  def test_reference_combinator_with_parent_ref
+    assert_equal <<CSS, render(<<SCSS)
+a /foo/ b {
+  c: d; }
+CSS
+a {& /foo/ b {c: d}}
+SCSS
+  end
+
   def test_prop_name_interpolation_after_hyphen
     assert_equal <<CSS, render(<<SCSS)
 a {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302835
+  hash: 592302361
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 247
-  version: 3.2.0.alpha.247
+  - 258
+  version: 3.2.0.alpha.258
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-15 00:00:00 -04:00
+date: 2012-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,7 +154,6 @@ files:
 - lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -164,6 +163,7 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/supports_node.rb
 - lib/sass/tree/trace_node.rb