sass 3.1.5 → 3.1.6

data/VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6

data/lib/sass/cache_stores/base.rb

@@ -42,20 +42,15 @@ module Sass
         raise "#{self.class} must implement #_retrieve."
       end
 
-      # Store an object to the Sass Cache.
+      # Store a {Sass::Tree::RootNode}.
       #
       # @param key [String] The key to store it under.
       # @param sha [String] The checksum for the contents that are being stored.
       # @param obj [Object] The object to cache.
-      def store(key, sha, obj)
-        temp = obj.before_sass_cache_store if obj.respond_to?(:before_sass_cache_store)
-        begin
-          _store(key, Sass::VERSION, sha, Marshal.dump(obj))
-        ensure
-          obj.after_sass_cache_store(temp) if obj.respond_to?(:after_sass_cache_store)
-        end
+      def store(key, sha, root)
+        _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e
-        Sass::Util.sass_warn "Warning. Error encountered while saving a #{obj.class.name} to cache #{path_to(key)}: #{e}"
+        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
       end
 
       # Retrieve a {Sass::Tree::RootNode}.

data/lib/sass/engine.rb

@@ -28,6 +28,8 @@ require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
 require 'sass/tree/visitors/convert'
 require 'sass/tree/visitors/to_css'
+require 'sass/tree/visitors/deep_copy'
+require 'sass/tree/visitors/set_options'
 require 'sass/tree/visitors/check_nesting'
 require 'sass/selector'
 require 'sass/environment'
@@ -307,7 +309,6 @@ module Sass
         sha = Digest::SHA1.hexdigest(@template)
 
         if root = @options[:cache_store].retrieve(key, sha)
-          @options = root.options.merge(@options)
           root.options = @options
           return root
         end

data/lib/sass/environment.rb

@@ -93,6 +93,17 @@ module Sass
       @mixins_in_use ||= @parent.mixins_in_use
     end
 
+    def stack_trace
+      trace = []
+      stack.reverse.each_with_index do |entry, i|
+        msg = "#{i == 0 ? "on" : "from"} line #{entry[:line]}"
+        msg << " of #{entry[:filename] || "an unknown file"}"
+        msg << ", in `#{entry[:mixin]}'" if entry[:mixin]
+        trace << msg
+      end
+      trace
+    end
+
     private
 
     def parent_options

data/lib/sass/script/funcall.rb

@@ -57,6 +57,14 @@ module Sass
         @args + @keywords.values
       end
 
+      # @see Node#deep_copy
+      def deep_copy
+        node = dup
+        node.instance_variable_set('@args', args.map {|a| a.deep_copy})
+        node.instance_variable_set('@keywords', Hash[keywords.map {|k, v| [k, v.deep_copy]}])
+        node
+      end
+
       protected
 
       # Evaluates the function call.

data/lib/sass/script/interpolation.rb

@@ -50,6 +50,15 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@before', @before.deep_copy) if @before
+      node.instance_variable_set('@mid', @mid.deep_copy)
+      node.instance_variable_set('@after', @after.deep_copy) if @after
+      node
+    end
+
     protected
 
     # Evaluates the interpolation.

data/lib/sass/script/list.rb

