sass 3.1.21 → 3.2.0.alpha.3

data/lib/sass/tree/debug_node.rb

@@ -6,7 +6,7 @@ module Sass
     class DebugNode < Node
       # The expression to print.
       # @return [Script::Node] 
-      attr_accessor :expr
+      attr_reader :expr
 
       # @param expr [Script::Node] The expression to print
       def initialize(expr)

data/lib/sass/tree/directive_node.rb

@@ -19,10 +19,5 @@ module Sass::Tree
       @value = value
       super()
     end
-
-    # @return [String] The name of the directive, including `@`.
-    def name
-      value.gsub(/ .*$/, '')
-    end
   end
 end

data/lib/sass/tree/each_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
 
     # The parse tree for the list.
     # @param [Script::Node]
-    attr_accessor :list
+    attr_reader :list
 
     # @param var [String] The name of the loop variable
     # @param list [Script::Node] The parse tree for the list

data/lib/sass/tree/extend_node.rb

@@ -15,7 +15,7 @@ module Sass::Tree
     # representing `#{}`-interpolation.
     #
     # @return [Array<String, Sass::Script::Node>]
-    attr_accessor :selector
+    attr_reader :selector
 
     # @param selector [Array<String, Sass::Script::Node>]
     #   The CSS selector to extend,

data/lib/sass/tree/for_node.rb

@@ -11,11 +11,11 @@ module Sass::Tree
 
     # The parse tree for the initial expression.
     # @return [Script::Node]
-    attr_accessor :from
+    attr_reader :from
 
     # The parse tree for the final expression.
     # @return [Script::Node]
-    attr_accessor :to
+    attr_reader :to
 
     # Whether to include `to` in the loop or stop just before.
     # @return [Boolean]

data/lib/sass/tree/function_node.rb

@@ -13,7 +13,7 @@ module Sass
       # the default value of the argument
       #
       # @return [Array<Script::Node>]
-      attr_accessor :args
+      attr_reader :args
 
       # @param name [String] The function name
       # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.

data/lib/sass/tree/if_node.rb

@@ -13,7 +13,7 @@ module Sass::Tree
     # If this is nil, this is an `@else` node, not an `@else if`.
     #
     # @return [Script::Expr]
-    attr_accessor :expr
+    attr_reader :expr
 
     # The next {IfNode} in the if-else list, or `nil`.
     #
@@ -35,6 +35,12 @@ module Sass::Tree
       @last_else = node
     end
 
+    # @see Node#options=
+    def options=(options)
+      super
+      self.else.options = options if self.else
+    end
+
     def _dump(f)
       Marshal.dump([self.expr, self.else, self.children])
     end
@@ -48,5 +54,12 @@ module Sass::Tree
         node.else ? node.else.instance_variable_get('@last_else') : node)
       node
     end
+
+    # @see Node#deep_copy
+    def deep_copy
+      node = super
+      node.else = self.else.deep_copy if self.else
+      node
+    end
   end
 end

data/lib/sass/tree/media_node.rb

@@ -6,9 +6,9 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class MediaNode < DirectiveNode
-    # The media query. A list of comma-separated queries (e.g. `print` or `screen`).
+    # The media query (e.g. `print` or `screen`).
     #
-    # @return [Array<String>]
+    # @return [String]
     attr_accessor :query
 
     # @see RuleNode#tabs
@@ -17,7 +17,7 @@ module Sass::Tree
     # @see RuleNode#group_end
     attr_accessor :group_end
 
-    # @param query [Array<String>] See \{#query}
+    # @param query [String] See \{#query}
     def initialize(query)
       @query = query
       @tabs = 0
@@ -26,7 +26,7 @@ module Sass::Tree
 
     # @see DirectiveNode#value
     def value
-      "@media #{query.join(', ')}"
+      "@media #{query}"
     end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -13,7 +13,7 @@ module Sass
       # and the parse tree for the default value of the argument.
       #
       # @return [Array<(Script::Node, Script::Node)>]
-      attr_accessor :args
+      attr_reader :args
 
       # @param name [String] The mixin name
       # @param args [Array<(Script::Node, Script::Node)>] See \{#args}

data/lib/sass/tree/mixin_node.rb

@@ -13,11 +13,11 @@ module Sass::Tree
 
     # The arguments to the mixin.
     # @return [Array<Script::Node>]
-    attr_accessor :args
+    attr_reader :args
 
     # A hash from keyword argument names to values.
     # @return [{String => Script::Node}]
-    attr_accessor :keywords
+    attr_reader :keywords
 
     # @param name [String] The name of the mixin
     # @param args [Array<Script::Node>] See \{#args}

data/lib/sass/tree/node.rb

@@ -65,7 +65,8 @@ module Sass
       # @param options [{Symbol => Object}] The options
       # @see #options
       def options=(options)
-        Sass::Tree::Visitors::SetOptions.visit(self, options)
+        children.each {|c| c.options = options}
+        @options = options
       end
 
       # @private
@@ -132,12 +133,25 @@ module Sass
         Sass::Tree::Visitors::ToCss.visit(self)
       end
 
-      # Returns a representation of the node for debugging purposes.
-      #
-      # @return [String]
-      def inspect
-        return self.class.to_s unless has_children
-        "(#{self.class} #{children.map {|c| c.inspect}.join(' ')})"
+      # 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
@@ -145,9 +159,9 @@ module Sass
       #
       # @yield node
       # @yieldparam node [Node] a node in the tree
-      def each
+      def each(&block)
         yield self
-        children.each {|c| c.each {|n| yield n}}
+        children.each {|c| c.each(&block)}
       end
 
       # Converts a node to Sass code that will generate it.
@@ -171,7 +185,9 @@ module Sass
       #
       # @return [Node]
       def deep_copy
-        Sass::Tree::Visitors::DeepCopy.visit(self)
+        node = dup
+        node.children = children.map {|c| c.deep_copy}
+        node
       end
 
       protected

data/lib/sass/tree/return_node.rb

@@ -6,7 +6,7 @@ module Sass
     class ReturnNode < Node
       # The expression to return.
       # @type [Script::Node]
-      attr_accessor :expr
+      attr_reader :expr
 
       # @param expr [Script::Node] The expression to return
       def initialize(expr)

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)
-        Visitors::Extend.visit(result, extends)
+        result = result.do_extend(extends) unless extends.empty?
         result.to_s
       end
     end

data/lib/sass/tree/rule_node.rb

@@ -50,13 +50,6 @@ module Sass::Tree
     # @return [Boolean]
     attr_accessor :group_end
 
-    # The stack trace.
-    # This is only readable in a CSS tree as it is written during the perform step
-    # and only when the :trace_selectors option is set.
-    #
-    # @return [Array<String>]
-    attr_accessor :stack_trace
-
     # @param rule [Array<String, Sass::Script::Node>]
     #   The CSS rule. See \{#rule}
     def initialize(rule)
@@ -103,6 +96,15 @@ 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).
@@ -119,8 +121,8 @@ module Sass::Tree
       if @rule.all? {|t| t.kind_of?(String)}
         # We don't use real filename/line info because we don't have it yet.
         # When we get it, we'll set it on the parsed rules if possible.
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', 1)
-        @parsed_rules = parser.parse_selector rescue nil
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, 1)
+        @parsed_rules = parser.parse_selector('') rescue nil
       end
     end
   end

data/lib/sass/tree/variable_node.rb

@@ -10,7 +10,7 @@ module Sass
 
       # The parse tree for the variable value.
       # @return [Script::Node]
-      attr_accessor :expr
+      attr_reader :expr
 
       # Whether this is a guarded variable assignment (`!default`).
       # @return [Boolean]

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

@@ -33,7 +33,7 @@ module Sass::Tree::Visitors
     # @return [Object] The return value of the `visit_*` method for this node.
     def visit(node)
       method = "visit_#{node_name node}"
-      if self.respond_to?(method, true)
+      if self.respond_to?(method)
         self.send(method, node) {visit_children(node)}
       else
         visit_children(node)

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

@@ -2,14 +2,13 @@
 class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   protected
 
-  def initialize
-    @parents = []
-  end
-
   def visit(node)
-    if error = @parent && (
-        try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
-        try_send("invalid_#{node_name node}_parent?", @parent, node))
+    if error = (@parent && (
+          try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
+          try_send("invalid_#{node_name node}_parent?", @parent, node))) ||
+        (@real_parent && (
+          try_send("invalid_#{node_name @real_parent}_real_child?", @real_parent, node) ||
+          try_send("invalid_#{node_name node}_real_parent?", @real_parent, node)))
       raise Sass::SyntaxError.new(error)
     end
     super
@@ -18,16 +17,16 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
-  CONTROL_NODES = [Sass::Tree::EachNode, Sass::Tree::ForNode, Sass::Tree::IfNode, Sass::Tree::WhileNode]
-  SCRIPT_NODES = [Sass::Tree::ImportNode, Sass::Tree::MixinNode] + CONTROL_NODES
+  PARENT_CLASSES = [ Sass::Tree::EachNode,   Sass::Tree::ForNode,   Sass::Tree::IfNode,
+                     Sass::Tree::ImportNode, Sass::Tree::MixinNode, Sass::Tree::WhileNode]
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, SCRIPT_NODES)
-    @parents.push parent
+    @parent = parent unless is_any_of?(parent, PARENT_CLASSES)
+    old_real_parent, @real_parent = @real_parent, parent
     super
   ensure
     @parent = old_parent
-    @parents.pop
+    @real_parent = old_real_parent
   end
 
   def visit_root(node)
@@ -49,10 +48,10 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "@charset may only be used at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
+  INVALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
   def invalid_extend_parent?(parent, child)
-    unless is_any_of?(parent, VALID_EXTEND_PARENTS)
-      return "Extend directives may only be used within rules."
+    unless is_any_of?(parent, INVALID_EXTEND_PARENTS)
+      "Extend directives may only be used within rules."
     end
   end
 
