sass 3.1.0.alpha.32 → 3.1.0.alpha.33

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.32
+3.1.0.alpha.33

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.32
+3.1.0.alpha.33

data/lib/sass/engine.rb

@@ -1,4 +1,5 @@
 require 'strscan'
+require 'set'
 require 'digest/sha1'
 require 'sass/cache_store'
 require 'sass/tree/node'
@@ -241,13 +242,14 @@ module Sass
     end
     alias_method :to_css, :render
 
-    # Parses the document into its parse tree.
+    # Parses the document into its parse tree. Memoized.
     #
     # @return [Sass::Tree::Node] The root of the parse tree.
     # @raise [Sass::SyntaxError] if there's an error in the document
     def to_tree
-      return _to_tree unless @options[:quiet]
-      Sass::Util.silence_sass_warnings {_to_tree}
+      @tree ||= @options[:quiet] ?
+        Sass::Util.silence_sass_warnings {_to_tree} :
+        _to_tree
     end
 
     # Returns the original encoding of the document,
@@ -262,6 +264,29 @@ module Sass
       @original_encoding
     end
 
+    # Gets a set of all the documents
+    # that are (transitive) dependencies of this document,
+    # not including the document itself.
+    #
+    # @return [[Sass::Engine]] The dependency documents.
+    def dependencies
+      _dependencies(Set.new, engines = Set.new)
+      engines - [self]
+    end
+
+    # Helper for \{#dependencies}.
+    #
+    # @private
+    def _dependencies(seen, engines)
+      return if seen.include?(key = [@options[:filename], @options[:importer]])
+      seen << key
+      engines << self
+      to_tree.grep(Tree::ImportNode) do |n|
+        next if n.css_import?
+        n.imported_file._dependencies(seen, engines)
+      end
+    end
+
     private
 
     def _render
@@ -325,7 +350,7 @@ module Sass
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
+      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?

data/lib/sass/importers/rails.rb

@@ -55,15 +55,16 @@ module Sass
       end
 
       def find_template(uri, prefix, partial)
-        return @lookup_context
-          .find_all(uri, prefix, partial)
-          .find {|t| t.handler.is_a?(Sass::Plugin::TemplateHandler)}
+        return @lookup_context.
+          find_all(uri, prefix, partial).
+          find {|t| t.handler.is_a?(Sass::Plugin::TemplateHandler)}
       end
 
       def prepare_template(template, options)
         return unless template
         options[:syntax] = template.handler.syntax
         options[:filename] = template.virtual_path
+        options[:_rails_filename] = template.identifier
         options[:importer] = self
         Sass::Engine.new(template.source, options)
       end

data/lib/sass/plugin/rails.rb

@@ -4,15 +4,23 @@ unless defined?(Sass::RAILS_LOADED)
   module Sass::Plugin::Configuration
     # Different default options in a rails envirionment.
     def default_options
-      @default_options ||= {
-        :always_update      => false,
-        :template_location => Sass::Util.rails_root + '/public/stylesheets/sass',
-        :css_location      => Sass::Util.rails_root + '/public/stylesheets',
-        :cache_location    => Sass::Util.rails_root + '/tmp/sass-cache',
-        :always_check      => Sass::Util.rails_env == "development",
+      opts = {
         :quiet             => Sass::Util.rails_env != "production",
         :full_exception    => Sass::Util.rails_env != "production"
-      }.freeze
+      }
+
+      if Sass::Util.ap_geq?('3.1.0.beta')
+        opts.merge!(:cache => false, :load_paths => [])
+      else
+        opts.merge!(
+          :always_update      => false,
+          :template_location => Sass::Util.rails_root + '/public/stylesheets/sass',
+          :css_location      => Sass::Util.rails_root + '/public/stylesheets',
+          :cache_location    => Sass::Util.rails_root + '/tmp/sass-cache',
+          :always_check      => Sass::Util.rails_env == "development")
+      end
+
+      @default_options ||= opts.freeze
     end
   end
 
@@ -20,7 +28,7 @@ unless defined?(Sass::RAILS_LOADED)
 
   # Disable this for now, until we figure out how to get Rails
   # to pass in the view.
-  if false #Sass::Util.ap_geq?('3.1.0.beta')
+  if Sass::Util.ap_geq?('3.1.0.beta')
     require 'sass/importers/rails'
     class Sass::Plugin::TemplateHandler
       attr_reader :syntax
@@ -33,32 +41,65 @@ unless defined?(Sass::RAILS_LOADED)
 
       def call(template, view)
         rails_importer = Sass::Importers::Rails.new(view.lookup_context)
-        tree = Sass::Engine.new(template.source,
-          :syntax => @syntax,
-          :cache => false,
-          :filename => template.virtual_path,
-          :importer => rails_importer,
-          :load_paths => [rails_importer],
-          ).to_tree
+        engine = Sass::Engine.new(template.source,
+          Sass::Plugin.options.merge(
+            :syntax => @syntax,
+            :filename => template.virtual_path,
+            :importer => rails_importer,
+            :load_paths => [rails_importer] + Sass::Plugin.options[:load_paths]))
+
+        # We need to serialize/deserialize the importers to make sure
+        # that each dependency is matched up to its proper importer
+        # for when importer#mtime is called.
+        dependencies = engine.dependencies
+        importers = Sass::Util.to_hash(
+          Sass::Util.enum_with_index(dependencies).map do |e, i|
+            importer = e.options[:importer]
+            [importer, {
+                :variable => "importer_#{i}",
+                :expression => (importer == rails_importer ?
+                  "Sass::Importers::Rails.new(lookup_context)" :
+                  "Sass::Util.load(#{Sass::Util.dump(importer)})")
+              }]
+          end)
+
+        stylesheet =
+          begin
+            engine.render
+          rescue Sass::SyntaxError => e
+            Sass::Plugin::TemplateHandler.munge_exception e, view.lookup_context
+            Sass::SyntaxError.exception_to_css(e, Sass::Plugin.options)
+          end
 
         <<RUBY
-importer = Sass::Importers::Rails.new(lookup_context)
-# Since we need to re-parse the template, force Rails to re-load the source.
-# Once we pre-compute the dependencies, we can avoid doing this
-# until we know we need to update the method.
-@_template.expire!
-staleness_checker = Sass::Plugin::StalenessChecker.new(
-  Sass::Plugin.engine_options.merge(:load_paths => [importer], :cache => false))
-if staleness_checker.stylesheet_modified_since?(
-    #{template.virtual_path.inspect},
-    #{Time.now.to_i},
-    importer)
-  @_template.rerender(self)
-else
-  #{tree.render.inspect}
+begin
+  #{importers.map {|_, val| "#{val[:variable]} = #{val[:expression]}"}.join("\n")}
+  if Sass::Plugin::TemplateHandler.dependencies_changed?(
+      [#{dependencies.map {|e| "[#{e.options[:filename].inspect}, #{importers[e.options[:importer]][:variable]}]"}.join(',')}],
+      #{Time.now.to_i})
+    @_template.expire!
+    @_template.rerender(self)
+  else
+    #{stylesheet.inspect}
+  end
+rescue Sass::SyntaxError => e
+  Sass::Plugin::TemplateHandler.munge_exception e, lookup_context
+  Sass::SyntaxError.exception_to_css(e, Sass::Plugin.options)
 end
 RUBY
       end
+
+      def self.dependencies_changed?(deps, since)
+        deps.any? {|d, i| i.mtime(d, Sass::Plugin.options) > since}
+      end
+
+      def self.munge_exception(e, lookup_context)
+        importer = Sass::Importers::Rails.new(lookup_context)
+        e.sass_backtrace.each do |bt|
+          next unless engine = importer.find(bt[:filename], Sass::Plugin.options)
+          bt[:filename] = engine.options[:_rails_filename]
+        end
+      end
     end
 
     ActionView::Template.register_template_handler(:sass, Sass::Plugin::TemplateHandler.new(:sass))

data/lib/sass/tree/root_node.rb

@@ -17,7 +17,7 @@ module Sass
       def to_s(*args)
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -36,7 +36,7 @@ module Sass
         environment.options = @options if environment.options.nil? || environment.options.empty?
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -49,7 +49,7 @@ module Sass
       def cssize(extends = Sass::Util::SubsetMap.new, parent = nil)
         return super(extends, parent), extends
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.32
+  version: 3.1.0.alpha.33
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency