sass 3.3.0.alpha.370 → 3.3.0.alpha.372

data/REVISION

@@ -1 +1 @@
-cc1787dbfd5db4c5ecb498d6be100336c8e23ef0
+91702cc715e601a0bf682c87983f0b8d9ceb0963

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.370
+3.3.0.alpha.372

data/VERSION_DATE

@@ -1 +1 @@
-08 October 2013 21:30:40 GMT
+10 October 2013 16:29:15 GMT

data/lib/sass/environment.rb

@@ -1,7 +1,6 @@
 require 'set'
 
 module Sass
-
   # The abstract base class for lexical environments for SassScript.
   class BaseEnvironment
     class << self
@@ -56,12 +55,8 @@ module Sass
     # The options passed to the Sass Engine.
     attr_reader :options
 
-    # [Environment] The caller environment
     attr_writer :caller
-
-    # [Environment] The content environment
     attr_writer :content
-    attr_writer :selector
 
     # variable
     # Script::Value
@@ -92,7 +87,9 @@ module Sass
 
     # The content passed to this environment. This is naturally only set
     # for mixin body environments with content passed in.
-    # @return {Environment?}
+    #
+    # @return {[Array<Sass::Tree::Node>, Environment]?} The content nodes and
+    #   the lexical environment of the content block.
     def content
       @content || (@parent && @parent.content)
     end
@@ -103,10 +100,26 @@ module Sass
     # @return [Selector::CommaSequence?] The current selector, with any
     #   nesting fully resolved.
     def selector
-      parent_selector = @caller ? @caller.selector : (@parent && @parent.selector)
-      return parent_selector unless @selector
-      return @selector.resolve_parent_refs(parent_selector) if parent_selector
-      @selector
+      return if @no_selector
+      return @selector if @selector
+      return @caller.selector if @caller
+      return @parent.selector if @parent
+      nil
+    end
+
+    def selector=(value)
+      @selector = value
+      @no_selector = false
+    end
+
+    # Mark this environment as having no selector information. Unlike setting
+    # {#selector} to nil, this indicates that this environment should not
+    # inherit its {#parent}'s or {#caller}'s selector.
+    #
+    # This will be overwritten if {#selector} is set.
+    def no_selector!
+      @selector = nil
+      @no_selector = true
     end
 
     # The top-level Environment object.

data/lib/sass/selector/comma_sequence.rb

@@ -18,9 +18,12 @@ module Sass
       # handling commas appropriately.
       #
       # @param super_cseq [CommaSequence] The parent selector
+      # @param implicit_parent [Boolean] Whether the the parent
+      #   selector should automatically be prepended to the resolved
+      #   selector if it contains no parent refs.
       # @return [CommaSequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
-      def resolve_parent_refs(super_cseq)
+      def resolve_parent_refs(super_cseq, implicit_parent = true)
         if super_cseq.nil?
           if @members.any? do |sel|
                sel.members.any? do |sel_or_op|
@@ -36,7 +39,7 @@ module Sass
 
         CommaSequence.new(
           super_cseq.members.map do |super_seq|
-            @members.map {|seq| seq.resolve_parent_refs(super_seq)}
+            @members.map {|seq| seq.resolve_parent_refs(super_seq, implicit_parent)}
           end.flatten)
       end
 

data/lib/sass/selector/sequence.rb

@@ -44,14 +44,20 @@ module Sass
       # handling commas appropriately.
       #
       # @param super_seq [Sequence] The parent selector sequence
+      # @param implicit_parent [Boolean] Whether the the parent
+      #   selector should automatically be prepended to the resolved
+      #   selector if it contains no parent refs.
       # @return [Sequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
-      def resolve_parent_refs(super_seq)
+      def resolve_parent_refs(super_seq, implicit_parent)
         members = @members.dup
         nl = (members.first == "\n" && members.shift)
-        unless members.any? do |seq_or_op|
-                 seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
-               end
+        contains_parent_ref = members.any? do |seq_or_op|
+          seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
+        end
+        return self if !implicit_parent && !contains_parent_ref
+
+        unless contains_parent_ref
           old_members, members = members, []
           members << nl if nl
           members << SimpleSequence.new([Parent.new], false)

data/lib/sass/tree/node.rb

@@ -8,14 +8,15 @@ module Sass
   # in addition to nodes for CSS rules and properties.
   # Nodes that only appear in this state are called **dynamic nodes**.
   #
-  # {Tree::Visitors::Perform} creates a static Sass tree, which is different.
-  # It still has nodes for CSS rules and properties
-  # but it doesn't have any dynamic-generation-related nodes.
-  # The nodes in this state are in the same structure as the Sass document:
-  # rules and properties are nested beneath one another.
-  # Nodes that can be in this state or in the dynamic state
-  # are called **static nodes**; nodes that can only be in this state
-  # are called **solely static nodes**.
+  # {Tree::Visitors::Perform} creates a static Sass tree, which is
+  # different. It still has nodes for CSS rules and properties but it
+  # doesn't have any dynamic-generation-related nodes. The nodes in
+  # this state are in a similar structure to the Sass document: rules
+  # and properties are nested beneath one another, although the
+  # {Tree::RuleNode} selectors are already in their final state. Nodes
+  # that can be in this state or in the dynamic state are called
+  # **static nodes**; nodes that can only be in this state are called
+  # **solely static nodes**.
   #
   # {Tree::Visitors::Cssize} is then used to create a static CSS tree.
   # This is like a static Sass tree,

data/lib/sass/tree/rule_node.rb

