mild fixes

.gitignore

@@ -4,3 +4,4 @@ rdoc
 pkg
 .sass-cache
 .sassc
+.tmp

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")

VERSION

@@ -1 +1 @@
-0.13.2
+0.13.2.pre

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
+    Then I should see "56" lines

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 "../"
+    Then I should see "url('../"

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 = []

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