@@ -24,6 +24,13 @@ module Sass::Script
       @separator = separator
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@value', value.map {|c| c.deep_copy})
+      node
+    end
+
     # @see Node#eq
     def eq(other)
       Sass::Script::Bool.new(

data/lib/sass/script/literal.rb

@@ -33,6 +33,11 @@ module Sass::Script
       []
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      dup
+    end
+
     # Returns the options hash for this node.
     #
     # @return [{Symbol => Object}]

data/lib/sass/script/node.rb

@@ -57,6 +57,14 @@ module Sass::Script
       Sass::Util.abstract(self)
     end
 
+    # Returns a deep clone of this node.
+    # The child nodes are cloned, but options are not.
+    #
+    # @return [Node]
+    def deep_copy
+      Sass::Util.abstract(self)
+    end
+
     protected
 
     # Converts underscores to dashes if the :dasherize option is set.

data/lib/sass/script/operation.rb

@@ -55,6 +55,14 @@ module Sass::Script
       [@operand1, @operand2]
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@operand1', @operand1.deep_copy)
+      node.instance_variable_set('@operand2', @operand2.deep_copy)
+      node
+    end
+
     protected
 
     # Evaluates the operation.

data/lib/sass/script/string_interpolation.rb

@@ -60,6 +60,15 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@before', @before.deep_copy) if @before
+      node.instance_variable_set('@mid', @mid.deep_copy)
+      node.instance_variable_set('@after', @after.deep_copy) if @after
+      node
+    end
+
     protected
 
     # Evaluates the interpolation.

data/lib/sass/script/unary_operation.rb

@@ -38,6 +38,13 @@ module Sass::Script
       [@operand]
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@operand', @operand.deep_copy)
+      node
+    end
+
     protected
 
     # Evaluates the operation.

data/lib/sass/script/variable.rb

@@ -34,6 +34,11 @@ module Sass
         []
       end
 
+      # @see Node#deep_copy
+      def deep_copy
+        dup
+      end
+
       protected
 
       # Evaluates the variable.

data/lib/sass/tree/debug_node.rb

@@ -6,12 +6,7 @@ module Sass
     class DebugNode < Node
       # The expression to print.
       # @return [Script::Node] 
-      attr_reader :expr
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
+      attr_accessor :expr
 
       # @param expr [Script::Node] The expression to print
       def initialize(expr)

data/lib/sass/tree/each_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
 
     # The parse tree for the list.
     # @param [Script::Node]
-    attr_reader :list
+    attr_accessor :list
 
     # @param var [String] The name of the loop variable
     # @param list [Script::Node] The parse tree for the list
@@ -20,11 +20,5 @@ module Sass::Tree
       @list = list
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(list)
-    end
-
   end
 end

data/lib/sass/tree/extend_node.rb

@@ -15,7 +15,7 @@ module Sass::Tree
     # representing `#{}`-interpolation.
     #
     # @return [Array<String, Sass::Script::Node>]
-    attr_reader :selector
+    attr_accessor :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_reader :from
+    attr_accessor :from
 
     # The parse tree for the final expression.
     # @return [Script::Node]
-    attr_reader :to
+    attr_accessor :to
 
     # Whether to include `to` in the loop or stop just before.
     # @return [Boolean]
@@ -32,10 +32,5 @@ module Sass::Tree
       @exclusive = exclusive
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(from) + Array(to)
-    end
   end
 end

data/lib/sass/tree/function_node.rb

@@ -22,11 +22,6 @@ module Sass
         @args = args
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(args)
-      end
     end
   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,12 +35,6 @@ 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
@@ -54,17 +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
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(expr) + Array(self.else)
-    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_reader :args
+      attr_accessor :args
 
       # @param name [String] The mixin name
       # @param args [Array<(Script::Node, Script::Node)>] See \{#args}
@@ -22,11 +22,6 @@ module Sass
         @args = args
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(args)
-      end
     end
   end
 end

data/lib/sass/tree/mixin_node.rb

@@ -13,11 +13,11 @@ module Sass::Tree
 
     # The arguments to the mixin.
     # @return [Array<Script::Node>]
-    attr_reader :args
+    attr_accessor :args
 
     # A hash from keyword argument names to values.
     # @return [{String => Script::Node}]
-    attr_reader :keywords
+    attr_accessor :keywords
 
     # @param name [String] The name of the mixin
     # @param args [Array<Script::Node>] See \{#args}
@@ -28,10 +28,5 @@ module Sass::Tree
       @keywords = keywords
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(args) + (keywords||{}).values
-    end
   end
 end

data/lib/sass/tree/node.rb

@@ -65,11 +65,7 @@ module Sass
       # @param options [{Symbol => Object}] The options
       # @see #options
       def options=(options)
-        children.each {|c| c.options = options}
-        if respond_to?(:subnodes)
-          subnodes.each {|n| n.options = options if n.respond_to?(:options=)}
-        end
-        @options = options
+        Sass::Tree::Visitors::SetOptions.visit(self, options)
       end
 
       # @private
@@ -188,19 +184,7 @@ module Sass
       #
       # @return [Node]
       def deep_copy
-        node = dup
-        node.children = children.map {|c| c.deep_copy}
-        node
-      end
-
-      def before_sass_cache_store
-        o = self.options
-        self.options = {}
-        return o
-      end
-
-      def after_sass_cache_store(o)
-        self.options = o
+        Sass::Tree::Visitors::DeepCopy.visit(self)
       end
 
       protected

data/lib/sass/tree/prop_node.rb

@@ -55,11 +55,6 @@ module Sass::Tree
       super()
     end
 
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(name).select{|n| n.is_a?(Sass::Script::Node)} + [value]
-    end
-
     # Compares the names and values of two properties.
     #
     # @param other [Object] The object to compare with

data/lib/sass/tree/return_node.rb

@@ -6,18 +6,13 @@ module Sass
     class ReturnNode < Node
       # The expression to return.
       # @type [Script::Node]
-      attr_reader :expr
+      attr_accessor :expr
 
       # @param expr [Script::Node] The expression to return
       def initialize(expr)
         @expr = expr
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
     end
   end
 end

data/lib/sass/tree/rule_node.rb

@@ -50,6 +50,13 @@ 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)
@@ -115,11 +122,6 @@ module Sass::Tree
        :line => self.line}
     end
 
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      rule.select{|r| r.is_a?(Sass::Script::Node)}
-    end
-
     private
 
     def try_to_parse_non_interpolated_rules