@@ -60,19 +59,23 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_FUNCTION_CHILDREN = [
-    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
-    Sass::Tree::VariableNode, Sass::Tree::WarnNode
-  ] + CONTROL_NODES
+  INVALID_FUNCTION_CHILDREN = [
+    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::EachNode,
+    Sass::Tree::ForNode,      Sass::Tree::IfNode,    Sass::Tree::ReturnNode,
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode,  Sass::Tree::WhileNode
+  ]
   def invalid_function_child?(parent, child)
-    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
+    unless is_any_of?(child, INVALID_FUNCTION_CHILDREN)
       "Functions can only contain variable declarations and control directives."
     end
   end
 
-  INVALID_IMPORT_PARENTS = CONTROL_NODES + [Sass::Tree::MixinDefNode]
+  INVALID_IMPORT_PARENTS = [
+    Sass::Tree::IfNode,   Sass::Tree::ForNode, Sass::Tree::WhileNode,
+    Sass::Tree::EachNode, Sass::Tree::MixinDefNode
+  ]
   def invalid_import_parent?(parent, child)
-    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+    if is_any_of?(@real_parent, INVALID_IMPORT_PARENTS)
       return "Import directives may not be used within control directives or mixins."
     end
     return if parent.is_a?(Sass::Tree::RootNode)
@@ -87,21 +90,25 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
+  def invalid_import_real_parent?(parent, child)
+    
+  end
+
   def invalid_mixindef_parent?(parent, child)
     "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES
+  INVALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode]
   def invalid_prop_child?(parent, child)
-    unless is_any_of?(child, VALID_PROP_CHILDREN)
+    unless is_any_of?(child, INVALID_PROP_CHILDREN)
       "Illegal nesting: Only properties may be nested beneath properties."
     end
   end
 
-  VALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
-                        Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
+  INVALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
+                          Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
   def invalid_prop_parent?(parent, child)
-    unless is_any_of?(parent, VALID_PROP_PARENTS)
+    unless is_any_of?(parent, INVALID_PROP_PARENTS)
       "Properties are only allowed within rules, directives, or other properties." + child.pseudo_class_selector_message
     end
   end
@@ -119,9 +126,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     return false
   end
 
-  def try_send(method, *args)
+  def try_send(method, *args, &block)
     return unless respond_to?(method)
-    send(method, *args)
+    send(method, *args, &block)
   end
 end
 

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

@@ -32,7 +32,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       visit(child) +
         if nxt &&
             (child.is_a?(Sass::Tree::CommentNode) &&
-              child.line + child.lines + 1 == nxt.line) ||
+              child.line + child.value.count("\n") + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::ImportNode) && nxt.is_a?(Sass::Tree::ImportNode) &&
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
@@ -49,13 +49,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_comment(node)
-    value = node.value.map do |r|
-      next r if r.is_a?(String)
-      "\#{#{r.to_sass(@options)}}"
-    end.join
-
     content = if @format == :sass
-      content = value.gsub(/\*\/$/, '').rstrip
+      content = node.value.gsub(/\*\/$/, '').rstrip
       if content =~ /\A[ \t]/
         # Re-indent SCSS comments like this:
         #     /* foo
@@ -83,11 +78,11 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       content.gsub!(/^/, tab_str)
       content.rstrip + "\n"
     else
-      spaces = ('  ' * [@tabs - value[/^ */].size, 0].max)
+      spaces = ('  ' * [@tabs - node.value[/^ */].size, 0].max)
       content = if node.silent
-        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+        node.value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
       else
-        value
+        node.value
       end.gsub(/^/, spaces) + "\n"
       content
     end
@@ -138,7 +133,6 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       elsif node.expr; "else if"
       else; "else"
       end
-    @is_else = false
     str = "#{tab_str}@#{name}"
     str << " #{node.expr.to_sass(@options)}" if node.expr
     str << yield
@@ -155,7 +149,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    "#{tab_str}@media #{node.query.join(', ')}#{yield}"
+    "#{tab_str}@media #{node.query}#{yield}"
   end
 
   def visit_mixindef(node)
@@ -178,8 +172,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_mixin(node)
     unless node.args.empty? && node.keywords.empty?
       args = node.args.map {|a| a.to_sass(@options)}.join(", ")
-      keywords = Sass::Util.hash_to_a(node.keywords).
-        map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
+      keywords = node.keywords.map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords})"
     end
     "#{tab_str}#{@format == :sass ? '+' : '@include '}#{dasherize(node.name)}#{arglist}#{semi}\n"
@@ -232,7 +225,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def selector_to_sass(sel)
     sel.map do |r|
       if r.is_a?(String)
-        r.gsub(/(,)?([ \t]*)\n\s*/) {$1 ? "#{$1}#{$2}\n" : " "}
+        r.gsub(/(,[ \t]*)?\n\s*/) {$1 ? $1 + "\n" : " "}
       else
         "\#{#{r.to_sass(@options)}}"
       end
@@ -241,7 +234,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def selector_to_scss(sel)
     sel.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass(@options)}}"}.
-      join.gsub(/^[ \t]*/, tab_str).gsub(/[ \t]*$/, '')
+      join.gsub(/^[ \t]*/, tab_str)
   end
 
   def semi