sass 3.1.0 → 3.3.0

data/lib/sass/tree/comment_node.rb

@@ -6,31 +6,31 @@ module Sass::Tree
   # @see Sass::Tree
   class CommentNode < Node
     # The text of the comment, not including `/*` and `*/`.
+    # Interspersed with {Sass::Script::Tree::Node}s representing `#{}`-interpolation
+    # if this is a loud comment.
     #
-    # @return [String]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
-    # Whether the comment is loud.
-    #
-    # Loud comments start with ! and force the comment to be generated
-    # irrespective of compilation settings or the comment syntax used.
+    # The text of the comment
+    # after any interpolated SassScript has been resolved.
+    # Only set once \{Tree::Visitors::Perform} has been run.
     #
-    # @return [Boolean]
-    attr_accessor :loud
+    # @return [String]
+    attr_accessor :resolved_value
 
-    # Whether or not the comment is silent (that is, doesn't output to CSS).
+    # The type of the comment. `:silent` means it's never output to CSS,
+    # `:normal` means it's output in every compile mode except `:compressed`,
+    # and `:loud` means it's output even in `:compressed`.
     #
-    # @return [Boolean]
-    attr_accessor :silent
+    # @return [Symbol]
+    attr_accessor :type
 
-    # @param value [String] See \{#value}
-    # @param silent [Boolean] See \{#silent}
-    def initialize(value, silent)
-      @lines = []
-      @silent = silent
-      @value = normalize_indentation value
-      @loud = @value =~ %r{^(/[\/\*])?!}
-      @value.sub!("#{$1}!", $1.to_s) if @loud
+    # @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}
+      @type = type
       super()
     end
 
@@ -40,7 +40,7 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && value == other.value && silent == other.silent
+      self.class == other.class && value == other.value && type == other.type
     end
 
     # Returns `true` if this is a silent comment
@@ -50,28 +50,33 @@ module Sass::Tree
     #
     # @return [Boolean]
     def invisible?
-      if @loud
-        return false
-      else
-        @silent || (style == :compressed)
+      case @type
+      when :loud; false
+      when :silent; true
+      else; style == :compressed
       end
     end
 
-    # Returns whether this comment should be interpolated for dynamic comment generation.
-    def evaluated?
-      @loud
+    # Returns the number of lines in the comment.
+    #
+    # @return [Fixnum]
+    def lines
+      @value.inject(0) do |s, e|
+        next s + e.count("\n") if e.is_a?(String)
+        next s
+      end
     end
 
     private
 
     def normalize_indentation(str)
-      pre = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
+      ind = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
         line[/^[ \t]*/].split("").zip(pre).inject([]) do |arr, (a, b)|
           break arr if a != b
-          arr + [a]
+          arr << a
         end
       end.join
-      str.gsub(/^#{pre}/, '')
+      str.gsub(/^#{ind}/, '')
     end
   end
 end

data/lib/sass/tree/content_node.rb

@@ -0,0 +1,9 @@
+module Sass
+  module Tree
+    # A node representing the placement within a mixin of the include statement's content.
+    #
+    # @see Sass::Tree
+    class ContentNode < Node
+    end
+  end
+end

data/lib/sass/tree/css_import_node.rb

@@ -0,0 +1,60 @@
+module Sass::Tree
+  # A node representing an `@import` rule that's importing plain CSS.
+  #
+  # @see Sass::Tree
+  class CssImportNode < DirectiveNode
+    # The URI being imported, either as a plain string or an interpolated
+    # script string.
+    #
+    # @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.
+    #
+    # @return [String]
+    attr_accessor :resolved_uri
+
+    # 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::Tree::Node>]
+    attr_accessor :query
+
+    # 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::Tree::Node] See \{#uri}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
+    def initialize(uri, query = [])
+      @uri = uri
+      @query = query
+      super('')
+    end
+
+    # @param uri [String] See \{#resolved_uri}
+    # @return [CssImportNode]
+    def self.resolved(uri)
+      node = new(uri)
+      node.resolved_uri = uri
+      node
+    end
+
+    # @see DirectiveNode#value
+    def value; raise NotImplementedError; end
+
+    # @see DirectiveNode#resolved_value
+    def resolved_value
+      @resolved_value ||=
+        begin
+          str = "@import #{resolved_uri}"
+          str << " #{resolved_query.to_css}" if resolved_query
+          str
+        end
+    end
+  end
+end

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] 
-      attr_reader :expr
+      # @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

@@ -9,15 +9,45 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class DirectiveNode < Node
-    # The text of the directive, `@` and all.
+    # The text of the directive, `@` and all, with interpolation included.
     #
-    # @return [String]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
-    # @param value [String] See \{#value}
+    # The text of the directive after any interpolated SassScript has been resolved.
+    # Only set once \{Tree::Visitors::Perform} has been run.
+    #
+    # @return [String]
+    attr_accessor :resolved_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
+
+    # @param value [String] See \{#resolved_value}
+    # @return [DirectiveNode]
+    def self.resolved(value)
+      node = new([value])
+      node.resolved_value = value
+      node
+    end
+
+    # @return [String] The name of the directive, including `@`.
+    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]
-    attr_reader :list
+    # @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,18 +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>]
-    attr_reader :selector
+    # @return [Array<String, Sass::Script::Tree::Node>]
+    attr_accessor :selector
 
