sass 3.2.7 → 3.3.0.rc.1

data/lib/sass/supports.rb

@@ -4,7 +4,7 @@ module Sass::Supports
   class Condition
     # Runs the SassScript in the supports condition.
     #
-    # @param env [Sass::Environment] The environment in which to run the script.
+    # @param environment [Sass::Environment] The environment in which to run the script.
     def perform(environment); Sass::Util.abstract(self); end
 
     # Returns the CSS for this condition.
@@ -81,12 +81,12 @@ module Sass::Supports
 
     def left_parens(str)
       return "(#{str})" if @left.is_a?(Negation)
-      return str
+      str
     end
 
     def right_parens(str)
       return "(#{str})" if @right.is_a?(Negation) || @right.is_a?(Operator)
-      return str
+      str
     end
   end
 
@@ -127,26 +127,25 @@ module Sass::Supports
 
     def parens(str)
       return "(#{str})" if @condition.is_a?(Negation) || @condition.is_a?(Operator)
-      return str
+      str
     end
   end
 
   # A declaration condition (e.g. `(feature: value)`).
   class Declaration < Condition
-    # The feature name.
-    #
-    # @param [Sass::Script::Node]
+    # @return [Sass::Script::Tree::Node] The feature name.
     attr_accessor :name
 
-    # The name of the feature after any SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
+    # @!attribute resolved_name
+    #   The name of the feature after any SassScript has been resolved.
+    #   Only set once \{Tree::Visitors::Perform} has been run.
     #
-    # @return [String]
+    #   @return [String]
     attr_accessor :resolved_name
 
     # The feature value.
     #
-    # @param [Sass::Script::Node]
+    # @return [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the feature after any SassScript has been resolved.
@@ -190,7 +189,7 @@ module Sass::Supports
   class Interpolation < Condition
     # The SassScript expression in the interpolation.
     #
-    # @param [Sass::Script::Node]
+    # @return [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the expression after it's been resolved.
@@ -205,7 +204,7 @@ module Sass::Supports
 
     def perform(env)
       val = value.perform(env)
-      @resolved_value = val.is_a?(Sass::Script::String) ? val.value : val.to_s
+      @resolved_value = val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
     end
 
     def to_css

data/lib/sass/tree/at_root_node.rb

@@ -0,0 +1,82 @@
+module Sass
+  module Tree
+    # A dynamic node representing an `@at-root` directive.
+    #
+    # An `@at-root` directive with a selector is converted to an \{AtRootNode}
+    # containing a \{RuleNode} at parse time.
+    #
+    # @see Sass::Tree
+    class AtRootNode < Node
+      # The query for this node (e.g. `(without: media)`),
+      # interspersed with {Sass::Script::Tree::Node}s representing
+      # `#{}`-interpolation. Any adjacent strings will be merged
+      # together.
+      #
+      # This will be nil if the directive didn't have a query. In this
+      # case, {#resolved\_type} will automatically be set to
+      # `:without` and {#resolved\_rule} will automatically be set to `["rule"]`.
+      #
+      # @return [Array<String, Sass::Script::Tree::Node>]
+      attr_accessor :query
+
+      # The resolved type of this directive. `:with` or `:without`.
+      #
+      # @return [Symbol]
+      attr_accessor :resolved_type
+
+      # The resolved value of this directive -- a list of directives
+      # to either include or exclude.
+      #
+      # @return [Array<String>]
+      attr_accessor :resolved_value
+
+      # The number of additional tabs that the contents of this node
+      # should be indented.
+      #
+      # @return [Number]
+      attr_accessor :tabs
+
+      # Whether the last child of this node should be considered the
+      # end of a group.
+      #
+      # @return [Boolean]
+      attr_accessor :group_end
+
+      def initialize(query = nil)
+        super()
+        @query = Sass::Util.strip_string_array(Sass::Util.merge_adjacent_strings(query)) if query
+        @tabs = 0
+      end
+
+      # Returns whether or not the given directive is excluded by this
+      # node. `directive` may be "rule", which indicates whether
+      # normal CSS rules should be excluded.
+      #
+      # @param directive [String]
+      # @return [Boolean]
+      def exclude?(directive)
+        if resolved_type == :with
+          return false if resolved_value.include?('all')
+          !resolved_value.include?(directive)
+        else # resolved_type == :without
+          return true if resolved_value.include?('all')
+          resolved_value.include?(directive)
+        end
+      end
+
+      # Returns whether the given node is excluded by this node.
+      #
+      # @param node [Sass::Tree::Node]
+      # @return [Boolean]
+      def exclude_node?(node)
+        return exclude?(node.name.gsub(/^@/, '')) if node.is_a?(Sass::Tree::DirectiveNode)
+        exclude?(node.class.to_s.gsub(/.*::(.*)Node$/, '\1').downcase)
+      end
+
+      # @see Node#bubbles?
+      def bubbles?
+        true
+      end
+    end
+  end
+end

