Fix some bugs introduced when the Sass monkey patch was removed.

caged · May 15, 2010 · 942ea5f · 942ea5f
1 parent 6bd7f7c
commit 942ea5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/compass/compiler.rb b/lib/compass/compiler.rb
@@ -42,7 +42,7 @@ def target_directories
     def out_of_date?
       Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        return sass_filename if Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
+        return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
       end
       false
     end
@@ -106,7 +106,7 @@ def compile(sass_filename, css_filename)
     end
 
     def should_compile?(sass_filename, css_filename)
-      options[:force] || Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
+      options[:force] || Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
     end
 
     # A sass engine for compiling a single file.

diff --git a/lib/compass/configuration/helpers.rb b/lib/compass/configuration/helpers.rb
@@ -54,6 +54,8 @@ def sass_plugin_configuration
       end
 
       def configure_sass_plugin!
+        return if sass_plugin_configured?
+        require 'sass/plugin'
         @sass_plugin_configured = true
         config = sass_plugin_configuration
         locations = config.delete(:template_location)