haml-edge 2.1.6 → 2.1.7

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

data/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

data/lib/haml/exec.rb

@@ -189,6 +189,12 @@ END
         opts.on('-I', '--load-path PATH', 'Add a sass import path.') do |path|
           @options[:for_engine][:load_paths] << path
         end
+        opts.on('--cache-location', 'The path to put cached Sass files. Defaults to .sass-cache.') do |loc|
+          @options[:for_engine][:cache_location] = path
+        end
+        opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
+          @options[:for_engine][:cache] = false
+        end
       end
 
       def process_result
@@ -203,21 +209,23 @@ END
         input = @options[:input]
         output = @options[:output]
 
-        template = input.read()
-        input.close() if input.is_a? File
+        tree =
+          if input.is_a?(File) && !@options[:check_syntax]
+            ::Sass::Files.tree_for(input.path, @options[:for_engine])
+          else
+            # We don't need to do any special handling of @options[:check_syntax] here,
+            # because the Sass syntax checking happens alongside evaluation
+            # and evaluation doesn't actually evaluate any code anyway.
+            ::Sass::Engine.new(input.read(), @options[:for_engine]).to_tree
+          end
 
-        begin
-          # We don't need to do any special handling of @options[:check_syntax] here,
-          # because the Sass syntax checking happens alongside evaluation
-          # and evaluation doesn't actually evaluate any code anyway.
-          result = ::Sass::Engine.new(template, @options[:for_engine]).render
-        rescue ::Sass::SyntaxError => e
-          raise e if @options[:trace]
-          raise "Syntax error on line #{get_line e}: #{e.message}"
-        end
+        input.close() if input.is_a?(File)
 
-        output.write(result)
+        output.write(tree.render)
         output.close() if output.is_a? File
+      rescue ::Sass::SyntaxError => e
+        raise e if @options[:trace]
+        raise "Syntax error on line #{get_line e}: #{e.message}"
       end
     end
 

data/lib/sass.rb

@@ -991,6 +991,9 @@ require 'haml/version'
 #                               or <tt>width = !main_width</tt>.
 #                               By default, either syntax is valid.
 #
+# [<tt>:cache</tt>]             Whether parsed Sass files should be cached,
+#                               allowing greater speed. Defaults to true.
+#
 # [<tt>:never_update</tt>]      Whether the CSS files should never be updated,
 #                               even if the template file changes.
 #                               Setting this to true may give small performance gains.
@@ -1035,6 +1038,11 @@ require 'haml/version'
 #                               or <tt>MERB_ROOT + "/public/stylesheets"</tt>.
 #                               Only has meaning within Ruby on Rails or Merb.
 #
+# [<tt>:cache_location</tt>]    The path where the cached <tt>sassc</tt> files should be written to.
+#                               Defaults to <tt>RAILS_ROOT + "/tmp/sass-cache"</tt>,
+#                               or <tt>MERB_ROOT + "/tmp/sass-cache"</tt>,
+#                               or just <tt>"./.sass-cache"</tt>.
+#
 # [<tt>:filename</tt>]          The filename of the file being rendered.
 #                               This is used solely for reporting errors,
 #                               and is automatically set when using Rails or Merb.

data/lib/sass/css.rb

@@ -75,7 +75,7 @@ module Sass
     private
 
     def build_tree
-      root = Tree::Node.new({})
+      root = Tree::Node.new
       whitespace
       rules              root
       expand_commas      root
@@ -99,7 +99,7 @@ module Sass
       directive = rule[0] == ?@
 
       if directive
-        node = Tree::DirectiveNode.new(rule, {})
+        node = Tree::DirectiveNode.new(rule)
         return node if @template.scan(/;/)
 
         assert_match /\{/
@@ -110,7 +110,7 @@ module Sass
       end
 
       assert_match /\{/
-      node = Tree::RuleNode.new(rule, {})
+      node = Tree::RuleNode.new(rule)
       attributes(node)
       return node
     end
@@ -128,7 +128,7 @@ module Sass
         end
 
         assert_match /(;|(?=\}))/
-        rule << Tree::AttrNode.new(name, value, {})
+        rule << Tree::AttrNode.new(name, value, nil)
       end
 
       assert_match /\}/
@@ -176,7 +176,7 @@ module Sass
       root.children.map! do |child|
         next child unless Tree::RuleNode === child && child.rules.first.include?(',')
         child.rules.first.split(',').map do |rule|
-          node = Tree::RuleNode.new(rule.strip, {})
+          node = Tree::RuleNode.new(rule.strip)
           node.children = child.children
           node
         end
@@ -224,7 +224,7 @@ module Sass
         first, rest = child.rules.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
 
         if current_rule.nil? || current_rule.rules.first != first
-          current_rule = Tree::RuleNode.new(first, {})
+          current_rule = Tree::RuleNode.new(first)
           root << current_rule
         end
 

data/lib/sass/engine.rb

@@ -1,4 +1,5 @@
 require 'strscan'
+require 'digest/sha1'
 require 'sass/tree/node'
 require 'sass/tree/rule_node'
 require 'sass/tree/comment_node'
@@ -15,6 +16,7 @@ require 'sass/tree/file_node'
 require 'sass/environment'
 require 'sass/script'
 require 'sass/error'
+require 'sass/files'
 require 'haml/shared'
 
 module Sass
@@ -76,6 +78,14 @@ module Sass
     # attributes of the form <tt>name: attr</tt>.
     ATTRIBUTE_ALTERNATE = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
 
+    # The default options for Sass::Engine.
+    DEFAULT_OPTIONS = {
+      :style => :nested,
+      :load_paths => ['.'],
+      :cache => true,
+      :cache_location => './.sass-cache',
+    }.freeze
+
     # Creates a new instace of Sass::Engine that will compile the given
     # template string when <tt>render</tt> is called.
     # See README.rdoc for available options.
@@ -89,36 +99,23 @@ module Sass
     #++
     #
     def initialize(template, options={})
-      @options = {
-        :style => :nested,
-        :load_paths => ['.']
-      }.merge! options
+      @options = DEFAULT_OPTIONS.merge(options)
       @template = template
-      @environment = Environment.new(nil, @options)
-      @environment.set_var("important", Script::String.new("!important"))
     end
 
     # Processes the template and returns the result as a string.
     def render
-      begin
-        render_to_tree.perform(@environment).to_s
-      rescue SyntaxError => err
-        err.sass_line = @line unless err.sass_line
-        unless err.sass_filename
-          err.add_backtrace_entry(@options[:filename])
-        end
-        raise err
-      end
+      to_tree.render
     end
 
     alias_method :to_css, :render
 
-    protected
-
-    def render_to_tree
-      root = Tree::Node.new(@options)
+    def to_tree
+      root = Tree::Node.new
       append_children(root, tree(tabulate(@template)).first, true)
+      root.options = @options
       root
+    rescue SyntaxError => e; e.add_metadata(@options[:filename], @line)
     end
 
     private
@@ -246,7 +243,7 @@ END
         else
           # Support CSS3-style pseudo-elements,
           # which begin with ::
-          Tree::RuleNode.new(line.text, @options)
+          Tree::RuleNode.new(line.text)
         end
       when Script::VARIABLE_CHAR
         parse_variable(line)
@@ -255,12 +252,12 @@ END
       when DIRECTIVE_CHAR
         parse_directive(parent, line, root)
       when ESCAPE_CHAR
-        Tree::RuleNode.new(line.text[1..-1], @options)
+        Tree::RuleNode.new(line.text[1..-1])
       when MIXIN_DEFINITION_CHAR
         parse_mixin_definition(line)
       when MIXIN_INCLUDE_CHAR
         if line.text[1].nil?
-          Tree::RuleNode.new(line.text, @options)
+          Tree::RuleNode.new(line.text)
         else
           parse_mixin_include(line, root)
         end
@@ -268,20 +265,12 @@ END
         if line.text =~ ATTRIBUTE_ALTERNATE_MATCHER
           parse_attribute(line, ATTRIBUTE_ALTERNATE)
         else
-          Tree::RuleNode.new(line.text, @options)
+          Tree::RuleNode.new(line.text)
         end
       end
     end
 
     def parse_attribute(line, attribute_regx)
-      if @options[:attribute_syntax] == :normal &&
-          attribute_regx == ATTRIBUTE_ALTERNATE
-        raise SyntaxError.new("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.")
-      elsif @options[:attribute_syntax] == :alternate &&
-          attribute_regx == ATTRIBUTE
-        raise SyntaxError.new("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.")
-      end
-
       name, eq, value = line.text.scan(attribute_regx)[0]
 
       if name.nil? || value.nil?
@@ -292,7 +281,7 @@ END
       else
         value
       end
-      Tree::AttrNode.new(name, expr, @options)
+      Tree::AttrNode.new(name, expr, attribute_regx == ATTRIBUTE ? :old : :new)
     end
 
     def parse_variable(line)
@@ -300,14 +289,14 @@ END
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.", @line + 1) unless line.children.empty?
       raise SyntaxError.new("Invalid variable: \"#{line.text}\".", @line) unless name && value
 
-      Tree::VariableNode.new(name, parse_script(value, :offset => line.offset + line.text.index(value)), op == '||=', @options)
+      Tree::VariableNode.new(name, parse_script(value, :offset => line.offset + line.text.index(value)), op == '||=')
     end
 
     def parse_comment(line)
       if line[1] == CSS_COMMENT_CHAR || line[1] == SASS_COMMENT_CHAR
-        Tree::CommentNode.new(line, @options.merge(:silent => (line[1] == SASS_COMMENT_CHAR)))
+        Tree::CommentNode.new(line, line[1] == SASS_COMMENT_CHAR)
       else
-        Tree::RuleNode.new(line, @options)
+        Tree::RuleNode.new(line)
       end
     end
 
@@ -326,17 +315,17 @@ END
         parse_else(parent, line, value)
       elsif directive == "while"
         raise SyntaxError.new("Invalid while directive '@while': expected expression.") unless value
-        Tree::WhileNode.new(parse_script(value, :offset => offset), @options)
+        Tree::WhileNode.new(parse_script(value, :offset => offset))
       elsif directive == "if"
         raise SyntaxError.new("Invalid if directive '@if': expected expression.") unless value
-        Tree::IfNode.new(parse_script(value, :offset => offset), @options)
+        Tree::IfNode.new(parse_script(value, :offset => offset))
       elsif directive == "debug"
         raise SyntaxError.new("Invalid debug directive '@debug': expected expression.") unless value
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.", @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
-        Tree::DebugNode.new(parse_script(value, :offset => offset), @options)
+        Tree::DebugNode.new(parse_script(value, :offset => offset))
       else
-        Tree::DirectiveNode.new(line.text, @options)
+        Tree::DirectiveNode.new(line.text)
       end
     end
 
@@ -357,7 +346,7 @@ END
 
       parsed_from = parse_script(from_expr, :offset => line.offset + line.text.index(from_expr))
       parsed_to = parse_script(to_expr, :offset => line.offset + line.text.index(to_expr))
-      Tree::ForNode.new(var[1..-1], parsed_from, parsed_to, to_name == 'to', @options)
+      Tree::ForNode.new(var[1..-1], parsed_from, parsed_to, to_name == 'to')
     end
 
     def parse_else(parent, line, text)
@@ -371,7 +360,7 @@ END
         expr = parse_script($1, :offset => line.offset + line.text.index($1))
       end
 
-      node = Tree::IfNode.new(expr, @options)
+      node = Tree::IfNode.new(expr)
       append_children(node, line.children, false)
       previous.add_else node
       nil
@@ -406,7 +395,7 @@ END
         default = parse_script(default, :offset => line.offset + line.text.index(default)) if default
         [arg[1..-1], default]
       end
-      Tree::MixinDefNode.new(name, args, @options)
+      Tree::MixinDefNode.new(name, args)
     end
 
     def parse_mixin_include(line, root)
@@ -416,7 +405,7 @@ END
       raise SyntaxError.new("Invalid mixin include \"#{line.text}\".", @line) if name.nil? || args.nil?
       args.each {|a| raise SyntaxError.new("Mixin arguments can't be empty.", @line) if a.empty?}
 
-      Tree::MixinNode.new(name, args.map {|s| parse_script(s, :offset => line.offset + line.text.index(s))}, @options)
+      Tree::MixinNode.new(name, args.map {|s| parse_script(s, :offset => line.offset + line.text.index(s))})
     end
 
     def parse_script(script, options = {})
@@ -436,60 +425,15 @@ END
         engine = nil
 
         begin
-          filename = self.class.find_file_to_import(filename, import_paths)
+          filename = Sass::Files.find_file_to_import(filename, import_paths)
         rescue Exception => e
           raise SyntaxError.new(e.message, @line)
         end
 
-        next Tree::DirectiveNode.new("@import url(#{filename})", @options) if filename =~ /\.css$/
+        next Tree::DirectiveNode.new("@import url(#{filename})") if filename =~ /\.css$/
 
-        File.open(filename) do |file|
-          new_options = @options.dup
-          new_options[:filename] = filename
-          engine = Sass::Engine.new(file.read, new_options)
-        end
-
-        begin
-          root = engine.render_to_tree
-        rescue Sass::SyntaxError => err
-          err.add_backtrace_entry(filename)
-          raise err
-        end
-        Tree::FileNode.new(filename, root.children, @options)
+        Tree::FileNode.new(filename)
       end.flatten
     end
-
-    def self.find_file_to_import(filename, load_paths)
-      was_sass = false
-      original_filename = filename
-
-      if filename[-5..-1] == ".sass"
-        filename = filename[0...-5]
-        was_sass = true
-      elsif filename[-4..-1] == ".css"
-        return filename
-      end
-
-      new_filename = find_full_path("#{filename}.sass", load_paths)
-
-      return new_filename if new_filename
-      return filename + '.css' unless was_sass
-      raise SyntaxError.new("File to import not found or unreadable: #{original_filename}.", @line)
-    end
-
-    def self.find_full_path(filename, load_paths)
-      segments = filename.split(File::SEPARATOR)
-      segments.push "_#{segments.pop}"
-      partial_name = segments.join(File::SEPARATOR)
-      load_paths.each do |path|
-        [partial_name, filename].each do |name|
-          full_path = File.join(path, name)
-          if File.readable?(full_path)
-            return full_path
-          end
-        end
-      end
-      nil
-    end
   end
 end

data/lib/sass/environment.rb

@@ -1,12 +1,14 @@
 module Sass
   class Environment
     attr_reader :parent
+    attr_writer :options
 
-    def initialize(parent = nil, options = nil)
+    def initialize(parent = nil)
       @vars = {}
       @mixins = {}
       @parent = parent
-      @options = options
+
+      set_var("important", Script::String.new("!important")) unless @parent
     end
 
     def options

data/lib/sass/error.rb

@@ -19,6 +19,13 @@ module Sass
       @sass_line = lineno
     end
 
+    # Add information about the filename and line on which the error was raised.
+    def add_metadata(filename, line)
+      self.sass_line ||= line
+      add_backtrace_entry(filename) unless sass_filename
+      raise self
+    end
+
     # Adds a properly formatted entry to the exception's backtrace.
     # +filename+ should be the file in which the error occurred,
     # if applicable (defaults to "(sass)").

data/lib/sass/files.rb

@@ -0,0 +1,100 @@
+require 'digest/sha1'
+
+module Sass
+  # This module contains various bits of functionality
+  # related to finding and caching Sass files.
+  module Files
+    extend self
+
+    def tree_for(filename, options)
+      options = Sass::Engine::DEFAULT_OPTIONS.merge(options)
+      text = File.read(filename)
+
+      if options[:cache]
+        compiled_filename = sassc_filename(filename, options)
+        sha = Digest::SHA1.hexdigest(text)
+
+        if dump = try_to_read_sassc(filename, compiled_filename, sha)
+          return Marshal.load(dump)
+        end
+      end
+
+      engine = Sass::Engine.new(text, options.merge(:filename => filename))
+
+      begin
+        root = engine.to_tree
+      rescue Sass::SyntaxError => err
+        err.add_backtrace_entry(filename)
+        raise err
+      end
+
+      try_to_write_sassc(root, compiled_filename, sha, options) if options[:cache]
+
+      root
+    end
+
+    def find_file_to_import(filename, load_paths)
+      was_sass = false
+      original_filename = filename
+
+      if filename[-5..-1] == ".sass"
+        filename = filename[0...-5]
+        was_sass = true
+      elsif filename[-4..-1] == ".css"
+        return filename
+      end
+
+      new_filename = find_full_path("#{filename}.sass", load_paths)
+
+      return new_filename if new_filename
+      return filename + '.css' unless was_sass
+      raise SyntaxError.new("File to import not found or unreadable: #{original_filename}.", @line)
+    end
+
+    private
+
+    def sassc_filename(filename, options)
+      File.join(options[:cache_location],
+        Digest::SHA1.hexdigest(File.dirname(File.expand_path(filename))),
+        File.basename(filename) + 'c')
+    end
+
+    def try_to_read_sassc(filename, compiled_filename, sha)
+      return unless File.readable?(compiled_filename)
+
+      File.open(compiled_filename) do |f|
+        return unless f.readline("\n").strip == Sass::VERSION
+        return unless f.readline("\n").strip == sha
+        return f.read
+      end
+    end
+
+    def try_to_write_sassc(root, compiled_filename, sha, options)
+      return unless File.writable?(File.dirname(options[:cache_location]))
+      return if File.exists?(options[:cache_location]) && !File.writable?(options[:cache_location])
+      return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
+      return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
+      FileUtils.mkdir_p(File.dirname(compiled_filename))
+      File.open(compiled_filename, "w") do |f|
+        f.puts(Sass::VERSION)
+        f.puts(sha)
+        f.write(Marshal.dump(root))
+      end
+    end
+
+    def find_full_path(filename, load_paths)
+      segments = filename.split(File::SEPARATOR)
+      segments.push "_#{segments.pop}"
+      partial_name = segments.join(File::SEPARATOR)
+      load_paths.each do |path|
+        [partial_name, filename].each do |name|
+          full_path = File.join(path, name)
+          if File.readable?(full_path)
+            return full_path
+          end
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/sass/plugin.rb