data/lib/sass/tree/comment_node.rb

@@ -6,10 +6,10 @@ module Sass::Tree
   # @see Sass::Tree
   class CommentNode < Node
     # The text of the comment, not including `/*` and `*/`.
-    # Interspersed with {Sass::Script::Node}s representing `#{}`-interpolation
+    # Interspersed with {Sass::Script::Tree::Node}s representing `#{}`-interpolation
     # if this is a loud comment.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
     # The text of the comment
@@ -26,7 +26,7 @@ module Sass::Tree
     # @return [Symbol]
     attr_accessor :type
 
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
     # @param type [Symbol] See \{#type}
     def initialize(value, type)
       @value = Sass::Util.with_extracted_values(value) {|str| normalize_indentation str}

data/lib/sass/tree/css_import_node.rb

@@ -6,31 +6,31 @@ module Sass::Tree
     # The URI being imported, either as a plain string or an interpolated
     # script string.
     #
-    # @return [String, Sass::Script::Node]
+    # @return [String, Sass::Script::Tree::Node]
     attr_accessor :uri
 
     # The text of the URI being imported after any interpolated SassScript has
-    # been resolved. Only set once \{Tree::Visitors::Perform} has been run.
+    # been resolved. Only set once {Tree::Visitors::Perform} has been run.
     #
     # @return [String]
     attr_accessor :resolved_uri
 
-    # The media query for this rule, interspersed with {Sass::Script::Node}s
-    # representing `#{}`-interpolation. Any adjacent strings will be merged
-    # together.
+    # The media query for this rule, interspersed with
+    # {Sass::Script::Tree::Node}s representing `#{}`-interpolation. Any adjacent
+    # strings will be merged together.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :query
 
-    # The media query for this rule, without any unresolved interpolation. It's
-    # only set once {Tree::Node#perform} has been called.
+    # The media query for this rule, without any unresolved interpolation.
+    # It's only set once {Tree::Visitors::Perform} has been run.
     #
     # @return [Sass::Media::QueryList]
     attr_accessor :resolved_query
 
-    # @param uri [String, Sass::Script::Node] See \{#uri}
-    # @param query [Array<String, Sass::Script::Node>] See \{#query}
-    def initialize(uri, query = nil)
+    # @param uri [String, Sass::Script::Tree::Node] See \{#uri}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
+    def initialize(uri, query = [])
       @uri = uri
       @query = query
       super('')

data/lib/sass/tree/debug_node.rb

@@ -5,10 +5,10 @@ module Sass
     # @see Sass::Tree
     class DebugNode < Node
       # The expression to print.
-      # @return [Script::Node] 
+      # @return [Script::Tree::Node]
       attr_accessor :expr
 
-      # @param expr [Script::Node] The expression to print
+      # @param expr [Script::Tree::Node] The expression to print
       def initialize(expr)
         @expr = expr
         super()

data/lib/sass/tree/directive_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
   class DirectiveNode < Node
     # The text of the directive, `@` and all, with interpolation included.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
     # The text of the directive after any interpolated SassScript has been resolved.
@@ -20,9 +20,16 @@ module Sass::Tree
     # @return [String]
     attr_accessor :resolved_value
 
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @see RuleNode#tabs
+    attr_accessor :tabs
+
+    # @see RuleNode#group_end
+    attr_accessor :group_end
+
+    # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
     def initialize(value)
       @value = value
+      @tabs = 0
       super()
     end
 
@@ -38,5 +45,9 @@ module Sass::Tree
     def name
       value.first.gsub(/ .*$/, '')
     end
+
+    def bubbles?
+      has_children
+    end
   end
 end

data/lib/sass/tree/each_node.rb

@@ -5,18 +5,18 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class EachNode < Node
-    # The name of the loop variable.
-    # @return [String]
-    attr_reader :var
+    # The names of the loop variables.
+    # @return [Array<String>]
+    attr_reader :vars
 
     # The parse tree for the list.
-    # @param [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :list
 
-    # @param var [String] The name of the loop variable
-    # @param list [Script::Node] The parse tree for the list
-    def initialize(var, list)
-      @var = var
+    # @param vars [Array<String>] The names of the loop variables
+    # @param list [Script::Tree::Node] The parse tree for the list
+    def initialize(vars, list)
+      @vars = vars
       @list = list
       super()
     end

data/lib/sass/tree/extend_node.rb

@@ -11,25 +11,32 @@ module Sass::Tree
     # @return [Selector::CommaSequence]
     attr_accessor :resolved_selector
 
-    # The CSS selector to extend, interspersed with {Sass::Script::Node}s
+    # The CSS selector to extend, interspersed with {Sass::Script::Tree::Node}s
     # representing `#{}`-interpolation.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :selector
 
+    # The extended selector source range.
+    #
+    # @return [Sass::Source::Range]
+    attr_accessor :selector_source_range
+
     # Whether the `@extend` is allowed to match no selectors or not.
     #
     # @return [Boolean]
     def optional?; @optional; end
 
-    # @param selector [Array<String, Sass::Script::Node>]
+    # @param selector [Array<String, Sass::Script::Tree::Node>]
     #   The CSS selector to extend,
-    #   interspersed with {Sass::Script::Node}s
+    #   interspersed with {Sass::Script::Tree::Node}s
     #   representing `#{}`-interpolation.
-    # @param optional [Boolean] See \{#optional}
-    def initialize(selector, optional)
+    # @param optional [Boolean] See \{ExtendNode#optional?}
+    # @param selector_source_range [Sass::Source::Range] The extended selector source range.
+    def initialize(selector, optional, selector_source_range)
       @selector = selector
       @optional = optional
+      @selector_source_range = selector_source_range
       super()
     end
   end

data/lib/sass/tree/for_node.rb

@@ -10,11 +10,11 @@ module Sass::Tree
     attr_reader :var
 
     # The parse tree for the initial expression.
-    # @return [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :from
 
     # The parse tree for the final expression.
-    # @return [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :to
 
     # Whether to include `to` in the loop or stop just before.
@@ -22,8 +22,8 @@ module Sass::Tree
     attr_reader :exclusive
 
     # @param var [String] See \{#var}
-    # @param from [Script::Node] See \{#from}
-    # @param to [Script::Node] See \{#to}
+    # @param from [Script::Tree::Node] See \{#from}
+    # @param to [Script::Tree::Node] See \{#to}
     # @param exclusive [Boolean] See \{#exclusive}
     def initialize(var, from, to, exclusive)
       @var = var

data/lib/sass/tree/function_node.rb

@@ -12,17 +12,18 @@ module Sass
       # containing the variable for argument and the parse tree for
       # the default value of the argument
       #
-      # @return [Array<Script::Node>]
+      # @return [Array<Script::Tree::Node>]
       attr_accessor :args
 
       # The splat argument for this function, if one exists.
       #
-      # @return [Script::Node?]
+      # @return [Script::Tree::Node?]
       attr_accessor :splat
 
       # @param name [String] The function name
-      # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.
-      # @param splat [Script::Node] See \{#splat}
+      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>]
+      #   The arguments for the function.
+      # @param splat [Script::Tree::Node] See \{#splat}
       def initialize(name, args, splat)
         @name = name
         @args = args

data/lib/sass/tree/if_node.rb

@@ -36,7 +36,7 @@ module Sass::Tree
     end
 
     def _dump(f)
-      Marshal.dump([self.expr, self.else, self.children])
+      Marshal.dump([expr, self.else, children])
     end
 
     def self._load(data)

data/lib/sass/tree/import_node.rb

@@ -51,9 +51,8 @@ module Sass
         end
 
         paths.each do |p|
-          if f = p.find(@imported_filename, options_for_importer)
-            return f
-          end
+          f = p.find(@imported_filename, options_for_importer)
+          return f if f
         end
 
         message = "File to import not found or unreadable: #{@imported_filename}.\n"
@@ -64,11 +63,11 @@ module Sass
         end
         raise SyntaxError.new(message)
       rescue SyntaxError => e
-        raise SyntaxError.new(e.message, :line => self.line, :filename => @filename)
+        raise SyntaxError.new(e.message, :line => line, :filename => @filename)
       end
 
       def options_for_importer
-        @options.merge(:_line => line)
+        @options.merge(:_from_import_node => true)
       end
     end
   end

data/lib/sass/tree/media_node.rb

@@ -8,29 +8,22 @@ module Sass::Tree
   class MediaNode < DirectiveNode
     # TODO: parse and cache the query immediately if it has no dynamic elements
 
-    # The media query for this rule, interspersed with {Sass::Script::Node}s
+    # The media query for this rule, interspersed with {Sass::Script::Tree::Node}s
     # representing `#{}`-interpolation. Any adjacent strings will be merged
     # together.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :query
 
     # The media query for this rule, without any unresolved interpolation. It's
-    # only set once {Tree::Node#perform} has been called.
+    # only set once {Tree::Visitors::Perform} has been run.
     #
     # @return [Sass::Media::QueryList]
     attr_accessor :resolved_query
 
