sass 3.2.0.alpha.261 → 3.2.0.alpha.268

data/REVISION

@@ -1 +1 @@
-fe4e2a9b7d9b0cc0eceb20e97dc43875258d6424
+bdee97a283eb9a69301f0bd60e8dc28db78517c3

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.261
+3.2.0.alpha.268

data/lib/sass/engine.rb

@@ -683,8 +683,9 @@ WARNING
         raise SyntaxError.new("Invalid extend directive '@extend': expected expression.") unless value
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath extend directives.",
           :line => @line + 1) unless line.children.empty?
+        optional = !!value.gsub!(/\s+#{Sass::SCSS::RX::OPTIONAL}$/, '')
         offset = line.offset + line.text.index(value).to_i
-        Tree::ExtendNode.new(parse_interp(value, offset))
+        Tree::ExtendNode.new(parse_interp(value, offset), optional)
       when 'warn'
         raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath warn directives.",

data/lib/sass/less.rb

@@ -25,14 +25,14 @@ module Less
             sel = selector_str(path)
             base = selector_str(selector_base(path))
             if base == sel
-              env << Node::SassNode.new(Sass::Tree::ExtendNode.new([sel]))
+              env << Node::SassNode.new(Sass::Tree::ExtendNode.new([sel], false))
             else
               Sass::Util.sass_warn <<WARNING
 WARNING: Sass doesn't support mixing in selector sequences.
 Replacing "#{sel}" with "@extend #{base}"
 WARNING
               env << Node::SassNode.new(Sass::Tree::CommentNode.new(["// #{sel};"], :silent))
-              env << Node::SassNode.new(Sass::Tree::ExtendNode.new([base]))
+              env << Node::SassNode.new(Sass::Tree::ExtendNode.new([base], false))
             end
           end
         end

data/lib/sass/scss/parser.rb

@@ -289,7 +289,10 @@ module Sass
       end
 
       def extend_directive
-        node(Sass::Tree::ExtendNode.new(expr!(:selector_sequence)))
+        selector = expr!(:selector_sequence)
+        optional = tok(OPTIONAL)
+        ss
+        node(Sass::Tree::ExtendNode.new(selector, !!optional))
       end
 
       def import_directive

data/lib/sass/scss/rx.rb

@@ -118,6 +118,7 @@ module Sass
       HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/
       ANY = /:(-[-\w]+-)?any\(/i
+      OPTIONAL = /!#{W}optional/i
 
       IDENT_HYPHEN_INTERP = /-(#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/

data/lib/sass/selector/simple_sequence.rb

@@ -102,7 +102,9 @@ module Sass
           # seq is A, sels is B, and self is C
 
           self_without_sel = self.members - sels
+          group.each {|e, _| e.result = :failed_to_unify}
           next unless unified = seq.members.last.unify(self_without_sel, subject?)
+          group.each {|e, _| e.result = :succeeded}
           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])

data/lib/sass/tree/extend_node.rb

@@ -17,12 +17,19 @@ module Sass::Tree
     # @return [Array<String, Sass::Script::Node>]
     attr_accessor :selector
 
+    # Whether the `@extend` is allowed to match no selectors or not.
+    #
+    # @return [Boolean]
+    def optional?; @optional; end
+
     # @param selector [Array<String, Sass::Script::Node>]
     #   The CSS selector to extend,
     #   interspersed with {Sass::Script::Node}s
     #   representing `#{}`-interpolation.
-    def initialize(selector)
+    # @param optional [Boolean] See \{#optional}
+    def initialize(selector, optional)
       @selector = selector
+      @optional = optional
       super()
     end
   end

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

@@ -109,7 +109,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}#{semi}\n"
+    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}#{semi}#{" !optional" if node.optional?}\n"
   end
 
   def visit_for(node)

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

@@ -88,13 +88,17 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # 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>]
+  # @attr extender [Sass::Selector::Sequence]
   #   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)
+  # @attr result [Symbol]
+  #   The result of this extend. One of `:not_found` (the target doesn't exist
+  #   in the document), `:failed_to_unify` (the target exists but cannot be
+  #   unified with the extender), or `:succeeded`.
+  Extend = Struct.new(:extender, :target, :node, :directives, :result)
 
   # Registers an extension in the `@extends` subset map.
   def visit_extend(node)
@@ -116,7 +120,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
           raise Sass::SyntaxError.new("#{seq} can't extend: invalid selector")
         end
 
-        @extends[sel] = Extend.new(seq, sel, node, @parent_directives.dup)
+        @extends[sel] = Extend.new(seq, sel, node, @parent_directives.dup, :not_found)
       end
     end
 

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

@@ -2,6 +2,9 @@
 #
 # Destructively modifies the tree.
 class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
+  # Performs the given extensions on the static CSS tree based in `root`, then
+  # validates that all extends matched some selector.
+  #
   # @param root [Tree::Node] The root node of the tree to visit.
   # @param extends [Sass::Util::SubsetMap{Selector::Simple =>
   #                                       Sass::Tree::Visitors::Cssize::Extend}]
@@ -10,6 +13,7 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
   def self.visit(root, extends)
     return if extends.empty?
     new(extends).send(:visit, root)
+    check_extends_fired! extends
   end
 
   protected
@@ -39,4 +43,25 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
   def visit_rule(node)
     node.resolved_rules = node.resolved_rules.do_extend(@extends, @parent_directives)
   end
+
+  private
+
+  def self.check_extends_fired!(extends)
+    extends.each_value do |ex|
+      next if ex.result == :succeeded || ex.node.optional?
+      warn = "\"#{ex.extender}\" failed to @extend \"#{ex.target}\"."
+      reason =
+        if ex.result == :not_found
+          "The selector \"#{ex.target}\" was not found."
+        else
+          "No selectors matching \"#{ex.target}\" could be unified with \"#{ex.extender}\"."
+        end
+
+      Sass::Util.sass_warn <<WARN
+WARNING on line #{ex.node.line}#{" of #{ex.node.filename}" if ex.node.filename}: #{warn}
+  #{reason}
+  This will be an error in future releases of Sass.
+WARN
+    end
+  end
 end

data/lib/sass/util/subset_map.rb

@@ -96,6 +96,14 @@ module Sass
       def [](set)
         get(set).map {|v, _| v}
       end
+
+      # Iterates over each value in the subset map. Ignores keys completely. If
+      # multiple keys have the same value, this will return them multiple times.
+      #
+      # @yield [Object] Each value in the map.
+      def each_value
+        @vals.each {|v| yield v}
+      end
     end
   end
 end

data/test/sass/conversion_test.rb

