From e16cf25be560a58b381b235bae776bec02e2bee4 Mon Sep 17 00:00:00 2001
From: tdreyno <tdreyno@gmail.com>
Date: Sun, 18 Apr 2010 12:08:08 -0700
Subject: [PATCH] mild fixes

---
 .gitignore                       | 3 ++-
 Rakefile                         | 5 ++---
 VERSION                          | 2 +-
 features/minify_css.feature      | 4 ++--
 features/relative_assets.feature | 4 ++--
 lib/middleman/base.rb            | 4 +++-
 lib/middleman/sass.rb            | 1 -
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index d794939c..382bb496 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ coverage
 rdoc
 pkg
 .sass-cache
-.sassc
\ No newline at end of file
+.sassc
+.tmp
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 1f7d4302..e867f846 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,9 +23,8 @@ begin
     gem.add_dependency("sinatra-content-for")
     gem.add_dependency("rack-test")
     gem.add_dependency("yui-compressor")
-    gem.add_dependency("haml")
-    gem.add_dependency("compass", "0.10.0.pre5")
-    gem.add_dependency("compass-colors")
+    gem.add_dependency("haml", ">=3.0.0.beta.3")
+    gem.add_dependency("compass", ">=0.10.0.rc3")
     gem.add_dependency("fancy-buttons")
     gem.add_dependency("json_pure")
     gem.add_dependency("smusher")
diff --git a/VERSION b/VERSION
index 3f8dcd03..09fbf2a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.13.2
\ No newline at end of file
+0.13.2.pre
\ No newline at end of file
diff --git a/features/minify_css.feature b/features/minify_css.feature
index 682d289e..ee43217e 100644
--- a/features/minify_css.feature
+++ b/features/minify_css.feature
@@ -9,7 +9,7 @@ Feature: Minify CSS
   Scenario: Rendering inline css with the feature disabled
     Given "minify_css" feature is "disabled"
     When I go to "/inline-css.html"
-    Then I should see "3" lines
+    Then I should see "4" lines
     
   Scenario: Rendering external css with the feature enabled
     Given "minify_css" feature is "enabled"
@@ -19,4 +19,4 @@ Feature: Minify CSS
   Scenario: Rendering external css with the feature disabled
     Given "minify_css" feature is "disabled"
     When I go to "/stylesheets/site.css"
-    Then I should see "47" lines
\ No newline at end of file
+    Then I should see "56" lines
\ No newline at end of file
diff --git a/features/relative_assets.feature b/features/relative_assets.feature
index 761c56b3..bfca1c8a 100644
--- a/features/relative_assets.feature
+++ b/features/relative_assets.feature
@@ -4,9 +4,9 @@ Feature: Relative Assets
   Scenario: Rendering css with the feature disabled
     Given "relative_assets" feature is "disabled"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should not see "../"
+    Then I should not see "url('../"
 
   Scenario: Rendering css with the feature enabled
     Given "relative_assets" feature is "enabled"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "../"
\ No newline at end of file
+    Then I should see "url('../"
\ No newline at end of file
diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb
index cc162845..280b1a6a 100644
--- a/lib/middleman/base.rb
+++ b/lib/middleman/base.rb
@@ -42,8 +42,10 @@ module Middleman
     def self.set(option, value=self, &block)
       if block_given?
         value = Proc.new { block }
+        super(option, value, &nil)
+      else
+        super
       end
-      super(option, value)
     end
     
     @@afters = []
diff --git a/lib/middleman/sass.rb b/lib/middleman/sass.rb
index d1f06bad..5115b4ea 100644
--- a/lib/middleman/sass.rb
+++ b/lib/middleman/sass.rb
@@ -104,7 +104,6 @@ class Middleman::Base
     
     configure :build do
       ::Compass.configuration do |config|
-        config.line_comments = false
         config.css_dir       = File.join(File.basename(self.build_dir), self.css_dir)
         config.images_dir    = File.join(File.basename(self.build_dir), self.images_dir)
       end