middleman 0.9.18 → 0.9.20

data/VERSION

@@ -1 +1 @@
-0.9.18
+0.9.20

data/lib/middleman/base.rb

@@ -93,6 +93,8 @@ class Middleman::Base
   use Middleman::Rack::Sprockets
   
   enable :compass
+  require "middleman/features/compass"
+  @@features -= [:compass]
   
   # Features disabled by default
   disable :slickmap
@@ -125,6 +127,11 @@ class Middleman::Base
       require "middleman/features/#{feature_name}"
     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
+    
     super
   end
 end

data/lib/middleman/features/cache_buster.rb

@@ -5,8 +5,13 @@ class << Middleman::Base
     if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
       http_path
     else
-      real_path = File.join(self.public, prefix, path)
-      http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)        
+      begin
+        prefix = self.images_dir if prefix == self.http_images_path
+      rescue
+      end
+      
+      real_path = File.join(self.environment == "build" ? self.build_dir : self.public, prefix, path)
+      http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)
       http_path
     end
   end

data/lib/middleman/features/compass.rb

@@ -5,19 +5,11 @@ class Middleman::Base
       
       config.project_path     = Dir.pwd
       config.sass_dir         = File.join(File.basename(self.views), self.css_dir)
-      config.output_style     = self.minify_css? ? :compressed : :nested
+      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)
 
-      if !cache_buster?
-        config.asset_cache_buster do
-          false
-        end
-      end
-        
-      config.http_images_path = File.join(self.http_prefix, self.images_dir)
-      config.http_stylesheets_path = File.join(self.http_prefix, self.css_dir)
       config.add_import_path(config.sass_dir)
     end
     

data/lib/middleman/features/minify_css.rb

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

data/lib/middleman/features/relative_assets.rb

@@ -5,6 +5,11 @@ end
 class << Middleman::Base
   alias_method :pre_relative_asset_url, :asset_url
   def asset_url(path, prefix="", request=nil)
+    begin
+      prefix = self.images_dir if prefix == self.http_images_path
+    rescue
+    end
+    
     path = pre_relative_asset_url(path, prefix, request)
     if path.include?("://")
       path

data/lib/middleman/helpers.rb

@@ -33,7 +33,8 @@ module Middleman
 
     def image_tag(path, params={})
       params[:alt] ||= ""
-      params = params.merge(:src => asset_url(path, options.images_dir))
+      prefix = options.http_images_path rescue options.images_dir
+      params = params.merge(:src => asset_url(path, prefix))
       params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
       "<img #{params} />"
     end

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.9.18"
+  s.version = "0.9.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]

data/spec/builder_spec.rb

@@ -23,7 +23,7 @@ describe "Builder" do
     File.read("#{@root_dir}/build/index.html").should include("<h1>Welcome</h1>")
   end
   
-  it "should build maruku files" do
+  xit "should build maruku files" do
     File.exists?("#{@root_dir}/build/maruku.html").should be_true
     File.read("#{@root_dir}/build/maruku.html").should include("<h1 class='header' id='hello_maruku'>Hello Maruku</h1>")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.9.18
+  version: 0.9.20
 platform: ruby
 authors: 
 - Thomas Reynolds