-    # @param selector [Array<String, Sass::Script::Node>]
+    # 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::Tree::Node>]
     #   The CSS selector to extend,
-    #   interspersed with {Sass::Script::Node}s
+    #   interspersed with {Sass::Script::Tree::Node}s
     #   representing `#{}`-interpolation.
-    def initialize(selector)
+    # @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,20 +10,20 @@ module Sass::Tree
     attr_reader :var
 
     # The parse tree for the initial expression.
-    # @return [Script::Node]
-    attr_reader :from
+    # @return [Script::Tree::Node]
+    attr_accessor :from
 
     # The parse tree for the final expression.
-    # @return [Script::Node]
-    attr_reader :to
+    # @return [Script::Tree::Node]
+    attr_accessor :to
 
     # Whether to include `to` in the loop or stop just before.
     # @return [Boolean]
     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,14 +12,22 @@ module Sass
       # containing the variable for argument and the parse tree for
       # the default value of the argument
       #
-      # @return [Array<Script::Node>]
-      attr_reader :args
+      # @return [Array<Script::Tree::Node>]
+      attr_accessor :args
+
+      # The splat argument for this function, if one exists.
+      #
+      # @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.
-      def initialize(name, args)
+      # @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
+        @splat = splat
         super()
       end
     end

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_reader :expr
+    attr_accessor :expr
 
     # The next {IfNode} in the if-else list, or `nil`.
     #
@@ -35,14 +35,8 @@ 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])
+      Marshal.dump([expr, self.else, children])
     end
 
     def self._load(data)
@@ -54,12 +48,5 @@ 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/import_node.rb

@@ -9,6 +9,9 @@ module Sass
       # @return [String]
       attr_reader :imported_filename
 
+      # Sets the imported file.
+      attr_writer :imported_file
+
       # @param imported_filename [String] The name of the imported file
       def initialize(imported_filename)
         @imported_filename = imported_filename
@@ -43,14 +46,13 @@ module Sass
 
         if @options[:importer]
           f = @options[:importer].find_relative(
-            @imported_filename, @options[:filename], @options.dup)
+            @imported_filename, @options[:filename], options_for_importer)
           return f if f
         end
 
         paths.each do |p|
-          if f = p.find(@imported_filename, @options.dup)
-            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"
@@ -61,7 +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(:_from_import_node => true)
       end
     end
   end

data/lib/sass/tree/media_node.rb

@@ -6,27 +6,43 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class MediaNode < DirectiveNode
-    # The media query (e.g. `print` or `screen`).
+    # TODO: parse and cache the query immediately if it has no dynamic elements
+
+    # The media query for this rule, interspersed with {Sass::Script::Tree::Node}s
+    # representing `#{}`-interpolation. Any adjacent strings will be merged
+    # together.
     #
-    # @return [String]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :query
 
-    # @see RuleNode#tabs
-    attr_accessor :tabs
-
-    # @see RuleNode#group_end
-    attr_accessor :group_end
+    # 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 query [String] See \{#query}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
     def initialize(query)
       @query = query
-      @tabs = 0
       super('')
     end
 
     # @see DirectiveNode#value
-    def value
-      "@media #{query}"
+    def value; raise NotImplementedError; end
+
+    # @see DirectiveNode#name
+    def name; '@media'; end
+
+    # @see DirectiveNode#resolved_value
+    def resolved_value
+      @resolved_value ||= "@media #{resolved_query.to_css}"
+    end
+
+    # True when the directive has no visible children.
+    #
+    # @return [Boolean]
+    def invisible?
+      children.all? {|c| c.invisible?}
     end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -12,14 +12,25 @@ 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)>]
-      attr_reader :args
+      # @return [Array<(Script::Tree::Node, Script::Tree::Node)>]
+      attr_accessor :args
+
+      # The splat argument for this mixin, if one exists.
+      #
+      # @return [Script::Tree::Node?]
+      attr_accessor :splat
+
+      # Whether the mixin uses `@content`. Set during the nesting check phase.
+      # @return [Boolean]
+      attr_accessor :has_content
 
       # @param name [String] The mixin name
-      # @param args [Array<(Script::Node, Script::Node)>] See \{#args}
-      def initialize(name, args)
+      # @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
+        @splat = splat
         super()
       end
     end

data/lib/sass/tree/mixin_node.rb

@@ -12,20 +12,40 @@ module Sass::Tree
     attr_reader :name
 
     # The arguments to the mixin.
-    # @return [Array<Script::Node>]
-    attr_reader :args
+    # @return [Array<Script::Tree::Node>]
+    attr_accessor :args
 
     # A hash from keyword argument names to values.
-    # @return [{String => Script::Node}]
-    attr_reader :keywords
+    # @return [Sass::Util::NormalizedMap<Script::Tree::Node>]
+    attr_accessor :keywords
+
+    # The first splat argument for this mixin, if one exists.
+    #
+    # 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 keywords [{String => Script::Node}] See \{#keywords}
-    def initialize(name, args, keywords)
+    # @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 [Sass::Util::NormalizedMap<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