@@ -16,18 +16,17 @@ module Sass::Tree
     # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :rule
 
-    # The CSS selector for this rule,
-    # without any unresolved interpolation
-    # but with parent references still intact.
-    # It's only set once {Tree::Visitors::Perform} has been run.
-    #
+    # The CSS selector for this rule, without any unresolved
+    # interpolation but with parent references still intact. It's only
+    # guaranteed to be set once {Tree::Visitors::Perform} has been
+    # run, but it may be set before then for optimization reasons.
     #
     # @return [Selector::CommaSequence]
     attr_accessor :parsed_rules
 
-    # The CSS selector for this rule,
-    # without any unresolved interpolation or parent references.
-    # It's only set once {Tree::Visitors::Cssize} has been run.
+    # The CSS selector for this rule, without any unresolved
+    # interpolation or parent references. It's only set once
+    # {Tree::Visitors::Perform} has been run.
     #
     # @return [Selector::CommaSequence]
     attr_accessor :resolved_rules

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

@@ -191,14 +191,9 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     result
   end
 
-  # Resolves parent references and nested selectors,
-  # and updates the indentation of the rule node based on the nesting level.
+  # Updates the indentation of the rule node based on the nesting
+  # level. The selectors were resolved in {Perform}.
   def visit_rule(node)
-    parent_resolved_rules = parent.is_a?(Sass::Tree::RuleNode) ? parent.resolved_rules : nil
-    # It's possible for resolved_rules to be set
-    # if we've duplicated this node during @media bubbling
-    node.resolved_rules ||= node.parsed_rules.resolve_parent_refs(parent_resolved_rules)
-
     yield
 
     rules = node.children.select {|c| c.is_a?(Sass::Tree::RuleNode) || c.bubbles?}

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

@@ -330,7 +330,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
       self.class.perform_arguments(mixin, args, keywords, splat) do |env|
         env.caller = Sass::Environment.new(@environment)
-        env.content = node.children if node.has_children
+        env.content = [node.children, @environment] if node.has_children
 
         trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
         with_environment(env) {trace_node.children = mixin.tree.map {|c| visit(c)}.flatten}
@@ -346,11 +346,13 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   end
 
   def visit_content(node)
-    content = @environment.content
+    content, content_env = @environment.content
     return [] unless content
     @environment.stack.with_mixin(node.filename, node.line, '@content') do
       trace_node = Sass::Tree::TraceNode.from_node('@content', node)
-      with_environment(@environment.caller) do
+      content_env = Sass::Environment.new(content_env)
+      content_env.caller = Sass::Environment.new(@environment)
+      with_environment(content_env) do
         trace_node.children = content.map {|c| visit(c.dup)}.flatten
       end
       trace_node
@@ -378,15 +380,28 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_rule(node)
+    old_at_root, @at_root = @at_root, false
     parser = Sass::SCSS::StaticParser.new(run_interp(node.rule),
       node.filename, node.options[:importer], node.line)
     node.parsed_rules ||= parser.parse_selector
+    node.resolved_rules = node.parsed_rules.resolve_parent_refs(@environment.selector, !old_at_root)
     node.stack_trace = @environment.stack.to_s if node.options[:trace_selectors]
     with_environment Sass::Environment.new(@environment, node.options) do
-      @environment.selector = node.parsed_rules
+      @environment.selector = node.resolved_rules
       node.children = node.children.map {|c| visit(c)}.flatten
     end
     node
+  ensure
+    @at_root = old_at_root
+  end
+
+  # Sets a variable that indicates that the first level of rule nodes
+  # shouldn't include the parent selector by default.
+  def visit_atroot(node)
+    old_at_root, @at_root = @at_root, true
+    yield.children
+  ensure
+    @at_root = old_at_root
   end
 
   # Loads the new variable value into the environment.
@@ -424,7 +439,11 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   def visit_directive(node)
     node.resolved_value = run_interp(node.value)
-    yield
+    with_environment Sass::Environment.new(@environment) do
+      @environment.no_selector!
+      node.children = node.children.map {|c| visit(c)}.flatten
+      node
+    end
   end
 
   def visit_media(node)

data/test/sass/scss/scss_test.rb

@@ -1958,6 +1958,51 @@ CSS
 SCSS
   end
 
+  def test_at_root_with_parent_ref
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: b; }
+CSS
+.foo {
+  @at-root & {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_multi_level_at_root_with_parent_ref
+    assert_equal <<CSS, render(<<SCSS)
+.foo .bar {
+  a: b; }
+CSS
+.foo {
+  @at-root & {
+    .bar {
+      @at-root & {
+        a: b;
+      }
+    }
+  }
+}
+SCSS
+  end
+
+  def test_multi_level_at_root_with_inner_parent_ref
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root .bar {
+    @at-root & {
+      a: b;
+    }
+  }
+}
+SCSS
+  end
+
   ## Selector Script
 
   def test_selector_script
@@ -2105,6 +2150,21 @@ CSS
 SCSS
   end
 
+  def test_multi_level_at_root_with_inner_selector_script
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root .bar {
+    @at-root \#{&} {
+      a: b;
+    }
+  }
+}
+SCSS
+  end
+
   def test_at_root_with_at_root_through_mixin
     assert_equal(<<CSS, render(<<SCSS))
 .bar-baz {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302569
+  hash: 592302565
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 370
-  version: 3.3.0.alpha.370
+  - 372
+  version: 3.3.0.alpha.372
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-08 00:00:00 -04:00
+date: 2013-10-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency