middleman 2.0.0.rc91 → 2.0.0.rc92

data/lib/middleman/core_extensions/compass.rb

@@ -38,16 +38,28 @@ module Middleman::CoreExtensions::Compass
           config.fonts_dir             = File.join(views_root, app.fonts_dir)
           config.images_dir            = File.join(views_root, app.images_dir)
           
-          if app.respond_to? :http_images_path
-            config.http_images_path = app.http_images_path
+          config.http_images_path = if app.respond_to? :http_images_path
+            app.http_images_path
+          else
+            File.join(app.http_prefix || "/", app.images_dir)
           end
           
-          if app.respond_to? :http_css_path
-            config.http_stylesheets_path = app.http_css_path
+          config.http_stylesheets_path = if app.respond_to? :http_css_path
+            app.http_css_path
+          else
+            File.join(app.http_prefix || "/", app.css_dir)
           end
           
-          if app.respond_to? :http_js_path
-            config.http_javascripts_path = app.http_js_path
+          config.http_javascripts_path = if app.respond_to? :http_js_path
+            app.http_js_path
+          else
+            File.join(app.http_prefix || "/", app.js_dir)
+          end
+
+          config.http_javascripts_path = if app.respond_to? :http_fonts_path
+            app.http_js_path
+          else
+            File.join(app.http_prefix || "/", app.fonts_dir)
           end
           
           config.asset_cache_buster :none

data/lib/middleman/features/relative_assets.rb

@@ -1,7 +1,9 @@
 module Middleman::Features::RelativeAssets
   class << self
     def registered(app)
-      ::Compass.configuration.relative_assets = true
+      app.compass_config do |config|
+        config.relative_assets = true
+      end
 
       app.register_asset_handler :relative_assets do |path, prefix, request|
         begin

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc91"
+  VERSION = "2.0.0.rc92"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424227
+  hash: 15424237
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 91
-  version: 2.0.0.rc91
+  - 92
+  version: 2.0.0.rc92
 platform: ruby
 authors: 
 - Thomas Reynolds