middleman 0.9.20 → 0.9.21

data/VERSION

@@ -1 +1 @@
-0.9.20
+0.9.21

data/lib/middleman/base.rb

@@ -33,6 +33,11 @@ module Middleman
       super
     end
     
+    @@afters = []
+    def self.after(&block)
+      @@afters << block
+    end
+    
     # Rack helper for adding mime-types during local preview
     def self.mime(ext, type)
       ext = ".#{ext}" unless ext.to_s[0] == ?.
@@ -80,10 +85,10 @@ end
 # Haml is required & includes helpers
 require "middleman/haml"
 require "middleman/sass"
-require 'sinatra/content_for'
-require 'middleman/helpers'
-require 'middleman/rack/static'
-require 'middleman/rack/sprockets'
+require "sinatra/content_for"
+require "middleman/helpers"
+require "middleman/rack/static"
+require "middleman/rack/sprockets"
 
 class Middleman::Base
   helpers Sinatra::ContentFor
@@ -92,10 +97,6 @@ class Middleman::Base
   use Middleman::Rack::Static
   use Middleman::Rack::Sprockets
   
-  enable :compass
-  require "middleman/features/compass"
-  @@features -= [:compass]
-  
   # Features disabled by default
   disable :slickmap
   disable :cache_buster
@@ -104,6 +105,7 @@ class Middleman::Base
   disable :relative_assets
   disable :maruku
   disable :smush_pngs
+  disable :automatic_image_sizes
   
   # Default build features
   configure :build do
@@ -118,19 +120,21 @@ class Middleman::Base
     if File.exists? local_config
       puts "== Reading:  Local config" if logging?
       class_eval File.read(local_config)
+      set :app_file, File.expand_path(local_config)
     end
     
     # loop over enabled feature
     @@features.flatten.each do |feature_name|
       next unless send(:"#{feature_name}?")
-      puts "== Enabling: #{feature_name.capitalize}" if logging?
-      require "middleman/features/#{feature_name}"
+      
+      feature_path = "features/#{feature_name}"
+      if File.exists? File.join(File.dirname(__FILE__), "#{feature_path}.rb")
+        puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
+        require "middleman/#{feature_path}"
+      end
     end
     
-    ::Compass.configuration do |config|
-      config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix, self.images_dir)
-      config.http_stylesheets_path = self.http_css_path rescue File.join(self.http_prefix, self.css_dir)
-    end
+    @@afters.each { |block| class_eval(&block) }
     
     super
   end

data/lib/middleman/fastimage.rb

@@ -0,0 +1,282 @@
+# FastImage finds the size or type of an image given its uri.
+# It is careful to only fetch and parse as much of the image as is needed to determine the result.
+# It does this by using a feature of Net::HTTP that yields strings from the resource being fetched
+# as soon as the packets arrive.
+#
+# No external libraries such as ImageMagick are used here, this is a very lightweight solution to 
+# finding image information.
+#
+# FastImage knows about GIF, JPEG, BMP and PNG files.
+#
+# FastImage can also read files from the local filesystem by supplying the path instead of a uri.
+# In this case FastImage uses the open-uri library to read the file in chunks of 256 bytes until
+# it has enough. This is possibly a useful bandwidth-saving feature if the file is on a network
+# attached disk rather than truly local.
+#
+# === Examples
+#   require 'fastimage'
+#
+#   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
+#   => [266, 56]
+#   FastImage.type("http://stephensykes.com/images/pngimage")
+#   => :png
+#   FastImage.type("/some/local/file.gif")
+#   => :gif
+#
+# === References
+# * http://snippets.dzone.com/posts/show/805
+# * http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
+# * http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/
+# * http://imagesize.rubyforge.org/
+#
+require 'net/https'
+require 'open-uri'
+
+module Middleman
+  class FastImage
+    attr_reader :size, :type
+
+    class FastImageException < StandardError # :nodoc:
+    end
+    class MoreCharsNeeded < FastImageException # :nodoc:
+    end
+    class UnknownImageType < FastImageException # :nodoc:
+    end
+    class ImageFetchFailure < FastImageException # :nodoc:
+    end
+    class SizeNotFound < FastImageException # :nodoc:
+    end
+
+    DefaultTimeout = 2
+  
+    LocalFileChunkSize = 256
+
+    # Returns an array containing the width and height of the image.
+    # It will return nil if the image could not be fetched, or if the image type was not recognised.
+    #
+    # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+    # This can be changed by passing a :timeout => number_of_seconds in the options.
+    #
+    # If you wish FastImage to raise if it cannot size the image for any reason, then pass
+    # :raise_on_failure => true in the options.
+    #
+    # FastImage knows about GIF, JPEG, BMP and PNG files.
+    #
+    # === Example
+    #
+    #   require 'fastimage'
+    #
+    #   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
+    #   => [266, 56]
+    #   FastImage.size("http://stephensykes.com/images/pngimage")
+    #   => [16, 16]
+    #   FastImage.size("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+    #   => [500, 375]
+    #   FastImage.size("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+    #   => [512, 512]
+    #   FastImage.size("test/fixtures/test.jpg")
+    #   => [882, 470]
+    #   FastImage.size("http://pennysmalls.com/does_not_exist")
+    #   => nil
+    #   FastImage.size("http://pennysmalls.com/does_not_exist", :raise_on_failure=>true)
+    #   => raises FastImage::ImageFetchFailure
+    #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true)
+    #   => raises FastImage::UnknownImageType
+    #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
+    #   => raises FastImage::ImageFetchFailure
+    #   FastImage.size("http://stephensykes.com/images/faulty.jpg", :raise_on_failure=>true)
+    #   => raises FastImage::SizeNotFound
+    #
+    # === Supported options
+    # [:timeout]
+    #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+    # [:raise_on_failure]
+    #   If set to true causes an exception to be raised if the image size cannot be found for any reason.
+    #
+    def self.size(uri, options={})
+      new(uri, options).size
+    end
+
+    # Returns an symbol indicating the image type fetched from a uri.
+    # It will return nil if the image could not be fetched, or if the image type was not recognised.
+    #
+    # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+    # This can be changed by passing a :timeout => number_of_seconds in the options.
+    #
+    # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
+    # :raise_on_failure => true in the options.
+    #
+    # === Example
+    #
+    #   require 'fastimage'
+    #
+    #   FastImage.type("http://stephensykes.com/images/ss.com_x.gif")
+    #   => :gif
+    #   FastImage.type("http://stephensykes.com/images/pngimage")
+    #   => :png
+    #   FastImage.type("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+    #   => :jpeg
+    #   FastImage.type("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+    #   => :bmp
+    #   FastImage.type("test/fixtures/test.jpg")
+    #   => :jpeg
+    #   FastImage.type("http://pennysmalls.com/does_not_exist")
+    #   => nil
+    #
+    # === Supported options
+    # [:timeout]
+    #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+    # [:raise_on_failure]
+    #   If set to true causes an exception to be raised if the image type cannot be found for any reason.
+    #
+    def self.type(uri, options={})
+      new(uri, options.merge(:type_only=>true)).type
+    end
+
+    def initialize(uri, options={})
+      @property = options[:type_only] ? :type : :size
+      @timeout = options[:timeout] || DefaultTimeout
+      @uri = uri
+      @parsed_uri = URI.parse(uri.gsub(/\s/, "%20"))
+      if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
+        fetch_using_http
+      else
+        fetch_using_open_uri
+      end
+      raise SizeNotFound if options[:raise_on_failure] && @property == :size && !@size
+    rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, ImageFetchFailure
+      raise ImageFetchFailure if options[:raise_on_failure]
+    rescue Errno::ENOENT
+      raise ImageFetchFailure if options[:raise_on_failure]    
+    rescue UnknownImageType
+      raise UnknownImageType if options[:raise_on_failure]
+    end
+
+    private
+
+    def fetch_using_http
+      setup_http
+      @http.request_get(@parsed_uri.request_uri) do |res|
+        raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
+        res.read_body do |str|
+          break if parse_packet(str)
+        end
+      end
+    end
+
+    def setup_http
+      @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+      @http.use_ssl = (@parsed_uri.scheme == "https")
+      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @http.open_timeout = @timeout
+      @http.read_timeout = @timeout
+    end
+
+    def fetch_using_open_uri
+      open(@uri) do |s|
+        while str = s.read(LocalFileChunkSize)
+          break if parse_packet(str)
+        end
+      end
+    end
+
+    # returns true once result is achieved
+    #
+    def parse_packet(str)
+      @str = (@unused_str || "") + str
+      @strpos = 0
+      begin
+        result = send("parse_#{@property}")
+        if result 
+          instance_variable_set("@#{@property}", result)
+          true
+        end
+      rescue MoreCharsNeeded
+        false
+      end
+    end
+
+    def parse_size
+      @type = parse_type unless @type
+      send("parse_size_for_#{@type}")
+    end
+
+    def get_chars(n)
+      if @strpos + n - 1 >= @str.size
+        @unused_str = @str[@strpos..-1]
+        raise MoreCharsNeeded
+      else
+        result = @str[@strpos..(@strpos + n - 1)]
+        @strpos += n
+        result
+      end
+    end
+
+    def get_byte
+      get_chars(1).unpack("C")[0]
+    end
+
+    def read_int(str)
+      size_bytes = str.unpack("CC")
+      (size_bytes[0] << 8) + size_bytes[1]
+    end
+
+    def parse_type
+      case get_chars(2)
+      when "BM"
+        :bmp
+      when "GI"
+        :gif
+      when 0xff.chr + 0xd8.chr
+        :jpeg
+      when 0x89.chr + "P"
+        :png
+      else
+        raise UnknownImageType
+      end
+    end
+
+    def parse_size_for_gif
+      get_chars(9)[4..8].unpack('SS')
+    end
+
+    def parse_size_for_png
+      get_chars(23)[14..22].unpack('NN')
+    end
+
+    def parse_size_for_jpeg
+      loop do
+        @state = case @state
+        when nil
+          get_chars(2)
+          :started
+        when :started
+          get_byte == 0xFF ? :sof : :started          
+        when :sof
+          c = get_byte
+          if (0xe0..0xef).include?(c)
+            :skipframe
+          elsif [0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF].detect {|r| r.include? c}
+            :readsize
+          else
+            :skipframe
+          end
+        when :skipframe
+          @skip_chars = read_int(get_chars(2)) - 2
+          :do_skip
+        when :do_skip
+          get_chars(@skip_chars)
+          :started
+        when :readsize
+          s = get_chars(7)
+          return [read_int(s[5..6]), read_int(s[3..4])]
+        end
+      end
+    end
+
+    def parse_size_for_bmp
+      d = get_chars(27)[12..26]
+      d[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
+    end
+  end
+end

data/lib/middleman/features/automatic_image_sizes.rb

@@ -0,0 +1,29 @@
+require "middleman/fastimage"
+
+class Middleman::Base
+  alias_method :pre_automatic_image_tag, :image_tag
+  helpers do
+    def image_tag(path, params={})      
+      if (!params[:width] || !params[:height]) && !path.include?("://")
+        params[:alt] ||= ""
+        prefix = options.http_images_path rescue options.images_dir
+        
+        begin
+          real_path = File.join(options.public, asset_url(path, prefix))
+          if File.exists? real_path
+            dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
+            params[:width]  ||= dimensions[0]
+            params[:height] ||= dimensions[1]
+          end
+        rescue
+        end
+
+        params = params.merge(:src => asset_url(path, prefix))
+        params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
+        "<img #{params} />"
+      else
+        pre_automatic_image_tag(path, params)
+      end
+    end
+  end
+end

data/lib/middleman/features/cache_buster.rb

@@ -1,7 +1,8 @@
-class << Middleman::Base
+class << Middleman::Base    
   alias_method :pre_cache_buster_asset_url, :asset_url
   def asset_url(path, prefix="", request=nil)
     http_path = pre_cache_buster_asset_url(path, prefix, request)
+    
     if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
       http_path
     else

data/lib/middleman/features/minify_css.rb

@@ -1,9 +1,5 @@
 # Otherwise use YUI
 # Fine a way to minify inline/css
-class Middleman::Base
-  configure do
-    ::Compass.configuration do |config|
-      config.output_style = :compressed
-    end
-  end
+::Compass.configuration do |config|
+  config.output_style = :compressed
 end

data/lib/middleman/features/minify_javascript.rb

@@ -1,4 +1,5 @@
 require "yui/compressor"
+require "middleman/builder"
 
 module Middleman
   module Minified
@@ -29,7 +30,7 @@ END
         end
       end
     end
-  end if Middleman::Base.environment == "build"
+  end
 end
 
 Middleman::Base.supported_formats << "js"

data/lib/middleman/features/sprockets.rb

@@ -0,0 +1,5 @@
+require "middleman/rack/sprockets"
+
+class Middleman::Base
+  use Middleman::Rack::Sprockets
+end

data/lib/middleman/sass.rb

@@ -1,5 +1,5 @@
 require "sass"
-require 'compass'
+require "compass"
 
 module Middleman
   module Sass  
@@ -13,7 +13,7 @@ module Middleman
           static_version = options.public + request.path_info
           send_file(static_version) if File.exists? static_version
 
-          location_of_sass_file = options.environment == "build" ? File.join(options.build_dir, options.css_dir) : "public"
+          location_of_sass_file = options.environment == "build" ? options.build_dir : options.public
           css_filename = File.join(Dir.pwd, location_of_sass_file) + request.path_info
           sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename }))
         rescue Exception => e
@@ -67,4 +67,42 @@ end
 
 class Middleman::Base
   include Middleman::Sass
+  
+  after do 
+    ::Compass.configuration do |config|
+      config.project_path     = self.root
+      config.sass_dir         = File.join(File.basename(self.views), self.css_dir)
+      config.output_style     = :nested
+      config.css_dir          = File.join(File.basename(self.public), self.css_dir)
+      config.images_dir       = File.join(File.basename(self.public), self.images_dir)
+
+      config.add_import_path(config.sass_dir)
+      
+      config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix, self.images_dir)
+      config.http_stylesheets_path = self.http_css_path rescue File.join(self.http_prefix, self.css_dir)
+    
+      if self.cache_buster?
+        config.asset_cache_buster do |path, real_path|
+          if File.readable?(real_path)
+            File.mtime(real_path).strftime("%s") 
+          else
+            $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+          end
+        end
+      else
+        config.asset_cache_buster do
+          false
+        end
+      end
+    end
+
+    configure :build do
+      ::Compass.configuration do |config|
+        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
+    end
+    
+    ::Compass.configure_sass_plugin!
+  end
 end

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.9.20"
+  s.version = "0.9.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-28}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
      "lib/middleman/base.rb",
      "lib/middleman/builder.rb",
      "lib/middleman/config.ru",
+     "lib/middleman/fastimage.rb",
+     "lib/middleman/features/automatic_image_sizes.rb",
      "lib/middleman/features/cache_buster.rb",
-     "lib/middleman/features/compass.rb",
      "lib/middleman/features/growl.rb",
      "lib/middleman/features/maruku.rb",
      "lib/middleman/features/minify_css.rb",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/middleman/features/relative_assets.rb",
      "lib/middleman/features/slickmap.rb",
      "lib/middleman/features/smush_pngs.rb",
+     "lib/middleman/features/sprockets.rb",
      "lib/middleman/haml.rb",
      "lib/middleman/helpers.rb",
      "lib/middleman/rack/sprockets+ruby19.rb",
@@ -52,19 +54,23 @@ Gem::Specification.new do |s|
      "lib/middleman/template/views/stylesheets/site.css.sass",
      "lib/middleman/templater+dynamic_renderer.rb",
      "middleman.gemspec",
+     "spec/auto_image_sizes.rb",
      "spec/builder_spec.rb",
      "spec/cache_buster_spec.rb",
      "spec/fixtures/sample/init.rb",
+     "spec/fixtures/sample/public/images/blank.gif",
      "spec/fixtures/sample/public/javascripts/to-be-included.js",
      "spec/fixtures/sample/public/static.html",
      "spec/fixtures/sample/public/stylesheets/static.css",
      "spec/fixtures/sample/views/_partial.haml",
+     "spec/fixtures/sample/views/auto-image-sizes.html.haml",
      "spec/fixtures/sample/views/index.html.haml",
      "spec/fixtures/sample/views/inline-js.html.haml",
      "spec/fixtures/sample/views/javascripts/empty-with-include.js",
      "spec/fixtures/sample/views/layout.haml",
      "spec/fixtures/sample/views/maruku.html.maruku",
      "spec/fixtures/sample/views/services/index.html.haml",
+     "spec/fixtures/sample/views/stylesheets/relative_assets.css.sass",
      "spec/fixtures/sample/views/stylesheets/site.css.sass",
      "spec/generator_spec.rb",
      "spec/relative_assets_spec.rb",
@@ -77,7 +83,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
   s.test_files = [
-    "spec/builder_spec.rb",
+    "spec/auto_image_sizes.rb",
+     "spec/builder_spec.rb",
      "spec/cache_buster_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/generator_spec.rb",

data/spec/auto_image_sizes.rb

@@ -0,0 +1,23 @@
+require 'rack/test'
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+base = ::Middleman::Base
+base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+
+describe "Auto Image sizes Feature" do
+  it "should not append width and height if off" do
+    base.disable :automatic_image_sizes
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/auto-image-sizes.html")
+    browser.last_response.body.should_not include("width=")
+    browser.last_response.body.should_not include("height=")
+  end
+  
+  it "should append width and height if off" do
+    base.enable :automatic_image_sizes
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/auto-image-sizes.html")
+    browser.last_response.body.should include("width=")
+    browser.last_response.body.should include("height=")
+  end
+end

data/spec/builder_spec.rb

@@ -39,7 +39,7 @@ describe "Builder" do
 
   it "should build sass files" do
     File.exists?("#{@root_dir}/build/stylesheets/site.css").should be_true
-    File.read("#{@root_dir}/build/stylesheets/site.css").should include("html,body,div,span,applet,object,iframe")
+    File.read("#{@root_dir}/build/stylesheets/site.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
   end
 
   it "should build static css files" do

data/spec/cache_buster_spec.rb

@@ -1,3 +1,4 @@
+require 'rack/test'
 require File.join(File.dirname(__FILE__), "spec_helper")
 
 base = ::Middleman::Base
@@ -6,13 +7,15 @@ base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
 describe "Cache Buster Feature" do
   it "should not append query string if off" do
     base.disable :cache_buster
-    base.new
-    base.asset_url("stylesheets/static.css").should_not include("?")
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should_not include("?")
   end
   
   it "should append query string if on" do
     base.enable :cache_buster
-    base.new
-    base.asset_url("stylesheets/static.css").should include("?")
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should include("?")
   end
 end

data/spec/fixtures/sample/init.rb

@@ -1 +1 @@
-enable :maruku
+# enable :maruku

data/spec/fixtures/sample/views/auto-image-sizes.html.haml

@@ -0,0 +1 @@
+= image_tag "blank.gif"

data/spec/fixtures/sample/views/stylesheets/relative_assets.css.sass

@@ -0,0 +1,3 @@
+@import compass.sass
+h1
+  background= image_url("blank.gif")

data/spec/relative_assets_spec.rb

@@ -1,28 +1,23 @@
-# require File.join(File.dirname(__FILE__), "spec_helper")
-# 
-# base = ::Middleman::Base
-# base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
-# 
-# describe "Relative Assets Feature" do
-#   before do
-#     base.disable :relative_assets
-#     base.init!
-#     @app = base.new
-#   end
-#   
-#   it "should not contain ../ if off" do
-#     @app.asset_url("stylesheets/static.css").should_not include("?")
-#   end
-# end
-# 
-# describe "Relative Assets Feature" do
-#   before do
-#     base.enable :relative_assets
-#     base.init!
-#     @app = base.new
-#   end
-#   
-#   it "should contain ../ if on" do
-#     @app.asset_url("stylesheets/static.css").should include("?")
-#   end
-# end
+require 'rack/test'
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+base = ::Middleman::Base
+base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+
+describe "Relative Assets Feature" do
+  it "should not contain ../ if off" do
+    base.disable :relative_assets
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should_not include("../")
+  end
+end
+
+describe "Relative Assets Feature" do
+  it "should contain ../ if on" do
+    base.enable :relative_assets
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should include("../")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,8 +158,9 @@ files:
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
+- lib/middleman/fastimage.rb
+- lib/middleman/features/automatic_image_sizes.rb
 - lib/middleman/features/cache_buster.rb
-- lib/middleman/features/compass.rb
 - lib/middleman/features/growl.rb
 - lib/middleman/features/maruku.rb
 - lib/middleman/features/minify_css.rb
@@ -167,6 +168,7 @@ files:
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
 - lib/middleman/features/smush_pngs.rb
+- lib/middleman/features/sprockets.rb
 - lib/middleman/haml.rb
 - lib/middleman/helpers.rb
 - lib/middleman/rack/sprockets+ruby19.rb
@@ -179,19 +181,23 @@ files:
 - lib/middleman/template/views/stylesheets/site.css.sass
 - lib/middleman/templater+dynamic_renderer.rb
 - middleman.gemspec
+- spec/auto_image_sizes.rb
 - spec/builder_spec.rb
 - spec/cache_buster_spec.rb
 - spec/fixtures/sample/init.rb
+- spec/fixtures/sample/public/images/blank.gif
 - spec/fixtures/sample/public/javascripts/to-be-included.js
 - spec/fixtures/sample/public/static.html
 - spec/fixtures/sample/public/stylesheets/static.css
 - spec/fixtures/sample/views/_partial.haml
+- spec/fixtures/sample/views/auto-image-sizes.html.haml
 - spec/fixtures/sample/views/index.html.haml
 - spec/fixtures/sample/views/inline-js.html.haml
 - spec/fixtures/sample/views/javascripts/empty-with-include.js
 - spec/fixtures/sample/views/layout.haml
 - spec/fixtures/sample/views/maruku.html.maruku
 - spec/fixtures/sample/views/services/index.html.haml
+- spec/fixtures/sample/views/stylesheets/relative_assets.css.sass
 - spec/fixtures/sample/views/stylesheets/site.css.sass
 - spec/generator_spec.rb
 - spec/relative_assets_spec.rb
@@ -225,6 +231,7 @@ signing_key:
 specification_version: 3
 summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
 test_files: 
+- spec/auto_image_sizes.rb
 - spec/builder_spec.rb
 - spec/cache_buster_spec.rb
 - spec/fixtures/sample/init.rb

data/lib/middleman/features/compass.rb

@@ -1,18 +0,0 @@
-class Middleman::Base
-  configure do
-    ::Compass.configuration do |config|
-      images_location = (self.environment == "build") ? self.build_dir : self.public
-      
-      config.project_path     = Dir.pwd
-      config.sass_dir         = File.join(File.basename(self.views), self.css_dir)
-      config.output_style     = :nested
-      config.css_dir          = File.join(File.basename(images_location), self.css_dir)
-      config.images_dir       = File.join(File.basename(images_location), self.images_dir)
-      # File.expand_path(self.images_dir, self.public)
-
-      config.add_import_path(config.sass_dir)
-    end
-    
-    ::Compass.configure_sass_plugin!
-  end
-end