-    # @see RuleNode#tabs
-    attr_accessor :tabs
-
-    # @see RuleNode#group_end
-    attr_accessor :group_end
-
-    # @param query [Array<String, Sass::Script::Node>] See \{#query}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
     def initialize(query)
       @query = query
-      @tabs = 0
       super('')
     end
 
@@ -51,8 +44,5 @@ module Sass::Tree
     def invisible?
       children.all? {|c| c.invisible?}
     end
-
-    # @see Node#bubbles?
-    def bubbles?; true; end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -12,12 +12,12 @@ module Sass
       # Each element is a tuple containing the variable for argument
       # and the parse tree for the default value of the argument.
       #
-      # @return [Array<(Script::Node, Script::Node)>]
+      # @return [Array<(Script::Tree::Node, Script::Tree::Node)>]
       attr_accessor :args
 
       # The splat argument for this mixin, if one exists.
       #
-      # @return [Script::Node?]
+      # @return [Script::Tree::Node?]
       attr_accessor :splat
 
       # Whether the mixin uses `@content`. Set during the nesting check phase.
@@ -25,8 +25,8 @@ module Sass
       attr_accessor :has_content
 
       # @param name [String] The mixin name
-      # @param args [Array<(Script::Node, Script::Node)>] See \{#args}
-      # @param splat [Script::Node] See \{#splat}
+      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>] See \{#args}
+      # @param splat [Script::Tree::Node] See \{#splat}
       def initialize(name, args, splat)
         @name = name
         @args = args

data/lib/sass/tree/mixin_node.rb

@@ -12,27 +12,40 @@ module Sass::Tree
     attr_reader :name
 
     # The arguments to the mixin.
-    # @return [Array<Script::Node>]
+    # @return [Array<Script::Tree::Node>]
     attr_accessor :args
 
     # A hash from keyword argument names to values.
-    # @return [{String => Script::Node}]
+    # @return [{String => Script::Tree::Node}]
     attr_accessor :keywords
 
-    # The splat argument for this mixin, if one exists.
+    # The first splat argument for this mixin, if one exists.
     #
-    # @return [Script::Node?]
+    # This could be a list of positional arguments, a map of keyword
+    # arguments, or an arglist containing both.
+    #
+    # @return [Node?]
     attr_accessor :splat
 
+    # The second splat argument for this mixin, if one exists.
+    #
+    # If this exists, it's always a map of keyword arguments, and
+    # \{#splat} is always either a list or an arglist.
+    #
+    # @return [Node?]
+    attr_accessor :kwarg_splat
+
     # @param name [String] The name of the mixin
-    # @param args [Array<Script::Node>] See \{#args}
-    # @param splat [Script::Node] See \{#splat}
-    # @param keywords [{String => Script::Node}] See \{#keywords}
-    def initialize(name, args, keywords, splat)
+    # @param args [Array<Script::Tree::Node>] See \{#args}
+    # @param splat [Script::Tree::Node] See \{#splat}
+    # @param kwarg_splat [Script::Tree::Node] See \{#kwarg_splat}
+    # @param keywords [{String => Script::Tree::Node}] See \{#keywords}
+    def initialize(name, args, keywords, splat, kwarg_splat)
       @name = name
       @args = args
       @keywords = keywords
       @splat = splat
+      @kwarg_splat = kwarg_splat
       super()
     end
   end

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,
@@ -32,7 +33,7 @@ module Sass
       # The child nodes of this node.
       #
       # @return [Array<Tree::Node>]
-      attr_accessor :children
+      attr_reader :children
 
       # Whether or not this node has child nodes.
       # This may be true even when \{#children} is empty,
@@ -46,6 +47,11 @@ module Sass
       # @return [Fixnum]
       attr_accessor :line
 
+      # The source range in the document on which this node appeared.
+      #
+      # @return [Sass::Source::Range]
+      attr_accessor :source_range
+
       # The name of the document on which this node appeared.
       #
       # @return [String]
@@ -127,10 +133,21 @@ module Sass
 
       # Computes the CSS corresponding to this static CSS tree.
       #
-      # @return [String, nil] The resulting CSS
+      # @return [String] The resulting CSS
+      # @see Sass::Tree
+      def css
+        Sass::Tree::Visitors::ToCss.new.visit(self)
+      end
+
+      # Computes the CSS corresponding to this static CSS tree, along with
+      # the respective source map.
+      #
+      # @return [(String, Sass::Source::Map)] The resulting CSS and the source map
       # @see Sass::Tree
-      def to_s
-        Sass::Tree::Visitors::ToCss.visit(self)
+      def css_with_sourcemap
+        visitor = Sass::Tree::Visitors::ToCss.new(:build_source_mapping)
+        result = visitor.visit(self)
+        return result, visitor.source_mapping
       end
 
       # Returns a representation of the node for debugging purposes.