@@ -70,9 +70,8 @@ module Sass
       File.delete(css) if File.exists?(css)
 
       filename = template_filename(name, template_location)
-      engine = Engine.new(File.read(filename), engine_options(:css_filename => css, :filename => filename))
       result = begin
-                 engine.render
+                 Sass::Files.tree_for(filename, engine_options(:css_filename => css, :filename => filename)).render
                rescue Exception => e
                  exception_string(e)
                end
@@ -193,7 +192,7 @@ END
     def dependencies(filename)
       File.readlines(filename).grep(/^@import /).map do |line|
         line[8..-1].split(',').map do |inc|
-          Sass::Engine.find_file_to_import(inc.strip, [File.dirname(filename)] + load_paths)
+          Sass::Files.find_file_to_import(inc.strip, [File.dirname(filename)] + load_paths)
         end
       end.flatten.grep(/\.sass$/)
     end

data/lib/sass/plugin/merb.rb

@@ -10,10 +10,11 @@ unless defined?(Sass::MERB_LOADED)
     env  = Merb.environment
   end
 
-  Sass::Plugin.options.merge!(:template_location  => root + '/public/stylesheets/sass',
-                              :css_location       => root + '/public/stylesheets',
-                              :always_check       => env != "production",
-                              :full_exception     => env != "production")
+  Sass::Plugin.options.merge!(:template_location => root + '/public/stylesheets/sass',
+                              :css_location      => root + '/public/stylesheets',
+                              :cache_location    => root + '/tmp/sass-cache',
+                              :always_check      => env != "production",
+                              :full_exception    => env != "production")
   config = Merb::Plugins.config[:sass] || Merb::Plugins.config["sass"] || {}
 
   if defined? config.symbolize_keys!

data/lib/sass/plugin/rails.rb

@@ -1,10 +1,11 @@
 unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location  => RAILS_ROOT + '/public/stylesheets/sass',
-                              :css_location       => RAILS_ROOT + '/public/stylesheets',
-                              :always_check       => RAILS_ENV != "production",
-                              :full_exception     => RAILS_ENV != "production")
+  Sass::Plugin.options.merge!(:template_location => RAILS_ROOT + '/public/stylesheets/sass',
+                              :css_location      => RAILS_ROOT + '/public/stylesheets',
+                              :cache_location    => RAILS_ROOT + '/tmp/sass-cache',
+                              :always_check      => RAILS_ENV != "production",
+                              :full_exception    => RAILS_ENV != "production")
 
   # :stopdoc:
   module ActionController

data/lib/sass/tree/attr_node.rb

@@ -2,10 +2,11 @@ module Sass::Tree
   class AttrNode < Node
     attr_accessor :name, :value
     
-    def initialize(name, value, options)
+    def initialize(name, value, attr_syntax)
       @name = name
       @value = value
-      super(options)
+      @attr_syntax = attr_syntax
+      super()
     end
 
     def ==(other)
@@ -13,6 +14,12 @@ module Sass::Tree
     end
 
     def to_s(tabs, parent_name = nil)
+      if @options[:attribute_syntax] == :normal && @attr_syntax == :new
+        raise Sass::SyntaxError.new("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.")
+      elsif @options[:attribute_syntax] == :alternate && @attr_syntax == :old
+        raise Sass::SyntaxError.new("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.")
+      end
+
       if value[-1] == ?;
         raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!).", @line)
       end
@@ -23,7 +30,7 @@ module Sass::Tree
         raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}.", @line)
       end
       
-      join_string = case @style
+      join_string = case style
                     when :compact; ' '
                     when :compressed; ''
                     else "\n"
@@ -31,7 +38,7 @@ module Sass::Tree
       spaces = '  ' * (tabs - 1)
       to_return = ''
       if !value.empty?
-        to_return << "#{spaces}#{real_name}:#{@style == :compressed ? '' : ' '}#{value};#{join_string}"
+        to_return << "#{spaces}#{real_name}:#{style == :compressed ? '' : ' '}#{value};#{join_string}"
       end
       
       children.each do |kid|
@@ -39,7 +46,7 @@ module Sass::Tree
         to_return << kid.to_s(tabs, real_name) << join_string
       end
       
-      (@style == :compressed && parent_name) ? to_return : to_return[0...-1]
+      (style == :compressed && parent_name) ? to_return : to_return[0...-1]
     end
 
     protected

data/lib/sass/tree/comment_node.rb

@@ -4,19 +4,17 @@ module Sass::Tree
   class CommentNode < Node
     attr_accessor :lines
     attr_accessor :value
+    attr_accessor :silent
 
-    def initialize(value, options)
+    def initialize(value, silent)
       @lines = []
       @value = value[2..-1].strip
-      super(options)
+      @silent = silent
+      super()
     end
 
     def ==(other)
-      self.class == other.class && value == other.value && lines == other.lines
-    end
-
-    def silent?
-      !!@options[:silent]
+      self.class == other.class && value == other.value && silent == other.silent && lines == other.lines
     end
 
     def to_s(tabs = 0, parent_name = nil)
@@ -24,17 +22,17 @@ module Sass::Tree
 
       spaces = '  ' * (tabs - 1)
       spaces + "/* " + ([value] + lines.map {|l| l.text}).
-        map{|l| l.sub(%r{ ?\*/ *$},'')}.join(@style == :compact ? ' ' : "\n#{spaces} * ") + " */"
+        map{|l| l.sub(%r{ ?\*/ *$},'')}.join(style == :compact ? ' ' : "\n#{spaces} * ") + " */"
     end
 
     def invisible?
-      @style == :compressed || silent?
+      style == :compressed || @silent
     end
 
     protected
 
     def _perform(environment)
-      return [] if silent?
+      return [] if @silent
       self
     end
   end

data/lib/sass/tree/debug_node.rb

@@ -1,9 +1,9 @@
 module Sass
   module Tree
     class DebugNode < Node
-      def initialize(expr, options)
+      def initialize(expr)
         @expr = expr
-        super(options)
+        super()
       end
 
       protected

data/lib/sass/tree/directive_node.rb

@@ -2,25 +2,25 @@ module Sass::Tree
   class DirectiveNode < Node
     attr_accessor :value
 
-    def initialize(value, options)
+    def initialize(value)
       @value = value
-      super(options)
+      super()
     end
 
     def to_s(tabs)
       if children.empty?
         value + ";"
       else
-        result = if @style == :compressed
+        result = if style == :compressed
                    "#{value}{"
                  else
-                   "#{'  ' * (tabs - 1)}#{value} {" + (@style == :compact ? ' ' : "\n")
+                   "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
                  end
         was_attr = false
         first = true
         children.each do |child|
           next if child.invisible?
-          if @style == :compact
+          if style == :compact
             if child.is_a?(AttrNode)
               result << "#{child.to_s(first || was_attr ? 1 : tabs + 1)} "
             else
@@ -33,17 +33,17 @@ module Sass::Tree
             end
             was_attr = child.is_a?(AttrNode)
             first = false
-          elsif @style == :compressed
+          elsif style == :compressed
             result << (was_attr ? ";#{child.to_s(1)}" : child.to_s(1))
             was_attr = child.is_a?(AttrNode)
           else
             result << child.to_s(tabs + 1) + "\n"
           end
         end
-        result.rstrip + if @style == :compressed
+        result.rstrip + if style == :compressed
                           "}"
                         else
-                          (@style == :expanded ? "\n" : " ") + "}\n"
+                          (style == :expanded ? "\n" : " ") + "}\n"
                         end
       end
     end

data/lib/sass/tree/file_node.rb

@@ -1,10 +1,9 @@
 module Sass
   module Tree
     class FileNode < Node
-      def initialize(filename, children, options)
+      def initialize(filename)
         @filename = filename
-        super(options)
-        self.children = children
+        super()
       end
 
       def to_s(*args)
@@ -17,6 +16,7 @@ module Sass
       protected
 
       def perform!(environment)
+        self.children = Sass::Files.tree_for(filename, @options).children
         self.children = perform_children(environment)
       rescue Sass::SyntaxError => e
         e.add_backtrace_entry(@filename)

data/lib/sass/tree/for_node.rb

@@ -2,12 +2,12 @@ require 'sass/tree/node'
 
 module Sass::Tree
   class ForNode < Node
-    def initialize(var, from, to, exclusive, options)
+    def initialize(var, from, to, exclusive)
       @var = var
       @from = from
       @to = to
       @exclusive = exclusive
-      super(options)
+      super()
     end
 
     protected

data/lib/sass/tree/if_node.rb

@@ -4,10 +4,10 @@ module Sass::Tree
   class IfNode < Node
     attr_accessor :else
 
-    def initialize(expr, options)
+    def initialize(expr)
       @expr = expr
       @last_else = self
-      super(options)
+      super()
     end
 
     def add_else(node)
@@ -15,6 +15,11 @@ module Sass::Tree
       @last_else = node
     end
 
+    def options=(options)
+      super
+      self.else.options = options if self.else
+    end
+
     protected
 
     def _perform(environment)

data/lib/sass/tree/mixin_def_node.rb

@@ -1,10 +1,10 @@
 module Sass
   module Tree
     class MixinDefNode < Node
-      def initialize(name, args, options)
+      def initialize(name, args)
         @name = name
         @args = args
-        super(options)
+        super()
       end
 
       private

data/lib/sass/tree/mixin_node.rb

@@ -2,10 +2,10 @@ require 'sass/tree/node'
 
 module Sass::Tree
   class MixinNode < Node
-    def initialize(name, args, options)
+    def initialize(name, args)
       @name = name
       @args = args
-      super(options)
+      super()
     end
 
     protected

data/lib/sass/tree/node.rb

@@ -3,14 +3,22 @@ module Sass
     class Node
       attr_accessor :children
       attr_accessor :line
-      attr_accessor :filename
+      attr_writer :filename
+      attr_reader :options
 
-      def initialize(options)
-        @options = options
-        @style = options[:style]
+      def initialize
         @children = []
       end
 
+      def options=(options)
+        children.each {|c| c.options = options}
+        @options = options
+      end
+
+      def filename
+        @filename || @options[:filename]
+      end
+
       def <<(child)
         if msg = invalid_child?(child)
           raise Sass::SyntaxError.new(msg, child.line)
@@ -27,6 +35,10 @@ module Sass
         self.class == other.class && other.children == children
       end
 
+      def render
+        perform(Environment.new).to_s
+      end
+
       def invisible?; false; end
 
       def to_s
@@ -37,17 +49,21 @@ module Sass
           else
             next if child.invisible?
             child_str = child.to_s(1)
-            result << child_str + (@style == :compressed ? '' : "\n")
+            result << child_str + (style == :compressed ? '' : "\n")
           end
         end
-        @style == :compressed ? result+"\n" : result[0...-1]
+        style == :compressed ? result+"\n" : result[0...-1]
+      rescue Sass::SyntaxError => e; e.add_metadata(filename, line)
       end
 
       def perform(environment)
+        environment.options = @options if self.class == Tree::Node
         _perform(environment)
-      rescue Sass::SyntaxError => e
-        e.sass_line ||= line
-        raise e
+      rescue Sass::SyntaxError => e; e.add_metadata(filename, line)
+      end
+
+      def style
+        @options[:style]
       end
 
       protected

data/lib/sass/tree/rule_node.rb

@@ -7,9 +7,9 @@ module Sass::Tree
 
     attr_accessor :rules, :parsed_rules
 
-    def initialize(rule, options)
+    def initialize(rule)
       @rules = [rule]
-      super(options)
+      super()
     end
 
     def ==(other)
@@ -30,10 +30,10 @@ module Sass::Tree
       attributes = []
       sub_rules = []
 
-      rule_separator = @style == :compressed ? ',' : ', '
-      line_separator = [:nested, :expanded].include?(@style) ? ",\n" : rule_separator
+      rule_separator = style == :compressed ? ',' : ', '
+      line_separator = [:nested, :expanded].include?(style) ? ",\n" : rule_separator
       rule_indent = '  ' * (tabs - 1)
-      per_rule_indent, total_indent = [:nested, :expanded].include?(@style) ? [rule_indent, ''] : ['', rule_indent]
+      per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
 
       total_rule = total_indent + resolved_rules.map do |line|
         per_rule_indent + line.join(rule_separator)
@@ -52,7 +52,7 @@ module Sass::Tree
       if !attributes.empty?
         old_spaces = '  ' * (tabs - 1)
         spaces = '  ' * tabs
-        if @options[:line_comments] && @style != :compressed
+        if @options[:line_comments] && style != :compressed
           to_return << "#{old_spaces}/* line #{line}"
 
           if filename
@@ -71,20 +71,20 @@ module Sass::Tree
           to_return << " */\n"
         end
 
-        if @style == :compact
+        if style == :compact
           attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(' ')
           to_return << "#{total_rule} { #{attributes} }\n"
-        elsif @style == :compressed
+        elsif style == :compressed
           attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(';')
           to_return << "#{total_rule}{#{attributes}}"
         else
           attributes = attributes.map { |a| a.to_s(tabs + 1) }.select{|a| a && a.length > 0}.join("\n")
-          end_attrs = (@style == :expanded ? "\n" + old_spaces : ' ')
+          end_attrs = (style == :expanded ? "\n" + old_spaces : ' ')
           to_return << "#{total_rule} {\n#{attributes}#{end_attrs}}\n"
         end
       end
 
-      tabs += 1 unless attributes.empty? || @style != :nested
+      tabs += 1 unless attributes.empty? || style != :nested
       sub_rules.each do |sub|
         to_return << sub.to_s(tabs, resolved_rules)
       end

data/lib/sass/tree/variable_node.rb

@@ -1,11 +1,11 @@
 module Sass
   module Tree
     class VariableNode < Node
-      def initialize(name, expr, guarded, options)
+      def initialize(name, expr, guarded)
         @name = name
         @expr = expr
         @guarded = guarded
-        super(options)
+        super()
       end
 
       protected

data/lib/sass/tree/while_node.rb

@@ -2,9 +2,9 @@ require 'sass/tree/node'
 
 module Sass::Tree
   class WhileNode < Node
-    def initialize(expr, options)
+    def initialize(expr)
       @expr = expr
-      super(options)
+      super()
     end
 
     private

data/test/sass/engine_test.rb

@@ -85,7 +85,11 @@ class SassEngineTest < Test::Unit::TestCase
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
   }
-  
+
+  def teardown
+    clean_up_sassc
+  end
+
   def test_basic_render
     renders_correctly "basic", { :style => :compact }
   end
@@ -185,7 +189,18 @@ SASS
   end
 
   def test_sass_import
+    assert !File.exists?(sassc_path("importee"))
     renders_correctly "import", { :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"] }
+    assert File.exists?(sassc_path("importee"))
+  end
+
+  def test_no_cache
+    assert !File.exists?(sassc_path("importee"))
+    renders_correctly("import", {
+        :style => :compact, :cache => false,
+        :load_paths => [File.dirname(__FILE__) + "/templates"],
+      })
+    assert !File.exists?(sassc_path("importee"))
   end
 
   def test_units
@@ -750,4 +765,9 @@ SOURCE
   def filename(name, type)
     File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
   end
+
+  def sassc_path(template)
+    sassc_path = File.join(File.dirname(__FILE__) + "/templates/#{template}.sass")
+    Sass::Files.send(:sassc_filename, sassc_path, Sass::Engine::DEFAULT_OPTIONS)
+  end
 end

data/test/sass/plugin_test.rb

@@ -17,6 +17,7 @@ class SassPluginTest < Test::Unit::TestCase
   end
 
   def teardown
+    clean_up_sassc
     FileUtils.rm_r tempfile_loc
     FileUtils.rm_r tempfile_loc(nil,"more_")
   end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ lib_dir = File.dirname(__FILE__) + '/../lib'
 require File.dirname(__FILE__) + '/linked_rails'
 
 require 'test/unit'
+require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
@@ -18,4 +19,9 @@ class Test::Unit::TestCase
     test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1')
     opts[:filename] = "#{test_name}_inline.sass"
   end
+
+  def clean_up_sassc
+    path = File.dirname(__FILE__) + "/../.sass-cache"
+    FileUtils.rm_r(path) if File.exist?(path)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 -04:00
+date: 2009-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -91,6 +91,7 @@ files:
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/files.rb
 - bin/css2sass
 - bin/haml
 - bin/html2haml