@@ -1552,6 +1552,17 @@ foo bar {
 SCSS
   end
 
+  def test_extend_with_optional
+    assert_scss_to_sass <<SASS, <<SCSS
+foo
+  @extend .bar !optional
+SASS
+foo {
+  @extend .bar !optional;
+}
+SCSS
+  end
+
   ## Regression Tests
 
   def test_empty_lists

data/test/sass/extend_test.rb

@@ -152,7 +152,10 @@ SCSS
   def test_id_unification
     assert_unification '.foo.bar', '#baz {@extend .foo}', '.foo.bar, .bar#baz'
     assert_unification '.foo#baz', '#baz {@extend .foo}', '#baz'
-    assert_unification '.foo#baz', '#bar {@extend .foo}', '.foo#baz'
+
+    assert_extend_doesnt_match('#bar', '.foo', :failed_to_unify, 2) do
+      assert_unification '.foo#baz', '#bar {@extend .foo}', '.foo#baz'
+    end
   end
 
   def test_universal_unification_with_simple_target
@@ -175,7 +178,11 @@ SCSS
   def test_universal_unification_with_namespaced_universal_target
     assert_unification 'ns|*.foo', '* {@extend .foo}', 'ns|*'
     assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
-    assert_unification 'ns1|*.foo', 'ns2|* {@extend .foo}', 'ns1|*.foo'
+
+    assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
+      assert_unification 'ns1|*.foo', 'ns2|* {@extend .foo}', 'ns1|*.foo'
+    end
+
     assert_unification 'ns|*.foo', 'ns|* {@extend .foo}', 'ns|*'
   end
 
@@ -191,7 +198,11 @@ SCSS
   def test_universal_unification_with_namespaced_element_target
     assert_unification 'ns|a.foo', '* {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
-    assert_unification 'ns1|a.foo', 'ns2|* {@extend .foo}', 'ns1|a.foo'
+
+    assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
+      assert_unification 'ns1|a.foo', 'ns2|* {@extend .foo}', 'ns1|a.foo'
+    end
+
     assert_unification 'ns|a.foo', 'ns|* {@extend .foo}', 'ns|a'
   end
 
@@ -214,7 +225,11 @@ SCSS
   def test_element_unification_with_namespaced_universal_target
     assert_unification 'ns|*.foo', 'a {@extend .foo}', 'ns|*.foo, ns|a'
     assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
-    assert_unification 'ns1|*.foo', 'ns2|a {@extend .foo}', 'ns1|*.foo'
+
+    assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
+      assert_unification 'ns1|*.foo', 'ns2|a {@extend .foo}', 'ns1|*.foo'
+    end
+
     assert_unification 'ns|*.foo', 'ns|a {@extend .foo}', 'ns|*.foo, ns|a'
   end
 
@@ -225,13 +240,20 @@ SCSS
     assert_unification '*|a.foo', '*|a {@extend .foo}', '*|a'
     assert_unification 'a.foo', 'ns|a {@extend .foo}', 'a.foo, ns|a'
     assert_unification '*|a.foo', 'ns|a {@extend .foo}', '*|a.foo, ns|a'
-    assert_unification 'a.foo', 'h1 {@extend .foo}', 'a.foo'
+
+    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
+      assert_unification 'a.foo', 'h1 {@extend .foo}', 'a.foo'
+    end
   end
 
   def test_element_unification_with_namespaced_element_target
     assert_unification 'ns|a.foo', 'a {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
-    assert_unification 'ns1|a.foo', 'ns2|a {@extend .foo}', 'ns1|a.foo'
+
+    assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
+      assert_unification 'ns1|a.foo', 'ns2|a {@extend .foo}', 'ns1|a.foo'
+    end
+
     assert_unification 'ns|a.foo', 'ns|a {@extend .foo}', 'ns|a'
   end
 
@@ -246,8 +268,15 @@ SCSS
   def test_pseudo_unification
     assert_unification ':foo.baz', ':foo(2n+1) {@extend .baz}', ':foo.baz, :foo:foo(2n+1)'
     assert_unification ':foo.baz', '::foo {@extend .baz}', ':foo.baz, :foo::foo'
-    assert_unification '::foo.baz', '::bar {@extend .baz}', '::foo.baz'
-    assert_unification '::foo.baz', '::foo(2n+1) {@extend .baz}', '::foo.baz'
+
+    assert_extend_doesnt_match('::bar', '.baz', :failed_to_unify, 2) do
+      assert_unification '::foo.baz', '::bar {@extend .baz}', '::foo.baz'
+    end
+
+    assert_extend_doesnt_match('::foo(2n+1)', '.baz', :failed_to_unify, 2) do
+      assert_unification '::foo.baz', '::foo(2n+1) {@extend .baz}', '::foo.baz'
+    end
+
     assert_unification '::foo.baz', '::foo {@extend .baz}', '::foo'
     assert_unification '::foo(2n+1).baz', '::foo(2n+1) {@extend .baz}', '::foo(2n+1)'
     assert_unification ':foo.baz', ':bar {@extend .baz}', ':foo.baz, :foo:bar'
@@ -318,7 +347,9 @@ SCSS
   end
 
   def test_long_extendee_requires_all_selectors
-    assert_extends '.foo', '.baz {@extend .foo.bar}', '.foo'
+    assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
+      assert_extends '.foo', '.baz {@extend .foo.bar}', '.foo'
+    end
   end
 
   def test_long_extendee_matches_supersets
@@ -340,8 +371,13 @@ SCSS
   end
 
   def test_long_extender_aborts_unification
-    assert_extends 'a.foo#bar', 'h1.baz {@extend .foo}', 'a.foo#bar'
-    assert_extends 'a.foo#bar', '.bang#baz {@extend .foo}', 'a.foo#bar'
+    assert_extend_doesnt_match('h1.baz', '.foo', :failed_to_unify, 2) do
+      assert_extends 'a.foo#bar', 'h1.baz {@extend .foo}', 'a.foo#bar'
+    end
+
+    assert_extend_doesnt_match('.bang#baz', '.foo', :failed_to_unify, 2) do
+      assert_extends 'a.foo#bar', '.bang#baz {@extend .foo}', 'a.foo#bar'
+    end
   end
 
   ## Nested Extenders
@@ -355,7 +391,9 @@ SCSS
   end
 
   def test_nested_extender_aborts_unification
-    assert_extends 'baz.foo', 'foo bar {@extend .foo}', 'baz.foo'
+    assert_extend_doesnt_match('foo bar', '.foo', :failed_to_unify, 2) do
+      assert_extends 'baz.foo', 'foo bar {@extend .foo}', 'baz.foo'
+    end
   end
 
   def test_nested_extender_alternates_parents
@@ -771,7 +809,8 @@ SCSS
   end
 
   def test_placeholder_selector_as_modifier
-    assert_equal <<CSS, render(<<SCSS)
+    assert_extend_doesnt_match('div', '%foo', :failed_to_unify, 3) do
+      assert_equal <<CSS, render(<<SCSS)
 a.baz.bar {
   color: blue; }
 CSS
@@ -779,6 +818,7 @@ a%foo.baz {color: blue}
 .bar {@extend %foo}
 div {@extend %foo}
 SCSS
+    end
   end
 
   def test_placeholder_interpolation
@@ -805,7 +845,7 @@ SCSS
 
   def test_extend_out_of_media
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_media_inline.sass:
+DEPRECATION WARNING on line 3 of test_extend_out_of_media_inline.scss:
   @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.
@@ -823,7 +863,7 @@ SCSS
 
   def test_extend_out_of_unknown_directive
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_unknown_directive_inline.sass:
+DEPRECATION WARNING on line 3 of test_extend_out_of_unknown_directive_inline.scss:
   @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.
@@ -843,7 +883,7 @@ SCSS
 
   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:
+DEPRECATION WARNING on line 4 of test_extend_out_of_nested_directives_inline.scss:
   @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.
@@ -946,7 +986,7 @@ SCSS
 
   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:
+DEPRECATION WARNING on line 4 of test_extend_within_and_without_media_inline.scss:
   @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.
@@ -969,7 +1009,7 @@ SCSS
 
   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:
+DEPRECATION WARNING on line 4 of test_extend_within_and_without_unknown_directive_inline.scss:
   @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.
@@ -992,7 +1032,7 @@ SCSS
 
   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:
+DEPRECATION WARNING on line 5 of test_extend_within_and_without_nested_directives_inline.scss:
   @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.
@@ -1071,6 +1111,74 @@ x! .bar {
 CSS
 x! .bar {a: b}
 y! .bap {@extend .bar}
+SCSS
+end
+
+  def test_extend_warns_when_extendee_doesnt_exist
+    assert_warning(<<WARN) {assert_equal("", render(<<SCSS))}
+WARNING on line 1 of test_extend_warns_when_extendee_doesnt_exist_inline.scss: ".foo" failed to @extend ".bar".
+  The selector ".bar" was not found.
+  This will be an error in future releases of Sass.
+WARN
+.foo {@extend .bar}
+SCSS
+  end
+
+  def test_extend_warns_when_extension_fails
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
+WARNING on line 2 of test_extend_warns_when_extension_fails_inline.scss: "b.foo" failed to @extend ".bar".
+  No selectors matching ".bar" could be unified with "b.foo".
+  This will be an error in future releases of Sass.
+WARN
+a.bar {
+  a: b; }
+CSS
+a.bar {a: b}
+b.foo {@extend .bar}
+SCSS
+  end
+
+  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+a.bar {
+  a: b; }
+
+.bar, b.foo {
+  c: d; }
+CSS
+a.bar {a: b}
+.bar {c: d}
+b.foo {@extend .bar}
+SCSS
+  end
+
+  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+a.bar {
+  a: b; }
+
+.bar, b.foo {
+  c: d; }
+CSS
+a.bar {a: b}
+.bar {c: d}
+b.foo {@extend .bar}
+SCSS
+  end
+
+  def test_optional_extend_does_not_warn_when_extendee_doesnt_exist
+    assert_no_warning {assert_equal("", render(<<SCSS))}
+.foo {@extend .bar !optional}
+SCSS
+  end
+
+  def test_optional_extend_does_not_warn_when_extension_fails
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+a.bar {
+  a: b; }
+CSS
+a.bar {a: b}
+b.foo {@extend .bar !optional}
 SCSS
   end
 
@@ -1184,6 +1292,22 @@ SCSS
 
   private
 
+  def assert_extend_doesnt_match(extender, target, reason, line, syntax = :scss)
+    warn = "\"#{extender}\" failed to @extend \"#{target}\"."
+    reason = 
+      if reason == :not_found
+        "The selector \"#{target}\" was not found."
+      else
+        "No selectors matching \"#{target}\" could be unified with \"#{extender}\"."
+      end
+
+    assert_warning(<<WARNING) {yield}
+WARNING on line #{line} of #{filename_for_test syntax}: #{warn}
+  #{reason}
+  This will be an error in future releases of Sass.
+WARNING
+  end
+
   def assert_unification(selector, extension, unified)
     # Do some trickery so the first law of extend doesn't get in our way.
     assert_extends(
@@ -1203,7 +1327,8 @@ SCSS
   end
 
   def render(sass, options = {})
+    options = {:syntax => :scss}.merge(options)
     munge_filename options
-    Sass::Engine.new(sass, {:syntax => :scss}.merge(options)).render
+    Sass::Engine.new(sass, options).render
   end
 end

data/test/test_helper.rb

@@ -47,6 +47,15 @@ class Test::Unit::TestCase
     $stderr = the_real_stderr
   end
 
+  def assert_no_warning
+    the_real_stderr, $stderr = $stderr, StringIO.new
+    yield
+
+    assert_equal '', $stderr.string
+  ensure
+    $stderr = the_real_stderr
+  end
+
   def silence_warnings(&block)
     Sass::Util.silence_warnings(&block)
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302359
+  hash: 592302341
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 261
-  version: 3.2.0.alpha.261
+  - 268
+  version: 3.2.0.alpha.268
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 -04:00
+date: 2012-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency