sass 3.1.0.alpha.29 → 3.1.0.alpha.30

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.29
+3.1.0.alpha.30

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.29
+3.1.0.alpha.30

data/lib/sass/importers/rails.rb

@@ -0,0 +1,72 @@
+module Sass
+  module Importers
+    # An importer that wraps the Rails 3.1 view infrastructure.
+    # Loads Sass files as though they were views in Rails.
+    # Currently doesn't support caching.
+    #
+    # This is different from standard Rails rendering
+    # in that Sass doesn't have a concept of importing partials
+    # as a distinct action from importing other Sass files.
+    # Imports within Rails behave more like Sass imports:
+    # they will first attempt to find a non-partial file,
+    # and failing that will fall back on a partial.
+    #
+    # Each importer instance is local to a single request for a single view.
+    # It contains the ActionView::LookupContext for that request,
+    # as well as the controller prefix for the view being generated.
+    class Rails < Base
+      # Creates a new Rails importer that imports files as Rails views.
+      #
+      # @param lookup_context [ActionView::LookupContext] The Rails view finder.
+      def initialize(lookup_context)
+        @lookup_context = lookup_context
+      end
+
+      # @see Base#find_relative
+      def find_relative(uri, base, options)
+        find_(uri, base.split('/')[0...-1].join('/'), options)
+      end
+
+      # @see Base#find
+      def find(uri, options)
+        find_(uri, nil, options)
+      end
+
+      # @see Base#mtime
+      def mtime(uri, options)
+        return unless template =
+          find_template(uri, nil, !:partial) ||
+          find_template(uri, nil, :partial)
+        File.mtime(template.identifier).to_i
+      end
+
+      # @see Base#to_s
+      def to_s
+        "(Rails importer)"
+      end
+
+      private
+
+      def find_(uri, prefix, options)
+        prepare_template(
+          find_template(uri, prefix, !:partial) ||
+            find_template(uri, prefix, :partial),
+          options)
+      end
+
+      def find_template(uri, prefix, partial)
+        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[:importer] = self
+        Sass::Engine.new(template.source, options)
+      end
+    end
+  end
+end

data/lib/sass/plugin/rails.rb

@@ -18,7 +18,47 @@ unless defined?(Sass::RAILS_LOADED)
 
   Sass::Plugin.options.reverse_merge!(Sass::Plugin.default_options)
 
-  if defined?(ActionController::Metal)
+  if Sass::Util.ap_geq?('3.1.0.beta')
+    require 'sass/importers/rails'
+    class Sass::Plugin::TemplateHandler
+      attr_reader :syntax
+
+      def initialize(syntax)
+        @syntax = syntax
+      end
+
+      def handles_encoding?; true; end
+
+      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
+
+        <<RUBY
+importer = Sass::Importers::Rails.new(lookup_context)
+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.expire!
+  @_template.rerender(self)
+else
+  #{tree.render.inspect}
+end
+RUBY
+      end
+    end
+
+    ActionView::Template.register_template_handler(:sass, Sass::Plugin::TemplateHandler.new(:sass))
+    ActionView::Template.register_template_handler(:scss, Sass::Plugin::TemplateHandler.new(:scss))
+  elsif defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
     Rails.configuration.middleware.use(Sass::Plugin::Rack)

data/lib/sass/plugin/staleness_checker.rb

@@ -53,6 +53,7 @@ module Sass
       # @param css_file [String] The location of the CSS file to check.
       # @param template_file [String] The location of the Sass or SCSS template
       #   that is compiled to `css_file`.
+      # @return [Boolean] Whether the stylesheet needs to be updated.
       def stylesheet_needs_update?(css_file, template_file)
         template_file = File.expand_path(template_file)
         begin
@@ -61,8 +62,19 @@ module Sass
           return true
         end
 
-        dependency_updated?(css_mtime).call(
-          template_file, @options[:filesystem_importer].new("."))
+        stylesheet_modified_since?(template_file, css_mtime)
+      end
+
+      # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
+      #
+      # @param template_file [String] The location of the Sass or SCSS template.
+      # @param mtime [Fixnum] The modification time to check against.
+      # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
+      #   Defaults to the filesystem importer.
+      # @return [Boolean] Whether the stylesheet has been modified.
+      def stylesheet_modified_since?(template_file, mtime, importer = nil)
+        importer ||= @options[:filesystem_importer].new(".")
+        dependency_updated?(mtime).call(template_file, importer)
       end
 
       # Returns whether or not a given CSS file is out of date
@@ -75,10 +87,26 @@ module Sass
       # @param css_file [String] The location of the CSS file to check.
       # @param template_file [String] The location of the Sass or SCSS template
       #   that is compiled to `css_file`.
+      # @return [Boolean] Whether the stylesheet needs to be updated.
       def self.stylesheet_needs_update?(css_file, template_file)
         new(Plugin.engine_options).stylesheet_needs_update?(css_file, template_file)
       end
 
+      # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
+      #
+      # The distinction between this method and the instance-level \{#stylesheet\_modified\_since?}
+      # is that the instance method preserves mtime and stale-dependency caches,
+      # so it's better to use when checking multiple stylesheets at once.
+      #
+      # @param template_file [String] The location of the Sass or SCSS template.
+      # @param mtime [Fixnum] The modification time to check against.
+      # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
+      #   Defaults to the filesystem importer.
+      # @return [Boolean] Whether the stylesheet has been modified.
+      def self.stylesheet_modified_since?(template_file, mtime, importer = nil)
+        new(Plugin.engine_options).stylesheet_modified_since?(template_file, mtime, importer)
+      end
+
       private
 
       def dependencies_stale?(uri, importer, css_mtime)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.29
+  version: 3.1.0.alpha.30
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/sass/repl.rb
 - lib/sass/importers/base.rb
 - lib/sass/importers/filesystem.rb
+- lib/sass/importers/rails.rb
 - lib/sass/root.rb
 - lib/sass/script/bool.rb
 - lib/sass/script/color.rb