sass 3.1.18 → 3.1.19

data/VERSION

@@ -1 +1 @@
-3.1.18
+3.1.19

data/lib/sass/engine.rb

@@ -25,6 +25,7 @@ require 'sass/tree/charset_node'
 require 'sass/tree/visitors/base'
 require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
+require 'sass/tree/visitors/extend'
 require 'sass/tree/visitors/convert'
 require 'sass/tree/visitors/to_css'
 require 'sass/tree/visitors/deep_copy'

data/lib/sass/exec.rb

@@ -452,7 +452,7 @@ MSG
       def probably_dest_dir?(path)
         return false unless path
         return false if colon_path?(path)
-        return Sass::Util.glob(File.join(path, "*.s[ca]ss")).empty?
+        return ::Sass::Util.glob(File.join(path, "*.s[ca]ss")).empty?
       end
     end
 
@@ -584,7 +584,7 @@ END
         end
 
         ext = @options[:from]
-        Sass::Util.glob("#{@options[:input]}/**/*.#{ext}") do |f|
+        ::Sass::Util.glob("#{@options[:input]}/**/*.#{ext}") do |f|
           output =
             if @options[:in_place]
               f

data/lib/sass/selector/comma_sequence.rb

@@ -44,12 +44,17 @@ module Sass
       # @todo Link this to the reference documentation on `@extend`
       #   when such a thing exists.
       #
-      # @param extends [Sass::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
+      # @param extends [Sass::Util::SubsetMap{Selector::Simple =>
+      #                                       Sass::Tree::Visitors::Cssize::Extend}]
       #   The extensions to perform on this selector
+      # @param parent_directives [Array<Sass::Tree::DirectiveNode>]
+      #   The directives containing this selector.
       # @return [CommaSequence] A copy of this selector,
       #   with extensions made according to `extends`
-      def do_extend(extends)
-        CommaSequence.new(members.map {|seq| seq.do_extend(extends)}.flatten)
+      def do_extend(extends, parent_directives)
+        CommaSequence.new(members.map do |seq|
+            seq.do_extend(extends, parent_directives)
+          end.flatten)
       end
 
       # Returns a string representation of the sequence.

data/lib/sass/selector/sequence.rb

@@ -69,16 +69,19 @@ module Sass
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
       # @overload def do_extend(extends)
-      # @param extends [Sass::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
+      # @param extends [Sass::Util::SubsetMap{Selector::Simple =>
+      #                                       Sass::Tree::Visitors::Cssize::Extend}]
       #   The extensions to perform on this selector
+      # @param parent_directives [Array<Sass::Tree::DirectiveNode>]
+      #   The directives containing this selector.
       # @return [Array<Sequence>] A list of selectors generated
       #   by extending this selector with `extends`.
       #   These correspond to a {CommaSequence}'s {CommaSequence#members members array}.
       # @see CommaSequence#do_extend
-      def do_extend(extends, seen = Set.new)
+      def do_extend(extends, parent_directives, seen = Set.new)
         paths = Sass::Util.paths(members.map do |sseq_or_op|
             next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
-            extended = sseq_or_op.do_extend(extends, seen)
+            extended = sseq_or_op.do_extend(extends, parent_directives, seen)
             choices = extended.map {|seq| seq.members}
             choices.unshift([sseq_or_op]) unless extended.any? {|seq| seq.superselector?(sseq_or_op)}
             choices

data/lib/sass/selector/simple_sequence.rb

@@ -54,23 +54,28 @@ module Sass
       # Non-destrucively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
-      # @overload def do_extend(extends)
-      # @param extends [{Selector::Simple => Selector::Sequence}]
+      # @overload def do_extend(extends, parent_directives)
+      # @param extends [{Selector::Simple =>
+      #                  Sass::Tree::Visitors::Cssize::Extend}]
       #   The extensions to perform on this selector
+      # @param parent_directives [Array<Sass::Tree::DirectiveNode>]
+      #   The directives containing this selector.
       # @return [Array<Sequence>] A list of selectors generated
       #   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|
+      def do_extend(extends, parent_directives, seen = Set.new)
+        extends.get(members.to_set).map do |ex, sels|
           # If A {@extend B} and C {...},
-          # seq is A, sels is B, and self is C
+          # ex.extender 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]]
+          next unless unified = ex.extender.members.last.unify(self_without_sel)
+          next unless check_directives_match!(ex, parent_directives)
+          [sels, ex.extender.members[0...-1] + [unified]]
         end.compact.map do |sels, seq|
           seq = Sequence.new(seq)
-          seen.include?(sels) ? [] : seq.do_extend(extends, seen + [sels])
+          next [] if seen.include?(sels)
+          seq.do_extend(extends, parent_directives, seen + [sels])
         end.flatten.uniq
       end
 
@@ -122,6 +127,21 @@ module Sass
 
       private
 
+      def check_directives_match!(extend, parent_directives)
+        dirs1 = extend.directives.map {|d| d.value}
+        dirs2 = parent_directives.map {|d| d.value}
+        return true if Sass::Util.subsequence?(dirs1, dirs2)
+
+        Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING on line #{extend.node.line}#{" of #{extend.node.filename}" if extend.node.filename}:
+  @extending an outer selector from within #{extend.directives.last.name} is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
+WARNING
+        return false
+      end
+
       def _hash
         [base, Sass::Util.set_hash(rest)].hash
       end

data/lib/sass/tree/extend_node.rb

@@ -25,17 +25,5 @@ module Sass::Tree
       @selector = selector
       super()
     end
-
-    # Disables this `@extend` due to it being inside a directive.
-    def disable!
-      @disabled = true
-    end
-
-    # Whether this `@extend` is disabled due to it being inside a directive.
-    #
-    # @return [Boolean]
-    def disabled?
-      @disabled
-    end
   end
 end

data/lib/sass/tree/node.rb

@@ -140,27 +140,6 @@ module Sass
         "(#{self.class} #{children.map {|c| c.inspect}.join(' ')})"
       end
 
-      # Converts a static CSS tree (e.g. the output of \{Tree::Visitors::Cssize})
-      # into another static CSS tree,
-      # with the given extensions applied to all relevant {RuleNode}s.
-      #
-      # @todo Link this to the reference documentation on `@extend`
-      #   when such a thing exists.
-      #
-      # @param extends [Sass::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-      #   The extensions to perform on this tree
-      # @return [Tree::Node] The resulting tree of static CSS nodes.
-      # @raise [Sass::SyntaxError] Only if there's a programmer error
-      #   and this is not a static CSS tree
-      def do_extend(extends)
-        node = dup
-        node.children = children.map {|c| c.do_extend(extends)}
-        node
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace(:filename => filename, :line => line)
-        raise e
-      end
-
       # Iterates through each node in the tree rooted at this node
       # in a pre-order walk.
       #

data/lib/sass/tree/root_node.rb

@@ -20,7 +20,7 @@ module Sass
         result = Visitors::Perform.visit(self)
         Visitors::CheckNesting.visit(result) # Check again to validate mixins
         result, extends = Visitors::Cssize.visit(result)
-        result = result.do_extend(extends) unless extends.empty?
+        Visitors::Extend.visit(result, extends)
         result.to_s
       end
     end

data/lib/sass/tree/rule_node.rb

@@ -103,15 +103,6 @@ module Sass::Tree
       last.is_a?(String) && last[-1] == ?,
     end
 
-    # Extends this Rule's selector with the given `extends`.
-    #
-    # @see Node#do_extend
-    def do_extend(extends)
-      node = dup
-      node.resolved_rules = resolved_rules.do_extend(extends)
-      node
-    end
-
     # A hash that will be associated with this rule in the CSS document
     # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
     # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).

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

@@ -54,18 +54,6 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     unless is_any_of?(parent, VALID_EXTEND_PARENTS)
       return "Extend directives may only be used within rules."
     end
-
-    if !child.disabled? &&
-        directive = @parents.find {|p| p.is_a?(Sass::Tree::DirectiveNode)}
-      child.disable!
-      Sass::Util.sass_warn <<WARNING
-DEPRECATION WARNING on line #{child.line}#{" of #{child.filename}" if child.filename}:
-  Using @extend within directives (e.g. #{directive.name}) is deprecated.
-  It will be an error in Sass 3.2.
-  This will only work once @extend is supported natively in the browser.
-WARNING
-      nil
-    end
   end
 
   def invalid_function_parent?(parent, child)

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

@@ -12,6 +12,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   attr_reader :parent
 
   def initialize
+    @parent_directives = []
     @extends = Sass::Util::SubsetMap.new
   end
 
@@ -38,9 +39,11 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # @yield A block in which the parent is set to `parent`.
   # @return [Object] The return value of the block.
   def with_parent(parent)
+    @parent_directives.push parent if parent.is_a?(Sass::Tree::DirectiveNode)
     old_parent, @parent = @parent, parent
     yield
   ensure
+    @parent_directives.pop if parent.is_a?(Sass::Tree::DirectiveNode)
     @parent = old_parent
   end
 
@@ -80,9 +83,20 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     raise e
   end
 
+  # A simple struct wrapping up information about a single `@extend` instance. A
+  # single [ExtendNode] can have multiple Extends if either the parent node or
+  # the extended selector is a comma sequence.
+  #
+  # @attr extender [Array<Sass::Selector::SimpleSequence, String>]
+  #   The selector of the CSS rule containing the `@extend`.
+  # @attr target [Array<Sass::Selector::Simple>] The selector being `@extend`ed.
+  # @attr node [Sass::Tree::ExtendNode] The node that produced this extend.
+  # @attr directives [Array<Sass::Tree::DirectiveNode>]
+  #   The directives containing the `@extend`.
+  Extend = Struct.new(:extender, :target, :node, :directives)
+
   # Registers an extension in the `@extends` subset map.
   def visit_extend(node)
-    return [] if node.disabled?
     node.resolved_selector.members.each do |seq|
       if seq.members.size > 1
         raise Sass::SyntaxError.new("Can't extend #{seq.to_a.join}: can't extend nested selectors")
@@ -99,7 +113,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
           raise Sass::SyntaxError.new("#{seq} can't extend: invalid selector")
         end
 
-        @extends[sel] = seq
+        @extends[sel] = Extend.new(seq, sel, node, @parent_directives.dup)
       end
     end
 

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

@@ -0,0 +1,42 @@
+# A visitor for performing selector inheritance on a static CSS tree.
+#
+# Destructively modifies the tree.
+class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
+  # @param root [Tree::Node] The root node of the tree to visit.
+  # @param extends [Sass::Util::SubsetMap{Selector::Simple =>
+  #                                       Sass::Tree::Visitors::Cssize::Extend}]
+  #   The extensions to perform on this tree.
+  # @return [Object] The return value of \{#visit} for the root node.
+  def self.visit(root, extends)
+    return if extends.empty?
+    new(extends).send(:visit, root)
+  end
+
+  protected
+
+  def initialize(extends)
+    @parent_directives = []
+    @extends = extends
+  end
+
+  # If an exception is raised, this adds proper metadata to the backtrace.
+  def visit(node)
+    super(node)
+  rescue Sass::SyntaxError => e
+    e.modify_backtrace(:filename => node.filename, :line => node.line)
+    raise e
+  end
+
+  # Keeps track of the current parent directives.
+  def visit_children(parent)
+    @parent_directives.push parent if parent.is_a?(Sass::Tree::DirectiveNode)
+    super
+  ensure
+    @parent_directives.pop if parent.is_a?(Sass::Tree::DirectiveNode)
+  end
+
+  # Applies the extend to a single rule's selector.
+  def visit_rule(node)
+    node.resolved_rules = node.resolved_rules.do_extend(@extends, @parent_directives)
+  end
+end

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

@@ -68,13 +68,14 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
   def visit_directive(node)
     was_in_directive = @in_directive
-    return node.value + ";" unless node.has_children
-    return node.value + " {}" if node.children.empty?
+    tab_str = '  ' * @tabs
+    return tab_str + node.value + ";" unless node.has_children
+    return tab_str + node.value + " {}" if node.children.empty?
     @in_directive = @in_directive || !node.is_a?(Sass::Tree::MediaNode)
     result = if node.style == :compressed
                "#{node.value}{"
              else
-               "#{'  ' * @tabs}#{node.value} {" + (node.style == :compact ? ' ' : "\n")
+               "#{tab_str}#{node.value} {" + (node.style == :compact ? ' ' : "\n")
              end
     was_prop = false
     first = true

data/lib/sass/util.rb

@@ -253,6 +253,23 @@ module Sass
         "#{name} #{str} must be between #{range.first}#{unit} and #{range.last}#{unit}")
     end
 
+    # Returns whether or not `seq1` is a subsequence of `seq2`. That is, whether
+    # or not `seq2` contains every element in `seq1` in the same order (and
+    # possibly more elements besides).
+    #
+    # @param seq1 [Array]
+    # @param seq2 [Array]
+    # @return [Boolean]
+    def subsequence?(seq1, seq2)
+      i = j = 0
+      loop do
+        return true if i == seq1.size
+        return false if j == seq2.size
+        i += 1 if seq1[i] == seq2[j]
+        j += 1
+      end
+    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/engine_test.rb

@@ -2492,6 +2492,22 @@ SASS
 SASS
   end
 
+  def test_nested_empty_directive
+    assert_equal <<CSS, render(<<SASS)
+@media screen {
+  .foo {
+    a: b; }
+
+  @unknown-directive; }
+CSS
+@media screen
+  .foo
+    a: b
+
+  @unknown-directive
+SASS
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?

data/test/sass/extend_test.rb

@@ -1369,13 +1369,13 @@ CSS
 SCSS
   end
 
-
-  def test_extend_in_media
+  def test_extend_out_of_media
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_in_media_inline.sass:
-  Using @extend within directives (e.g. @media) is deprecated.
-  It will be an error in Sass 3.2.
-  This will only work once @extend is supported natively in the browser.
+DEPRECATION WARNING on line 3 of test_extend_out_of_media_inline.sass:
+  @extending an outer selector from within @media is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
 WARN
 .foo {
   a: b; }
@@ -1387,12 +1387,13 @@ CSS
 SCSS
   end
 
-  def test_extend_in_unknown_directive
+  def test_extend_out_of_unknown_directive
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_in_unknown_directive_inline.sass:
-  Using @extend within directives (e.g. @flooblehoof) is deprecated.
-  It will be an error in Sass 3.2.
-  This will only work once @extend is supported natively in the browser.
+DEPRECATION WARNING on line 3 of test_extend_out_of_unknown_directive_inline.sass:
+  @extending an outer selector from within @flooblehoof is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
 WARN
 .foo {
   a: b; }
@@ -1406,6 +1407,181 @@ CSS
 SCSS
   end
 
+  def test_extend_out_of_nested_directives
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 4 of test_extend_out_of_nested_directives_inline.sass:
+  @extending an outer selector from within @flooblehoof is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
+WARN
+@media screen {
+  .foo {
+    a: b; }
+
+  @flooblehoof {} }
+CSS
+@media screen {
+  .foo {a: b}
+  @flooblehoof {
+    .bar {@extend .foo}
+  }
+}
+SCSS
+  end
+
+  def test_extend_within_media
+    assert_equal(<<CSS, render(<<SCSS))
+@media screen {
+  .foo, .bar {
+    a: b; } }
+CSS
+@media screen {
+  .foo {a: b}
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
+  def test_extend_within_unknown_directive
+    assert_equal(<<CSS, render(<<SCSS))
+@flooblehoof {
+  .foo, .bar {
+    a: b; } }
+CSS
+@flooblehoof {
+  .foo {a: b}
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
+  def test_extend_within_nested_directives
+    assert_equal(<<CSS, render(<<SCSS))
+@media screen {
+  @flooblehoof {
+    .foo, .bar {
+      a: b; } } }
+CSS
+@media screen {
+  @flooblehoof {
+    .foo {a: b}
+    .bar {@extend .foo}
+  }
+}
+SCSS
+  end
+
+  def test_extend_within_disparate_media
+    assert_equal(<<CSS, render(<<SCSS))
+@media screen {
+  .foo, .bar {
+    a: b; } }
+CSS
+@media screen {.foo {a: b}}
+@media screen {.bar {@extend .foo}}
+SCSS
+  end
+
+  def test_extend_within_disparate_unknown_directive
+    assert_equal(<<CSS, render(<<SCSS))
+@flooblehoof {
+  .foo, .bar {
+    a: b; } }
+
+@flooblehoof {}
+CSS
+@flooblehoof {.foo {a: b}}
+@flooblehoof {.bar {@extend .foo}}
+SCSS
+  end
+
+  def test_extend_within_disparate_nested_directives
+    assert_equal(<<CSS, render(<<SCSS))
+@media screen {
+  @flooblehoof {
+    .foo, .bar {
+      a: b; } } }
+@media screen {
+  @flooblehoof {} }
+CSS
+@media screen {@flooblehoof {.foo {a: b}}}
+@media screen {@flooblehoof {.bar {@extend .foo}}}
+SCSS
+  end
+
+  def test_extend_within_and_without_media
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 4 of test_extend_within_and_without_media_inline.sass:
+  @extending an outer selector from within @media is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
+WARN
+.foo {
+  a: b; }
+
+@media screen {
+  .foo, .bar {
+    c: d; } }
+CSS
+.foo {a: b}
+@media screen {
+  .foo {c: d}
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
+  def test_extend_within_and_without_unknown_directive
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 4 of test_extend_within_and_without_unknown_directive_inline.sass:
+  @extending an outer selector from within @flooblehoof is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
+WARN
+.foo {
+  a: b; }
+
+@flooblehoof {
+  .foo, .bar {
+    c: d; } }
+CSS
+.foo {a: b}
+@flooblehoof {
+  .foo {c: d}
+  .bar {@extend .foo}
+}
+SCSS
+  end
+
+  def test_extend_within_and_without_nested_directives
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 5 of test_extend_within_and_without_nested_directives_inline.sass:
+  @extending an outer selector from within @flooblehoof is deprecated.
+  You may only @extend selectors within the same directive.
+  This will be an error in Sass 3.3.
+  It can only work once @extend is supported natively in the browser.
+WARN
+@media screen {
+  .foo {
+    a: b; }
+
+  @flooblehoof {
+    .foo, .bar {
+      c: d; } } }
+CSS
+@media screen {
+  .foo {a: b}
+  @flooblehoof {
+    .foo {c: d}
+    .bar {@extend .foo}
+  }
+}
+SCSS
+  end
+
   # Regression Tests
 
   def test_duplicated_selector_with_newlines

data/test/sass/util_test.rb

@@ -120,6 +120,16 @@ 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_subsequence
+    assert(subsequence?([1, 2, 3], [1, 2, 3]))
+    assert(subsequence?([1, 2, 3], [1, :a, 2, :b, 3]))
+    assert(subsequence?([1, 2, 3], [:a, 1, :b, :c, 2, :d, 3, :e, :f]))
+
+    assert(!subsequence?([1, 2, 3], [1, 2]))
+    assert(!subsequence?([1, 2, 3], [1, 3, 2]))
+    assert(!subsequence?([1, 2, 3], [3, 2, 1]))
+  end
+
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 3
   - 1
-  - 18
-  version: 3.1.18
+  - 19
+  version: 3.1.19
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 -07:00
+date: 2012-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/deep_copy.rb
+- lib/sass/tree/visitors/extend.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/cssize.rb
 - lib/sass/tree/visitors/convert.rb