Fix cache_buster ordering bug. Closes #319

features/builder.feature

@@ -4,7 +4,7 @@ Feature: Builder
   Scenario: Checking built folder for content
     Given a built app at "test-app"
     Then "index.html" should exist at "test-app" and include "Comment in layout"
-    Then "javascripts/coffee_test.js" should exist at "test-app" and include "Array.prototype.slice"
+    Then "javascripts/coffee_test.js" should exist at "test-app" and include ".slice"
     Then "index.html" should exist at "test-app" and include "<h1>Welcome</h1>"
     Then "static.html" should exist at "test-app" and include "Static, no code!"
     Then "services/index.html" should exist at "test-app" and include "Services"

features/coffee-script.feature

@@ -4,12 +4,12 @@ Feature: Support coffee-script
   Scenario: Rendering coffee script
     Given the Server is running at "test-app"
     When I go to "/javascripts/coffee_test.js"
-    Then I should see "Array.prototype.slice"
+    Then I should see ".slice"
 
   Scenario: Rendering coffee-script with :coffeescript haml-filter
     Given the Server is running at "test-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "Array.prototype.slice"
+    Then I should see ".slice"
   
   Scenario: Rendering broken coffee
     Given the Server is running at "test-app"

lib/middleman/features/relative_assets.rb

@@ -16,7 +16,8 @@ module Middleman::Features::RelativeAssets
         elsif path[0,1] == "/"
           path
         else
-          path = File.join(prefix, path) if prefix.length > 0
+          path = app.before_asset_handler(:relative_assets, path, prefix, request).sub(%r{^/}, '')
+          # path = File.join(prefix, path) if prefix.length > 0
           request_path = request.path_info.dup
           request_path << app.index_file if path.match(%r{/$})
           request_path.gsub!(%r{^/}, '')

lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.15.2"
+  VERSION = "2.0.15.3"
 end