sass 3.2.0.alpha.9 → 3.2.0.alpha.11

data/REVISION

@@ -1 +1 @@
-61b2162d9e606e3c5838e21de0104ba643d851ca
+bf9eafb0036f01dc23350e0dc1db29b7e5ddf463

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.9
+3.2.0.alpha.11

data/lib/sass/cache_stores/base.rb

@@ -42,15 +42,20 @@ module Sass
         raise "#{self.class} must implement #_retrieve."
       end
 
-      # Store a {Sass::Tree::RootNode}.
+      # Store an object to the Sass Cache.
       #
       # @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, root)
-        _store(key, Sass::VERSION, sha, Marshal.dump(root))
+      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
       rescue TypeError, LoadError => e
-        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
+        Sass::Util.sass_warn "Warning. Error encountered while saving a #{obj.class.name} to cache #{path_to(key)}: #{e}"
       end
 
       # Retrieve a {Sass::Tree::RootNode}.

data/lib/sass/logger/log_level.rb

@@ -31,7 +31,6 @@ module Sass
             level = log_levels.values.max
             level = level.nil? ? 0 : level + 1
           end
-          # (require 'ruby-debug'; debugger)
           log_levels.update(name => level)
           define_logger(name)
         end

data/lib/sass/tree/debug_node.rb

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

data/lib/sass/tree/each_node.rb

@@ -20,5 +20,11 @@ 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/for_node.rb

@@ -32,5 +32,10 @@ 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,6 +22,11 @@ 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

@@ -61,5 +61,10 @@ module Sass::Tree
       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

@@ -22,6 +22,11 @@ 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

@@ -28,5 +28,10 @@ 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

@@ -66,6 +66,9 @@ module Sass
       # @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
       end
 
@@ -190,6 +193,16 @@ module Sass
         node
       end
 
+      def before_sass_cache_store
+        o = self.options
+        self.options = {}
+        return o
+      end
+
+      def after_sass_cache_store(o)
+        self.options = o
+      end
+
       protected
 
       # @see Sass::Shared.balance

data/lib/sass/tree/prop_node.rb

@@ -55,6 +55,11 @@ 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

@@ -13,6 +13,11 @@ module Sass
         @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

@@ -115,6 +115,11 @@ 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

data/lib/sass/tree/variable_node.rb

@@ -25,6 +25,12 @@ module Sass
         @guarded = guarded
         super()
       end
+
+      # Returns sub nodes that are not tree children.
+      def subnodes
+        Array(expr)
+      end
+
     end
   end
 end

data/lib/sass/tree/warn_node.rb

@@ -13,6 +13,12 @@ module Sass
         @expr = expr
         super()
       end
+
+      # Returns sub nodes that are not tree children.
+      def subnodes
+        Array(expr)
+      end
+
     end
   end
 end

data/lib/sass/tree/while_node.rb

@@ -14,5 +14,11 @@ module Sass::Tree
       @expr = expr
       super()
     end
+
+    # Returns sub nodes that are not tree children.
+    def subnodes
+      Array(expr)
+    end
+
   end
 end

data/test/sass/logger_test.rb

@@ -48,7 +48,6 @@ class LoggerTest < Test::Unit::TestCase
 
   def test_logging_can_be_disabled
     logger = InterceptedLogger.new
-    # (require 'ruby-debug'; debugger)
     logger.error("message #1")
     assert_equal 1, logger.messages.size
     logger.reset!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.2.0.alpha.9
+  version: 3.2.0.alpha.11
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -04:00
+date: 2011-07-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,9 @@ files:
 - lib/sass/importers/base.rb
 - lib/sass/importers/filesystem.rb
 - lib/sass/less.rb
+- lib/sass/logger.rb
+- lib/sass/logger/base.rb
+- lib/sass/logger/log_level.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -137,9 +140,6 @@ files:
 - lib/sass/util.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
-- lib/sass/logger.rb
-- lib/sass/logger/base.rb
-- lib/sass/logger/log_level.rb
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile
@@ -185,6 +185,7 @@ files:
 - test/sass/functions_test.rb
 - test/sass/importer_test.rb
 - test/sass/less_conversion_test.rb
+- test/sass/logger_test.rb
 - test/sass/mock_importer.rb
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
@@ -269,7 +270,6 @@ files:
 - test/sass/test_helper.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb
-- test/sass/logger_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
 - Rakefile
@@ -319,6 +319,7 @@ test_files:
 - test/sass/functions_test.rb
 - test/sass/importer_test.rb
 - test/sass/less_conversion_test.rb
+- test/sass/logger_test.rb
 - test/sass/plugin_test.rb
 - test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
@@ -327,4 +328,3 @@ test_files:
 - test/sass/scss/scss_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb
-- test/sass/logger_test.rb