haml 3.0.0.rc.1 → 3.0.0.rc.2

data/REMEMBER

@@ -1,6 +1,5 @@
 Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
-Pseudo-selectors should go to the end w/@extend
 Extending nested selectors?
 
-    .hoverlink {@extend a; @extend :hover}
-    a.user:hover {text-decoration: underline}
+Less
+  including mixins across imports

data/VERSION

@@ -1 +1 @@
-3.0.0.rc.1
+3.0.0.rc.2

data/lib/haml/exec.rb

@@ -58,8 +58,8 @@ module Haml
         # SyntaxErrors have weird line reporting
         # when there's trailing whitespace,
         # which there is for Haml documents.
-        return exception.message.scan(/:(\d+)/).first.first if exception.is_a?(::SyntaxError)
-        exception.backtrace[0].scan(/:(\d+)/).first.first
+        return (exception.message.scan(/:(\d+)/).first || ["??"]).first if exception.is_a?(::SyntaxError)
+        (exception.backtrace[0].scan(/:(\d+)/).first || ["??"]).first
       end
 
       # Tells optparse how to parse the arguments
@@ -371,8 +371,9 @@ MSG
         end
 
         dirs, files = @args.map {|name| name.split(':', 2)}.
-          map {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}.
           partition {|i, _| File.directory? i}
+        files.map! {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}
+        dirs.map! {|from, to| [from, to || from]}
         ::Sass::Plugin.options[:template_location] = dirs
 
         ::Sass::Plugin.on_updating_stylesheet do |_, css|
@@ -648,7 +649,7 @@ END
 
         super
         input = @options[:input]
-        raise "Error: '#{input}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
+        raise "Error: '#{input.path}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
         output = @options[:output]
         output = input if @options[:in_place]
         process_file(input, output)
@@ -750,7 +751,8 @@ END
         output.write(out)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]
-        raise "Syntax error on line #{get_line e}: #{e.message}\n  Use --trace for backtrace"
+        file = " of #{e.sass_filename}" if e.sass_filename
+        raise "Error on line #{e.sass_line}#{file}: #{e.message}\n  Use --trace for backtrace"
       end
     end
   end

data/lib/haml/util.rb

@@ -189,7 +189,7 @@ module Haml
     #   #  [2, 4, 5]]
     def paths(arrs)
       arrs.inject([[]]) do |paths, arr|
-        arr.map {|e| paths.map {|path| path + [e]}}.flatten(1)
+        flatten(arr.map {|e| paths.map {|path| path + [e]}}, 1)
       end
     end
 
@@ -370,6 +370,14 @@ module Haml
       Haml::Util::RUBY_VERSION[0] == 1 && Haml::Util::RUBY_VERSION[1] < 9
     end
 
+    # Whether or not this is running under Ruby 1.8.6 or lower.
+    # Note that lower versions are not officially supported.
+    #
+    # @return [Boolean]
+    def ruby1_8_6?
+      ruby1_8? && Haml::Util::RUBY_VERSION[2] < 7
+    end
+
     # Checks that the encoding of a string is valid in Ruby 1.9
     # and cleans up potential encoding gotchas like the UTF-8 BOM.
     # If it's not, yields an error string describing the invalid character
@@ -458,6 +466,38 @@ MSG
       ruby1_8? ? c[0] : c.ord
     end
 
+    # Flattens the first `n` nested arrays in a cross-version manner.
+    #
+    # @param arr [Array] The array to flatten
+    # @param n [Fixnum] The number of levels to flatten
+    # @return [Array] The flattened array
+    def flatten(arr, n)
+      return arr.flatten(n) unless ruby1_8_6?
+      return arr if n == 0
+      arr.inject([]) {|res, e| e.is_a?(Array) ? res.concat(flatten(e, n - 1)) : res << e}
+    end
+
+    # Returns the hash code for a set in a cross-version manner.
+    # Aggravatingly, this is order-dependent in Ruby 1.8.6.
+    #
+    # @param set [Set]
+    # @return [Fixnum] The order-independent hashcode of `set`
+    def set_hash(set)
+      return set.hash unless ruby1_8_6?
+      set.map {|e| e.hash}.uniq.sort.hash
+    end
+
+    # Tests the hash-equality of two sets in a cross-version manner.
+    # Aggravatingly, this is order-dependent in Ruby 1.8.6.
+    #
+    # @param set1 [Set]
+    # @param set2 [Set]
+    # @return [Boolean] Whether or not the sets are hashcode equal
+    def set_eql?(set1, set2)
+      return set1.eql?(set2) unless ruby1_8_6?
+      set1.to_a.uniq.sort_by {|e| e.hash}.eql?(set2.to_a.uniq.sort_by {|e| e.hash})
+    end
+
     ## Static Method Stuff
 
     # The context in which the ERB for \{#def\_static\_method} will be run.

data/lib/haml/util/subset_map.rb

@@ -78,7 +78,7 @@ module Haml
             [index, subenum]
           end
         end
-        res.flatten!(1)
+        res = Haml::Util.flatten(res, 1)
         res.compact!
         res.uniq!
         res.sort!

data/lib/sass/engine.rb

@@ -408,11 +408,15 @@ WARNING
         return Tree::RuleNode.new(parse_interp(line.text))
       end
       res.unshift(hack_char) if hack_char
+      if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
+        res << comment
+      end
 
       name = line.text[0...scanner.pos]
       if scanner.scan(/\s*([:=])(?:\s|$)/)
         parse_property(name, res, scanner[1], scanner.rest, :new, line)
       else
+        res.pop if comment
         Tree::RuleNode.new(res + parse_interp(scanner.rest))
       end
     end

data/lib/sass/files.rb

@@ -77,6 +77,7 @@ module Sass
       end
 
       new_filename = nil
+      load_paths = load_paths.uniq
       load_paths.each do |load_path|
         new_filename ||= find_full_path("#{filename}.sass", load_path) unless was_scss
         new_filename ||= find_full_path("#{filename}.scss", load_path) unless was_sass

data/lib/sass/script/lexer.rb

@@ -149,10 +149,10 @@ module Sass
       # @return [Boolean]
       def whitespace?(tok = @tok)
         if tok
-          @scanner.string[0...tok.pos] =~ /\s$/
+          @scanner.string[0...tok.pos] =~ /\s\Z/
         else
           @scanner.string[@scanner.pos, 1] =~ /^\s/ ||
-            @scanner.string[@scanner.pos - 1, 1] =~ /\s$/
+            @scanner.string[@scanner.pos - 1, 1] =~ /\s\Z/
         end
       end
 

data/lib/sass/script/number.rb

@@ -25,6 +25,14 @@ module Sass::Script
     # @return [Array<String>]
     attr_reader :denominator_units
 
+    # The original representation of this number.
+    # For example, although the result of `1px/2px` is `0.5`,
+    # the value of `#original` is `"1px/2px"`.
+    #
+    # This is only non-nil when the original value should be used as the CSS value,
+    # as in `font: 1px/2px`.
+    #
+    # @return [Boolean, nil]
     attr_accessor :original
 
     # The precision with which numbers will be printed to CSS files.

data/lib/sass/scss/parser.rb

@@ -538,6 +538,9 @@ module Sass
           return unless name = interp_ident
           name = [name] if name.is_a?(String)
         end
+        if comment = tok(COMMENT)
+          name << comment
+        end
         ss
 
         tok!(/:/)

data/lib/sass/scss/static_parser.rb

@@ -15,7 +15,7 @@ module Sass
       #   Used for error reporting
       # @return [Selector::CommaSequence] The parsed selector
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
-      def parse_selector(line, filename)
+      def parse_selector(filename)
         init_scanner!
         selectors = [expr!(:_selector)]
         while tok(/,/)
@@ -25,7 +25,7 @@ module Sass
         end
         expected("selector") unless @scanner.eos?
         seq = Selector::CommaSequence.new(selectors)
-        seq.line = line
+        seq.line = @line
         seq.filename = filename
         seq
       end

data/lib/sass/selector/sequence.rb

@@ -77,10 +77,19 @@ module Sass
       #   These correspond to a {CommaSequence}'s {CommaSequence#members members array}.
       # @see CommaSequence#do_extend
       def do_extend(extends, supers = [])
-        Haml::Util.paths(members.map do |sseq_or_op|
+        paths = Haml::Util.paths(members.map do |sseq_or_op|
             next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
-            [[sseq_or_op], *sseq_or_op.do_extend(extends, supers).map {|seq| seq.members}]
-          end).map {|path| weave(path)}.flatten(1).map {|p| Sequence.new(p)}
+            extended = sseq_or_op.do_extend(extends, supers)
+            choices = extended.map {|seq| seq.members}
+            choices.unshift([sseq_or_op]) unless extended.any? {|seq| seq.superselector?(sseq_or_op)}
+            choices
+          end)
+        Haml::Util.flatten(paths.map {|path| weave(path)}, 1).map {|p| Sequence.new(p)}
+      end
+
+      def superselector?(sseq)
+        return false unless members.size == 1
+        members.last.superselector?(sseq)
       end
 
       # @see Simple#to_a
@@ -134,9 +143,9 @@ module Sass
           while !current.empty? && last_current.first.is_a?(String) || current.last.is_a?(String)
             last_current.unshift(current.pop)
           end
-          befores = befores.map do |before|
-            subweave(before, current).map {|seqs| seqs + last_current}
-          end.flatten(1)
+          befores = Haml::Util.flatten(befores.map do |before|
+              subweave(before, current).map {|seqs| seqs + last_current}
+            end, 1)
           return befores if afters.empty?
         end
       end

data/lib/sass/selector/simple.rb

@@ -75,10 +75,15 @@ module Sass
       #   this exception will only ever be raised as a result of programmer error
       def unify(sels)
         return sels if sels.any? {|sel2| eql?(sel2)}
-        if sels.last.is_a?(Pseudo) && sels.last.type == :element
-          return sels[0...-1] + [self, sels.last]
-        end
-        sels + [self]
+        sels_with_ix = Haml::Util.enum_with_index(sels)
+        _, i =
+          if self.is_a?(Pseudo) || self.is_a?(Negation)
+            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?(Negation)}
+          end
+        return sels + [self] unless i
+        return sels[0...i] + [self] + sels[i..-1]
       end
 
       protected

data/lib/sass/selector/simple_sequence.rb

@@ -62,21 +62,18 @@ module Sass
       #   by extending this selector with `extends`.
       # @see CommaSequence#do_extend
       def do_extend(extends, supers = [])
-        seqs = extends.get(members.to_set).map do |seq, sels|
+        extends.get(members.to_set).map do |seq, sels|
           # If A {@extend B} and C {...},
           # 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)
           [sels, seq.members[0...-1] + [unified]]
-        end.compact.map {|sels, seq| [sels, Sequence.new(seq)]}
-
-        seqs.map {|_, seq| seq}.concat(
-          seqs.map do |sels, seq|
-            new_seqs = seq.do_extend(extends, supers.unshift(sels))[1..-1]
-            supers.shift
-            new_seqs
-          end.flatten.uniq)
+        end.compact.map {|sels, seq| [sels, Sequence.new(seq)]}.map do |sels, seq|
+          seqs = seq.do_extend(extends, supers.unshift(sels))
+          supers.shift
+          seqs
+        end.flatten.uniq
       rescue SystemStackError
         handle_extend_loop(supers)
       end
@@ -102,6 +99,10 @@ module Sass
         SimpleSequence.new(sseq)
       end
 
+      def superselector?(sseq)
+        (base.nil? || base.eql?(sseq.base)) && rest.subset?(sseq.rest)
+      end
+
       # @see Simple#to_a
       def to_a
         @members.map {|sel| sel.to_a}.flatten
@@ -119,7 +120,7 @@ module Sass
       #
       # @return [Fixnum]
       def hash
-        [base, rest].hash
+        [base, Haml::Util.set_hash(rest)].hash
       end
 
       # Checks equality between this and another object.
@@ -127,7 +128,8 @@ module Sass
       # @param other [Object] The object to test equality against
       # @return [Boolean] Whether or not this is equal to `other`
       def eql?(other)
-        other.class == self.class && other.base.eql?(self.base) && other.rest.eql?(self.rest)
+        other.class == self.class && other.base.eql?(self.base) &&
+          Haml::Util.set_eql?(other.rest, self.rest)
       end
 
       private

data/lib/sass/tree/directive_node.rb

@@ -25,7 +25,7 @@ module Sass::Tree
     # @see Node#to_src
     def to_src(tabs, opts, fmt)
       res = "#{'  ' * tabs}#{value}"
-      return res + "#{semi fmt}\n" if children.empty?
+      return res + "#{semi fmt}\n" unless has_children
       res + children_to_src(tabs, opts, fmt) + "\n"
     end
 

data/lib/sass/tree/extend_node.rb

@@ -46,14 +46,19 @@ module Sass::Tree
 
     protected
 
+    # @see Node#to_src
+    def to_src(tabs, opts, fmt)
+      "#{'  ' * tabs}@extend #{selector_to_src(@selector, tabs, opts, fmt).lstrip}#{semi fmt}\n"
+    end
+
     # Runs SassScript interpolation in the selector,
     # and then parses the result into a {Sass::Selector::CommaSequence}.
     #
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @resolved_selector = Sass::SCSS::CssParser.new(run_interp(@selector, environment)).
-        parse_selector(self.line, self.filename)
+      @resolved_selector = Sass::SCSS::CssParser.new(run_interp(@selector, environment), self.line).
+        parse_selector(self.filename)
       super
     end
   end

data/lib/sass/tree/mixin_def_node.rb

@@ -43,6 +43,18 @@ module Sass
         environment.set_mixin(@name, Sass::Mixin.new(@name, @args, environment, children))
         []
       end
+
+      # Returns an error message if the given child node is invalid,
+      # and false otherwise.
+      #
+      # {ExtendNode}s are valid within {MixinDefNode}s.
+      #
+      # @param child [Tree::Node] A potential child node.
+      # @return [Boolean, String] Whether or not the child node is valid,
+      #   as well as the error message to display if it is invalid
+      def invalid_child?(child)
+        super unless child.is_a?(ExtendNode)
+      end
     end
   end
 end

data/lib/sass/tree/node.rb

@@ -400,13 +400,52 @@ module Sass
       # @param tabs [Fixnum] The amount of tabulation to use for the Sass code
       # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
       # @param fmt [Symbol] `:sass` or `:scss`
-      # @return [String] The Sass or CSS code corresponding to the children
+      # @return [String] The Sass or SCSS code corresponding to the children
       def children_to_src(tabs, opts, fmt)
+        return fmt == :sass ? "\n" : " {}\n" if children.empty?
+
         (fmt == :sass ? "\n" : " {\n") +
           children.map {|c| c.send("to_#{fmt}", tabs + 1, opts)}.join.rstrip +
           (fmt == :sass ? "\n" : " }\n")
       end
 
+      # Converts a selector to a Sass or SCSS string.
+      #
+      # @param sel [Array<String, Sass::Script::Node>] The selector to convert
+      # @param tabs [Fixnum] The indentation of the selector
+      # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
+      # @param fmt [Symbol] `:sass` or `:scss`
+      # @return [String] The Sass or SCSS code corresponding to the selector
+      def selector_to_src(sel, tabs, opts, fmt)
+        fmt == :sass ? selector_to_sass(sel, opts) : selector_to_scss(sel, tabs, opts)
+      end
+
+      # Converts a selector to a Sass string.
+      #
+      # @param sel [Array<String, Sass::Script::Node>] The selector to convert
+      # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
+      # @return [String] The Sass code corresponding to the selector
+      def selector_to_sass(sel, opts)
+        sel.map do |r|
+          if r.is_a?(String)
+            r.gsub(/(,[ \t]*)?\n\s*/) {$1 ? $1 + "\n" : " "}
+          else
+            "\#{#{r.to_sass(opts)}}"
+          end
+        end.join
+      end
+
+      # Converts a selector to a SCSS string.
+      #
+      # @param sel [Array<String, Sass::Script::Node>] The selector to convert
+      # @param tabs [Fixnum] The indentation of the selector
+      # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
+      # @return [String] The SCSS code corresponding to the selector
+      def selector_to_scss(sel, tabs, opts)
+        sel.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass(opts)}}"}.
+          join.gsub(/^[ \t]*/, '  ' * tabs)
+      end
+
       # Convert any underscores in a string into hyphens,
       # but only if the `:dasherize` option is set.
       #

