haml 3.1.0 → 3.1.1

data/vendor/sass/lib/sass/tree/debug_node.rb

@@ -4,33 +4,15 @@ module Sass
     #
     # @see Sass::Tree
     class DebugNode < Node
+      # The expression to print.
+      # @return [Script::Node] 
+      attr_reader :expr
+
       # @param expr [Script::Node] The expression to print
       def initialize(expr)
         @expr = expr
         super()
       end
-
-      protected
-
-      # @see Node#to_src
-      def to_src(tabs, opts, fmt)
-        "#{'  ' * tabs}@debug #{@expr.to_sass(opts)}#{semi fmt}\n"
-      end
-
-      # Prints the expression to STDERR.
-      #
-      # @param environment [Sass::Environment] The lexical environment containing
-      #   variable and mixin values
-      def _perform(environment)
-        res = @expr.perform(environment)
-        res = res.value if res.is_a?(Sass::Script::String)
-        if filename
-          $stderr.puts "#{filename}:#{line} DEBUG: #{res}"
-        else
-          $stderr.puts "Line #{line} DEBUG: #{res}"
-        end
-        []
-      end
     end
   end
 end

data/vendor/sass/lib/sass/tree/directive_node.rb

@@ -19,57 +19,5 @@ module Sass::Tree
       @value = value
       super()
     end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      res = "#{'  ' * tabs}#{value}"
-      return res + "#{semi fmt}\n" unless has_children
-      res + children_to_src(tabs, opts, fmt) + "\n"
-    end
-
-    # Computes the CSS for the directive.
-    #
-    # @param tabs [Fixnum] The level of indentation for the CSS
-    # @return [String] The resulting CSS
-    def _to_s(tabs)
-      return value + ";" unless has_children
-      return value + " {}" if children.empty?
-      result = if style == :compressed
-                 "#{value}{"
-               else
-                 "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
-               end
-      was_prop = false
-      first = true
-      children.each do |child|
-        next if child.invisible?
-        if style == :compact
-          if child.is_a?(PropNode)
-            result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
-          else
-            if was_prop
-              result[-1] = "\n"
-            end
-            rendered = child.to_s(tabs + 1).dup
-            rendered = rendered.lstrip if first
-            result << rendered.rstrip + "\n"
-          end
-          was_prop = child.is_a?(PropNode)
-          first = false
-        elsif style == :compressed
-          result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
-          was_prop = child.is_a?(PropNode)
-        else
-          result << child.to_s(tabs + 1) + "\n"
-        end
-      end
-      result.rstrip + if style == :compressed
-                        "}"
-                      else
-                        (style == :expanded ? "\n" : " ") + "}\n"
-                      end
-    end
   end
 end

data/vendor/sass/lib/sass/tree/each_node.rb

@@ -5,6 +5,14 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class EachNode < Node
+    # The name of the loop variable.
+    # @return [String]
+    attr_reader :var
+
+    # The parse tree for the list.
+    # @param [Script::Node]
+    attr_reader :list
+
     # @param var [String] The name of the loop variable
     # @param list [Script::Node] The parse tree for the list
     def initialize(var, list)
@@ -12,43 +20,5 @@ module Sass::Tree
       @list = list
       super()
     end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      "#{'  ' * tabs}@each $#{dasherize(@var, opts)} in #{@list.to_sass(opts)}" +
-        children_to_src(tabs, opts, fmt)
-    end
-
-    # Runs the child nodes once for each value in the list.
-    #
-    # @param environment [Sass::Environment] The lexical environment containing
-    #   variable and mixin values
-    # @return [Array<Tree::Node>] The resulting static nodes
-    # @see Sass::Tree
-    def _perform(environment)
-      list = @list.perform(environment)
-
-      children = []
-      environment = Sass::Environment.new(environment)
-      list.to_a.each do |v|
-        environment.set_local_var(@var, v)
-        children += perform_children(environment)
-      end
-      children
-    end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {EachNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/vendor/sass/lib/sass/tree/extend_node.rb

@@ -5,6 +5,18 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class ExtendNode < Node
+    # The parsed selector after interpolation has been resolved.
+    # Only set once {Tree::Visitors::Perform} has been run.
+    #
+    # @return [Selector::CommaSequence]
+    attr_accessor :resolved_selector
+
+    # The CSS selector to extend, interspersed with {Sass::Script::Node}s
+    # representing `#{}`-interpolation.
+    #
+    # @return [Array<String, Sass::Script::Node>]
+    attr_reader :selector
+
     # @param selector [Array<String, Sass::Script::Node>]
     #   The CSS selector to extend,
     #   interspersed with {Sass::Script::Node}s
@@ -13,53 +25,5 @@ module Sass::Tree
       @selector = selector
       super()
     end
-
-    # Registers this extension in the `extends` subset map.
-    #
-    # @param extends [Sass::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
-    #   The extensions defined for this tree
-    # @param parent [RuleNode] The parent node of this node
-    # @see Node#cssize
-    def cssize(extends, parent)
-      @resolved_selector.members.each do |seq|
-        if seq.members.size > 1
-          raise Sass::SyntaxError.new("Can't extend #{seq.to_a.join}: can't extend nested selectors")
-        end
-
-        sseq = seq.members.first
-        if !sseq.is_a?(Sass::Selector::SimpleSequence)
-          raise Sass::SyntaxError.new("Can't extend #{seq.to_a.join}: invalid selector")
-        end
-
-        sel = sseq.members
-        parent.resolved_rules.members.each do |seq|
-          if !seq.members.last.is_a?(Sass::Selector::SimpleSequence)
-            raise Sass::SyntaxError.new("#{seq} can't extend: invalid selector")
-          end
-
-          extends[sel] = seq
-        end
-      end
-
-      []
-    end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      "#{'  ' * tabs}@extend #{selector_to_src(@selector, tabs, opts, fmt).lstrip}#{semi fmt}\n"
-    end
-
-    # Runs SassScript interpolation in the selector,
-    # and then parses the result into a {Sass::Selector::CommaSequence}.
-    #
-    # @param environment [Sass::Environment] The lexical environment containing
-    #   variable and mixin values
-    def perform!(environment)
-      @resolved_selector = Sass::SCSS::CssParser.new(run_interp(@selector, environment), self.line).
-        parse_selector(self.filename)
-      super
-    end
   end
 end

data/vendor/sass/lib/sass/tree/for_node.rb

@@ -5,11 +5,26 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class ForNode < Node
-    # @param var [String] The name of the loop variable
-    # @param from [Script::Node] The parse tree for the initial expression
-    # @param to [Script::Node] The parse tree for the final expression
-    # @param exclusive [Boolean] Whether to include `to` in the loop
-    #   or stop just before
+    # The name of the loop variable.
+    # @return [String]
+    attr_reader :var
+
+    # The parse tree for the initial expression.
+    # @return [Script::Node]
+    attr_reader :from
+
+    # The parse tree for the final expression.
+    # @return [Script::Node]
+    attr_reader :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 exclusive [Boolean] See \{#exclusive}
     def initialize(var, from, to, exclusive)
       @var = var
       @from = from
@@ -17,51 +32,5 @@ module Sass::Tree
       @exclusive = exclusive
       super()
     end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      to = @exclusive ? "to" : "through"
-      "#{'  ' * tabs}@for $#{dasherize(@var, opts)} from #{@from.to_sass(opts)} #{to} #{@to.to_sass(opts)}" +
-        children_to_src(tabs, opts, fmt)
-    end
-
-    # Runs the child nodes once for each time through the loop,
-    # varying the variable each time.
-    #
-    # @param environment [Sass::Environment] The lexical environment containing
-    #   variable and mixin values
-    # @return [Array<Tree::Node>] The resulting static nodes
-    # @see Sass::Tree
-    def _perform(environment)
-      from = @from.perform(environment)
-      to = @to.perform(environment)
-      from.assert_int!
-      to.assert_int!
-
-      to = to.coerce(from.numerator_units, from.denominator_units)
-      range = Range.new(from.to_i, to.to_i, @exclusive)
-
-      children = []
-      environment = Sass::Environment.new(environment)
-      range.each do |i|
-        environment.set_local_var(@var, Sass::Script::Number.new(i, from.numerator_units, from.denominator_units))
-        children += perform_children(environment)
-      end
-      children
-    end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {ForNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/vendor/sass/lib/sass/tree/function_node.rb

@@ -0,0 +1,27 @@
+module Sass
+  module Tree
+    # A dynamic node representing a function definition.
+    #
+    # @see Sass::Tree
+    class FunctionNode < Node
+      # The name of the function.
+      # @return [String]
+      attr_reader :name
+
+      # The arguments to the function. 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>]
+      attr_reader :args
+
+      # @param name [String] The function name
+      # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.
+      def initialize(name, args)
+        @name = name
+        @args = args
+        super()
+      end
+    end
+  end
+end

data/vendor/sass/lib/sass/tree/if_node.rb

@@ -9,13 +9,18 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class IfNode < Node
+    # The conditional expression.
+    # If this is nil, this is an `@else` node, not an `@else if`.
+    #
+    # @return [Script::Expr]
+    attr_reader :expr
+
     # The next {IfNode} in the if-else list, or `nil`.
     #
     # @return [IfNode]
     attr_accessor :else
 
-    # @param expr [Script::Expr] The conditional expression.
-    #   If this is nil, this is an `@else` node, not an `@else if`
+    # @param expr [Script::Expr] See \{#expr}
     def initialize(expr)
       @expr = expr
       @last_else = self
@@ -36,65 +41,25 @@ module Sass::Tree
       self.else.options = options if self.else
     end
 
-    # @see Node#_around_dump
-    def _around_dump
-      old_else = @else
-      old_last_else = @last_else
-      @else = Sass::Util.dump(@else)
-      @last_else = (self == @last_else ? nil : Sass::Util.dump(@last_else))
-      super
-    ensure
-      @else = old_else
-      @last_else = old_last_else
-    end
-
-    # @see Node#_after_load
-    def _after_load
-      super
-      @else = Sass::Util.load(@else)
-      @last_else = (@last_else ? Sass::Util.load(@last_else) : self)
-    end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt, is_else = false)
-      name =
-        if !is_else; "if"
-        elsif @expr; "else if"
-        else; "else"
-        end
-      str = "#{'  ' * tabs}@#{name}"
-      str << " #{@expr.to_sass(opts)}" if @expr
-      str << children_to_src(tabs, opts, fmt)
-      str << @else.send(:to_src, tabs, opts, fmt, true) if @else
-      str
+    def _dump(f)
+      Marshal.dump([self.expr, self.else, self.children])
     end
 
-    # Runs the child nodes if the conditional expression is true;
-    # otherwise, tries the \{#else} nodes.
-    #
-    # @param environment [Sass::Environment] The lexical environment containing
-    #   variable and mixin values
-    # @return [Array<Tree::Node>] The resulting static nodes
-    # @see Sass::Tree
-    def _perform(environment)
-      environment = Sass::Environment.new(environment)
-      return perform_children(environment) if @expr.nil? || @expr.perform(environment).to_bool
-      return @else.perform(environment) if @else
-      []
+    def self._load(data)
+      expr, else_, children = Marshal.load(data)
+      node = IfNode.new(expr)
+      node.else = else_
+      node.children = children
+      node.instance_variable_set('@last_else',
+        node.else ? node.else.instance_variable_get('@last_else') : node)
+      node
     end
 
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {IfNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
+    # @see Node#deep_copy
+    def deep_copy
+      node = super
+      node.else = self.else.deep_copy if self.else
+      node
     end
   end
 end

data/vendor/sass/lib/sass/tree/import_node.rb

@@ -25,21 +25,6 @@ module Sass
         @imported_file ||= import
       end
 
-      # @see Node#to_sass
-      def to_sass(tabs = 0, opts = {})
-        "#{'  ' * tabs}@import #{@imported_filename}\n"
-      end
-
-      # @see Node#to_scss
-      def to_scss(tabs = 0, opts = {})
-        "#{'  ' * tabs}@import \"#{@imported_filename}\";\n"
-      end
-
-      # @see Node#cssize
-      def cssize(*args)
-        super.first
-      end
-
       # Returns whether or not this import should emit a CSS @import declaration
       #
       # @return [Boolean] Whether or not this is a simple CSS @import declaration.
@@ -51,47 +36,6 @@ module Sass
         end
       end
 
-      protected
-
-      # @see Node#_cssize
-      def _cssize(*args)
-        super.children
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace(:filename => children.first.filename)
-        e.add_backtrace(:filename => @filename, :line => @line)
-        raise e
-      end
-
-      # Returns a static DirectiveNode if this is importing a CSS file,
-      # or parses and includes the imported Sass file.
-      #
-      # @param environment [Sass::Environment] The lexical environment containing
-      #   variable and mixin values
-      def _perform(environment)
-        if path = css_import?
-          return DirectiveNode.new("@import url(#{path})")
-        end
-        super
-      end
-
-      # Parses the imported file and runs the dynamic Sass for it.
-      #
-      # @param environment [Sass::Environment] The lexical environment containing
-      #   variable and mixin values
-      def perform!(environment)
-        environment.push_frame(:filename => @filename, :line => @line)
-        # TODO: re-enable caching
-        root = imported_file.to_tree
-        self.children = root.children
-        self.children = perform_children(environment)
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace(:filename => imported_file.options[:filename])
-        e.add_backtrace(:filename => @filename, :line => @line)
-        raise e
-      ensure
-        environment.pop_frame
-      end
-
       private
 
       def import