middleman 0.10.7 → 0.10.8

data/VERSION

@@ -1 +1 @@
-0.10.7
+0.10.8

data/lib/middleman/base.rb

@@ -17,7 +17,7 @@ module Middleman
     set :css_dir, "stylesheets"
     set :images_dir, "images"
     set :build_dir, "build"
-    set :http_prefix, "/"
+    set :http_prefix, nil
     
     use Rack::ConditionalGet if environment == :development
     

data/lib/middleman/features/relative_assets.rb

@@ -10,18 +10,23 @@ class << Middleman::Base
     rescue
     end
     
-    path = pre_relative_asset_url(path, prefix, request)
     if path.include?("://")
+      pre_relative_asset_url(path, prefix, request)
+    elsif path[0,1] == "/"
       path
     else
-      path = path[1,path.length-1] if path[0,1] == '/'
+      path = File.join(prefix, path) if prefix.length > 0
       request_path = request.path_info.dup
-      request_path << self.class.index_file if path.match(%r{/$})
+      request_path << self.index_file if path.match(%r{/$})
       request_path.gsub!(%r{^/}, '')
       parts = request_path.split('/')
-    
+
       if parts.length > 1
-        "../" * (parts.length - 1) + path
+        arry = []
+        (parts.length - 1).times { arry << ".." }
+        arry << path
+        File.join(*arry)
+        #"../" * (parts.length - 1) + path
       else
         path
       end

data/lib/middleman/helpers.rb

@@ -1,8 +1,7 @@
 module Middleman
   class Base
     def self.asset_url(path, prefix="", request=nil)
-      base_url = File.join(self.http_prefix, prefix)
-      path.include?("://") ? path : File.join(base_url, path)
+      path.include?("://") ? path : File.join(self.http_prefix || "/", prefix, path)
     end
   end
   

data/lib/middleman/sass.rb

@@ -1,4 +1,5 @@
 require "sass"
+#gem "compass-edge"
 require "compass"
 
 module Middleman
@@ -75,8 +76,8 @@ class Middleman::Base
       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.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)
+      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)
       config.asset_cache_buster { false }
       
       config.add_import_path(config.sass_dir)

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.10.7"
+  s.version = "0.10.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-06}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -61,18 +61,24 @@ Gem::Specification.new do |s|
      "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/auto-css.css",
      "spec/fixtures/sample/public/stylesheets/static.css",
+     "spec/fixtures/sample/public/stylesheets/sub1/auto-css.css",
+     "spec/fixtures/sample/public/stylesheets/sub1/sub2/auto-css.css",
      "spec/fixtures/sample/views/_partial.haml",
+     "spec/fixtures/sample/views/auto-css.html.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/page-classes.html.haml",
      "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/helpers_spec.rb",
      "spec/minify_javascript_spec.rb",
      "spec/relative_assets_spec.rb",
      "spec/spec_helper.rb"

data/spec/fixtures/sample/views/auto-css.html.haml

@@ -0,0 +1 @@
+= auto_stylesheet_link_tag

data/spec/fixtures/sample/views/page-classes.html.haml

@@ -0,0 +1 @@
+= page_classes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -188,18 +188,24 @@ files:
 - 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/auto-css.css
 - spec/fixtures/sample/public/stylesheets/static.css
+- spec/fixtures/sample/public/stylesheets/sub1/auto-css.css
+- spec/fixtures/sample/public/stylesheets/sub1/sub2/auto-css.css
 - spec/fixtures/sample/views/_partial.haml
+- spec/fixtures/sample/views/auto-css.html.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/page-classes.html.haml
 - 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/helpers_spec.rb
 - spec/minify_javascript_spec.rb
 - spec/relative_assets_spec.rb
 - spec/spec_helper.rb