data/lib/sass/tree/prop_node.rb

@@ -179,7 +179,6 @@ module Sass::Tree
     class << self
       # @private
       def val_to_sass(value, opts)
-        return value.to_sass(opts) unless value.context == :equals
         val_to_sass_comma(value, opts).to_sass(opts)
       end
 
@@ -208,7 +207,8 @@ module Sass::Tree
       def val_to_sass_div(node, opts)
         unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
             node.operand1.is_a?(Sass::Script::Number) &&
-            node.operand2.is_a?(Sass::Script::Number)
+            node.operand2.is_a?(Sass::Script::Number) &&
+            (node.context == :equals || !node.operand1.original || !node.operand2.original)
           return node
         end
 

data/lib/sass/tree/rule_node.rb

@@ -84,22 +84,14 @@ module Sass::Tree
 
     # @see Node#to_sass
     def to_sass(tabs, opts = {})
-      name = rule.map do |r|
-        if r.is_a?(String)
-          r.gsub(/(,[ \t]*)?\n\s*/) {$1 ? $1 + "\n" : " "}
-        else
-          "\#{#{r.to_sass(opts)}}"
-        end
-      end.join
+      name = selector_to_sass(rule, opts)
       name = "\\" + name if name[0] == ?:
       name.gsub(/^/, '  ' * tabs) + children_to_src(tabs, opts, :sass)
     end
 
     # @see Node#to_scss
     def to_scss(tabs, opts = {})
-      name = rule.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass(opts)}}"}.
-        join.gsub(/^[ \t]*/, '  ' * tabs)
-
+      name = selector_to_scss(rule, tabs, opts)
       res = name + children_to_src(tabs, opts, :scss)
 
       if children.last.is_a?(CommentNode) && children.last.silent
@@ -191,8 +183,8 @@ module Sass::Tree
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
     def perform!(environment)
-      @parsed_rules = Sass::SCSS::StaticParser.new(run_interp(@rule, environment)).
-        parse_selector(self.line, self.filename)
+      @parsed_rules = Sass::SCSS::StaticParser.new(run_interp(@rule, environment), self.line).
+        parse_selector(self.filename)
       super
     end
 
@@ -236,7 +228,7 @@ module Sass::Tree
     #
     # {ExtendNode}s are valid within {RuleNode}s.
     #
-    # @param child [Tree::Node] A potential child nodecompact.
+    # @param child [Tree::Node] A potential child node.
     # @return [Boolean, String] Whether or not the child node is valid,
     #   as well as the error message to display if it is invalid
     def invalid_child?(child)

data/test/haml/util_test.rb

@@ -144,6 +144,50 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(98, ord("bar"))
   end
 
+  def test_flatten
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 0))
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 1))
+    assert_equal([1, 2, 3], flatten([1, 2, 3], 2))
+
+    assert_equal([[1, 2], 3], flatten([[1, 2], 3], 0))
+    assert_equal([1, 2, 3], flatten([[1, 2], 3], 1))
+    assert_equal([1, 2, 3], flatten([[1, 2], 3], 2))
+
+    assert_equal([[[1], 2], [3], 4], flatten([[[1], 2], [3], 4], 0))
+    assert_equal([[1], 2, 3, 4], flatten([[[1], 2], [3], 4], 1))
+    assert_equal([1, 2, 3, 4], flatten([[[1], 2], [3], 4], 2))
+  end
+
+  def test_set_hash
+    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[3, 2, 1]))
+    assert(set_hash(Set[1, 2, 3]) == set_hash(Set[1, 2, 3]))
+
+    s1 = Set[]
+    s1 << 1
+    s1 << 2
+    s1 << 3
+    s2 = Set[]
+    s2 << 3
+    s2 << 2
+    s2 << 1
+    assert(set_hash(s1) == set_hash(s2))
+  end
+
+  def test_set_eql
+    assert(set_eql?(Set[1, 2, 3], Set[3, 2, 1]))
+    assert(set_eql?(Set[1, 2, 3], Set[1, 2, 3]))
+
+    s1 = Set[]
+    s1 << 1
+    s1 << 2
+    s1 << 3
+    s2 = Set[]
+    s2 << 3
+    s2 << 2
+    s2 << 1
+    assert(set_eql?(s1, s2))
+  end
+
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))

data/test/sass/conversion_test.rb

@@ -23,6 +23,19 @@ foo bar {
 SCSS
   end
 
+  def test_empty_selector
+    assert_renders "foo bar", "foo bar {}"
+  end
+
+  def test_empty_directive
+    assert_scss_to_sass "@media screen", "@media screen {}"
+    assert_scss_to_scss "@media screen {}"
+  end
+
+  def test_empty_control_directive
+    assert_renders "@if false", "@if false {}"
+  end
+
   def test_nesting
     assert_renders <<SASS, <<SCSS
 foo bar
@@ -727,6 +740,18 @@ SASS
 SCSS
   end
 
+  def test_extend
+    assert_renders <<SASS, <<SCSS
+.foo
+  @extend .bar
+  @extend .baz:bang
+SASS
+.foo {
+  @extend .bar;
+  @extend .baz:bang; }
+SCSS
+  end
+
   def test_argless_mixin_definition
     assert_renders <<SASS, <<SCSS
 =foo-bar
@@ -863,6 +888,60 @@ SCSS
     assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
+  def test_division_asserted_with_parens
+    assert_renders <<SASS, <<SCSS
+foo
+  a: (1px / 2px)
+SASS
+foo {
+  a: (1px / 2px); }
+SCSS
+  end
+
+  def test_division_not_asserted_when_unnecessary
+    assert_renders <<SASS, <<SCSS
+$var: 1px / 2px
+
+foo
+  a: $var
+SASS
+$var: 1px / 2px;
+
+foo {
+  a: $var; }
+SCSS
+
+    assert_renders <<SASS, <<SCSS
+$var: 1px
+
+foo
+  a: $var / 2px
+SASS
+$var: 1px;
+
+foo {
+  a: $var / 2px; }
+SCSS
+
+    assert_renders <<SASS, <<SCSS
+foo
+  a: 1 + 1px / 2px
+SASS
+foo {
+  a: 1 + 1px / 2px; }
+SCSS
+  end
+
+  def test_literal_slash
+    assert_renders <<SASS, <<SCSS
+foo
+  a: 1px / 2px
+SASS
+foo {
+  a: 1px / 2px; }
+SCSS
+  end
+
   # Hacks
 
   def test_declaration_hacks
@@ -872,6 +951,8 @@ foo
   *name: val
   #name: val
   .name: val
+  name/**/: val
+  name/*\\**/: val
   name: val
 SASS
 foo {
@@ -879,6 +960,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 SCSS
   end

data/test/sass/engine_test.rb

@@ -32,6 +32,8 @@ MSG
     "a\n  :b:c d" => 'Invalid property: ":b:c d".',
     "a\n  :b c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
     "a\n  b: c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
+    ".foo ^bar\n  a: b" => ['Invalid CSS after ".foo ": expected selector, was "^bar"', 1],
+    "a\n  @extend .foo ^bar" => 'Invalid CSS after ".foo ": expected selector, was "^bar"',
     "a: b" => 'Properties aren\'t allowed at the root of a document.',
     ":a b" => 'Properties aren\'t allowed at the root of a document.',
     "!" => 'Invalid variable: "!".',
@@ -599,6 +601,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 CSS
 foo
@@ -606,6 +610,8 @@ foo
   *name: val
   #name: val
   .name: val
+  name/**/: val
+  name/*\\**/: val
   name: val
 SASS
   end

data/test/sass/extend_test.rb

@@ -102,7 +102,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo.bar, .bar.baz, .foo.baz, .baz {
+.foo.bar, .baz {
   a: b; }
 CSS
 .foo.bar {a: b}
@@ -121,7 +121,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo.bar, .bar.baz, .foo.bang, .baz.bang {
+.foo.bar, .bar.baz, .baz.bang, .foo.bang {
   a: b; }
 CSS
 .foo.bar {a: b}
@@ -190,7 +190,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo.baz, .baz {
+.baz {
   a: b; }
 CSS
 .foo.baz {a: b}
@@ -208,7 +208,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo#baz, #baz {
+#baz {
   a: b; }
 CSS
 .foo#baz {a: b}
@@ -242,7 +242,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo.bar, .bar {
+.bar {
   a: b; }
 CSS
 .foo.bar {a: b}
@@ -250,7 +250,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.foo.bar, .bar {
+.bar {
   a: b; }
 CSS
 .foo.bar {a: b}
@@ -268,7 +268,7 @@ SCSS
 
   def test_universal_unification_with_namespaceless_universal_target
     assert_equal <<CSS, render(<<SCSS)
-*.foo, * {
+* {
   a: b; }
 CSS
 *.foo {a: b}
@@ -276,7 +276,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-*.foo, * {
+* {
   a: b; }
 CSS
 *.foo {a: b}
@@ -292,7 +292,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-*|*.foo, *|* {
+*|* {
   a: b; }
 CSS
 *|*.foo {a: b}
@@ -318,7 +318,7 @@ SCSS
 
   def test_universal_unification_with_namespaced_universal_target
     assert_equal <<CSS, render(<<SCSS)
-ns|*.foo, ns|* {
+ns|* {
   a: b; }
 CSS
 ns|*.foo {a: b}
@@ -326,7 +326,7 @@ ns|*.foo {a: b}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|*.foo, ns|* {
+ns|* {
   a: b; }
 CSS
 ns|*.foo {a: b}
@@ -342,7 +342,7 @@ ns2|* {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|*.foo, ns|* {
+ns|* {
   a: b; }
 CSS
 ns|*.foo {a: b}
@@ -352,7 +352,7 @@ SCSS
 
   def test_universal_unification_with_namespaceless_element_target
     assert_equal <<CSS, render(<<SCSS)
-a.foo, a {
+a {
   a: b; }
 CSS
 a.foo {a: b}
@@ -360,7 +360,7 @@ a.foo {a: b}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-a.foo, a {
+a {
   a: b; }
 CSS
 a.foo {a: b}
@@ -376,7 +376,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-*|a.foo, *|a {
+*|a {
   a: b; }
 CSS
 *|a.foo {a: b}
@@ -402,7 +402,7 @@ SCSS
 
   def test_universal_unification_with_namespaced_element_target
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -410,7 +410,7 @@ ns|a.foo {a: b}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -426,7 +426,7 @@ ns2|* {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -554,7 +554,7 @@ SCSS
 
   def test_element_unification_with_namespaceless_element_target
     assert_equal <<CSS, render(<<SCSS)
-a.foo, a {
+a {
   a: b; }
 CSS
 a.foo {a: b}
@@ -562,7 +562,7 @@ a {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-a.foo, a {
+a {
   a: b; }
 CSS
 a.foo {a: b}
@@ -578,7 +578,7 @@ a {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-*|a.foo, *|a {
+*|a {
   a: b; }
 CSS
 *|a.foo {a: b}
@@ -612,7 +612,7 @@ SCSS
 
   def test_element_unification_with_namespaced_element_target
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -620,7 +620,7 @@ a {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -636,7 +636,7 @@ ns2|a {@extend .foo}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-ns|a.foo, ns|a {
+ns|a {
   a: b; }
 CSS
 ns|a.foo {a: b}
@@ -678,7 +678,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-[foo=bar].baz, [foo=bar] {
+[foo=bar] {
   a: b; }
 CSS
 [foo=bar].baz {a: b}
@@ -720,7 +720,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-::foo.baz, ::foo {
+::foo {
   a: b; }
 CSS
 ::foo.baz {a: b}
@@ -728,7 +728,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-::foo(2n+1).baz, ::foo(2n+1) {
+::foo(2n+1) {
   a: b; }
 CSS
 ::foo(2n+1).baz {a: b}
@@ -744,7 +744,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-:foo.baz, :foo {
+:foo {
   a: b; }
 CSS
 :foo.baz {a: b}
@@ -770,6 +770,70 @@ a.foo::bar {a: b}
 SCSS
   end
 
+  def test_pseudoclass_remains_at_end_of_selector
+    assert_equal <<CSS, render(<<SCSS)
+.foo:bar, .baz:bar {
+  a: b; }
+CSS
+.foo:bar {a: b}
+.baz {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+a.foo:bar, a.baz:bar {
+  a: b; }
+CSS
+a.foo:bar {a: b}
+.baz {@extend .foo}
+SCSS
+  end
+
+  def test_not_remains_at_end_of_selector
+    assert_equal <<CSS, render(<<SCSS)
+.foo:not(.bar), .baz:not(.bar) {
+  a: b; }
+CSS
+.foo:not(.bar) {a: b}
+.baz {@extend .foo}
+SCSS
+  end
+
+  def test_pseudoelement_goes_lefter_than_pseudoclass
+    assert_equal <<CSS, render(<<SCSS)
+.foo::bar, .baz:bang::bar {
+  a: b; }
+CSS
+.foo::bar {a: b}
+.baz:bang {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo:bar, .baz:bar::bang {
+  a: b; }
+CSS
+.foo:bar {a: b}
+.baz::bang {@extend .foo}
+SCSS
+  end
+
+  def test_pseudoelement_goes_lefter_than_not
+    assert_equal <<CSS, render(<<SCSS)
+.foo::bar, .baz:not(.bang)::bar {
+  a: b; }
+CSS
+.foo::bar {a: b}
+.baz:not(.bang) {@extend .foo}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo:not(.bang), .baz:not(.bang)::bar {
+  a: b; }
+CSS
+.foo:not(.bang) {a: b}
+.baz::bar {@extend .foo}
+SCSS
+  end
+
   def test_negation_unification
     assert_equal <<CSS, render(<<SCSS)
 :not(.foo).baz, :not(.foo):not(.bar) {
@@ -780,7 +844,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-:not(.foo).baz, :not(.foo) {
+:not(.foo) {
   a: b; }
 CSS
 :not(.foo).baz {a: b}
@@ -788,7 +852,7 @@ CSS
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-:not([a=b]).baz, :not([a=b]) {
+:not([a=b]) {
   a: b; }
 CSS
 :not([a=b]).baz {a: b}
@@ -1036,6 +1100,16 @@ CSS
 SCSS
   end
 
+  def test_multiple_extender_merges_with_superset_selector
+    assert_equal <<CSS, render(<<SCSS)
+a.bar.baz, a.foo {
+  a: b; }
+CSS
+.foo {@extend .bar; @extend .baz}
+a.bar.baz {a: b}
+SCSS
+  end
+
   private
 
   def render(sass, options = {})

data/test/sass/scss/css_test.rb

@@ -349,6 +349,8 @@ foo {
   :name: val;
   .name: val;
   #name: val;
+  name/**/: val;
+  name/*\\**/: val;
   name: val; }
 SCSS
   end

data/test/sass/scss/scss_test.rb

@@ -942,9 +942,11 @@ SCSS
   end
 
   def test_post_resolution_selector_error
-    assert_raise(Sass::SyntaxError, 'Invalid CSS after "foo ": expected selector, was ") bar"') do
-      render 'foo #{") bar"} {a: b}'
-    end
+    render "\n\nfoo \#{\") bar\"} {a: b}"
+    assert(false, "Expected syntax error")
+  rescue Sass::SyntaxError => e
+    assert_equal 'Invalid CSS after "foo ": expected selector, was ") bar"', e.message
+    assert_equal 3, e.sass_line
   end
 
   def test_parent_in_mid_selector_error
@@ -968,6 +970,21 @@ SCSS
 flim {
   && {a: b}
 }
+SCSS
+  end
+
+  # Regression
+
+  def test_weird_added_space
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  bar: -moz-bip; }
+CSS
+$value : bip;
+
+foo {
+  bar: -moz-\#{$value};
+}
 SCSS
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 1
-  version: 3.0.0.rc.1
+  - 2
+  version: 3.0.0.rc.2
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency