From 20bb8c0d28acaf5a5caf79e1819655e2154fb613 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Wed, 1 Dec 2010 01:33:53 -0800
Subject: [PATCH] Update gemfiles to depend on sass3.1

---
 Gemfile                                        |  2 +-
 doc-src/Gemfile                                |  3 ++-
 doc-src/Gemfile.lock                           | 18 +++++++++++++-----
 .../monkey_patches/traversal.rb                |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index d39357af..22fb51e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "3.0.0"
 gem "css_parser", "~> 1.0.1"
-gem "sass", "~> 3.1"
+gem "sass", "~> 3.1", :path => "../sass"
 gem "rcov"
 gem "rubyzip"
 gem "livereload"
diff --git a/doc-src/Gemfile b/doc-src/Gemfile
index ceacf6ac..bca77656 100644
--- a/doc-src/Gemfile
+++ b/doc-src/Gemfile
@@ -9,7 +9,8 @@ gem 'fssm'
 gem 'serve', "1.0.0"
 gem 'nokogiri'
 gem 'coderay'
-gem 'haml', ">=3.0.23", :require => 'sass'
+gem 'sass', :path => "../../sass"
+gem 'haml', ">= 3.1.0.alpha.36"
 gem 'rake'
 gem 'compass', :path => ".."
 gem 'compass-susy-plugin', ">=0.7.0.pre8"
diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock
index 5da91847..02baf6ba 100644
--- a/doc-src/Gemfile.lock
+++ b/doc-src/Gemfile.lock
@@ -1,20 +1,27 @@
 GIT
   remote: git://github.com/chriseppstein/nanoc.git
-  revision: 4ecb400489c83fd2068659de0c651733b8dad28f
+  revision: 4eee0e60c5121b90498caa88605d416521553378
   specs:
     nanoc3 (3.2.0a3)
       cri (>= 1.0.0)
 
 PATH
-  remote: /Users/bmathis/Documents/Workspace/compass-projects/compass
+  remote: ..
   specs:
-    compass (0.11.alpha.1.488fddf)
+    compass (0.11.alpha.1.1d9e2cb)
+      chunky_png (~> 0.10.3)
       sass (~> 3.1)
 
+PATH
+  remote: ../../sass
+  specs:
+    sass (3.1.0.alpha.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.1)
+    chunky_png (0.10.5)
     coderay (0.9.5)
     compass-susy-plugin (0.8.1)
       compass (>= 0.10.0)
@@ -22,7 +29,7 @@ GEM
     css-slideshow (0.2.0)
       compass (>= 0.10.0.rc3)
     fssm (0.2.0)
-    haml (3.0.23)
+    haml (3.1.0.alpha.36)
     i18n (0.4.2)
     json (1.4.6)
     mime-types (1.16)
@@ -48,7 +55,7 @@ DEPENDENCIES
   compass-susy-plugin (>= 0.7.0.pre8)
   css-slideshow (= 0.2.0)
   fssm
-  haml (>= 3.0.23)
+  haml (>= 3.1.0.alpha.36)
   json
   mime-types
   nanoc3!
@@ -56,5 +63,6 @@ DEPENDENCIES
   rack
   rake
   rdiscount
+  sass!
   serve (= 1.0.0)
   thor
diff --git a/lib/compass/sass_extensions/monkey_patches/traversal.rb b/lib/compass/sass_extensions/monkey_patches/traversal.rb
index 4b40e2ec..24a2f31e 100644
--- a/lib/compass/sass_extensions/monkey_patches/traversal.rb
+++ b/lib/compass/sass_extensions/monkey_patches/traversal.rb
@@ -6,7 +6,7 @@ module Sass
           visitor.visit(self)
           visitor.down(self) if children.any? and visitor.respond_to?(:down)
           if is_a?(ImportNode) && visitor.import?(self)
-            root = Sass::Files.tree_for(import, @options)
+            root = Sass::Engine.for_file(import, @options).to_tree
             imported_children = root.children
           end