diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8ee1f6d..ce23a969 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
3.0.pre
====
+* Split into 3 gems (middleman-core, middleman-more and middleman which simply includes both)
* Rewritten to work directly with Rack (Sinatra apps can still be mounted)
* Sitemap maintains own state
* New Extension Registration API
diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature
index e3615d01..00e52b59 100644
--- a/middleman-core/features/asset_host.feature
+++ b/middleman-core/features/asset_host.feature
@@ -1,10 +1,5 @@
Feature: Alternate between multiple asset hosts
In order to speed up page loading
-
- # Scenario: Rendering css with the feature enabled
- # Given the Server is running at "asset-host-app"
- # When I go to "/stylesheets/asset_host.css"
- # Then I should see "http://assets"
Scenario: Rendering html with the feature enabled
Given the Server is running at "asset-host-app"
diff --git a/middleman-core/features/data.feature b/middleman-core/features/data.feature
index 1d086216..6d5b06c1 100644
--- a/middleman-core/features/data.feature
+++ b/middleman-core/features/data.feature
@@ -10,11 +10,6 @@ Feature: Local Data API
Given the Server is running at "basic-data-app"
When I go to "/data3.html"
Then I should see "One:Two"
-
- # Scenario: Rendering liquid
- # Given the Server is running at "basic-data-app"
- # When I go to "/data2.html"
- # Then I should see "OneTwo"
Scenario: Using data in config.rb
Given the Server is running at "data-app"
diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb
index 02a685ab..2b856967 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_host.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb
@@ -4,12 +4,6 @@ module Middleman::Extensions
def registered(app)
app.set :asset_host, false
- # app.compass_config do |config|
- # if asset_host.is_a?(Proc)
- # config.asset_host(&asset_host)
- # end
- # end
-
app.send :include, InstanceMethods
end
alias :included :registered
diff --git a/middleman-more/features/liquid.feature b/middleman-more/features/liquid.feature
index 4db4a03e..1fbf345c 100644
--- a/middleman-more/features/liquid.feature
+++ b/middleman-more/features/liquid.feature
@@ -1,6 +1,11 @@
Feature: Support liquid partials
Scenario: Rendering liquid
- Given the Server is running at "test-app"
+ Given the Server is running at "liquid-app"
When I go to "/liquid_master.html"
- Then I should see "Greetings"
\ No newline at end of file
+ Then I should see "Greetings"
+
+ Scenario: Rendering liquid
+ Given the Server is running at "liquid-app"
+ When I go to "/data2.html"
+ Then I should see "OneTwo"
\ No newline at end of file
diff --git a/middleman-more/features/minify_css.feature b/middleman-more/features/minify_css.feature
index ff1e5889..3695ad87 100644
--- a/middleman-more/features/minify_css.feature
+++ b/middleman-more/features/minify_css.feature
@@ -1,25 +1,15 @@
Feature: Minify CSS
In order reduce bytes sent to client and appease YSlow
- # Scenario: Rendering inline css with the feature disabled
- # Given "minify_css" feature is "disabled"
- # When I go to "/inline-css.html"
- # Then I should see "4" lines
-
Scenario: Rendering external css with the feature disabled
Given "minify_css" feature is "disabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-css-app"
When I go to "/stylesheets/site.css"
Then I should see "55" lines
-
- # Scenario: Rendering inline css with the feature enabled
- # Given "minify_css" feature is "enabled"
- # When I go to "/inline-css.html"
- # Then I should see "1" lines
Scenario: Rendering external css with the feature enabled
Given "minify_css" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-css-app"
When I go to "/stylesheets/site.css"
Then I should see "1" lines
diff --git a/middleman-more/features/minify_javascript.feature b/middleman-more/features/minify_javascript.feature
index 6b0e2595..bcf9cd3a 100644
--- a/middleman-more/features/minify_javascript.feature
+++ b/middleman-more/features/minify_javascript.feature
@@ -6,7 +6,7 @@ Feature: Minify Javascript
Scenario: Rendering inline js with the feature disabled
Given "minify_javascript" feature is "disabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-js-app"
When I go to "/inline-js.html"
Then I should see "10" lines
@@ -17,13 +17,13 @@ Feature: Minify Javascript
Scenario: Rendering inline js with the feature enabled
Given "minify_javascript" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-js-app"
When I go to "/inline-js.html"
Then I should see "5" lines
Scenario: Rendering external js with the feature enabled
Given "minify_javascript" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-js-app"
When I go to "/javascripts/js_test.js"
Then I should see "1" lines
@@ -34,13 +34,13 @@ Feature: Minify Javascript
Scenario: Rendering inline js (coffeescript) with the feature enabled
Given "minify_javascript" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-js-app"
When I go to "/inline-coffeescript.html"
Then I should see "5" lines
Scenario: Rendering external js (coffeescript) with the feature enabled
Given "minify_javascript" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "minify-js-app"
When I go to "/javascripts/coffee_test.js"
Then I should see "1" lines
diff --git a/middleman-more/features/relative_assets.feature b/middleman-more/features/relative_assets.feature
index 92348b71..cbf19ef6 100644
--- a/middleman-more/features/relative_assets.feature
+++ b/middleman-more/features/relative_assets.feature
@@ -3,26 +3,26 @@ Feature: Relative Assets
Scenario: Rendering css with the feature disabled
Given "relative_assets" feature is "disabled"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/stylesheets/relative_assets.css"
Then I should not see "url('../"
And I should see "/images/blank.gif"
Scenario: Rendering html with the feature disabled
Given "relative_assets" feature is "disabled"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/relative_image.html"
Then I should see "/images/blank.gif"
Scenario: Rendering css with the feature enabled
Given "relative_assets" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/stylesheets/relative_assets.css"
Then I should see "url('../images/blank.gif"
Scenario: Rendering html with the feature enabled
Given "relative_assets" feature is "enabled"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/relative_image.html"
Then I should not see "/images/blank.gif"
And I should see "images/blank.gif"
@@ -30,14 +30,14 @@ Feature: Relative Assets
Scenario: Rendering html with a custom images_dir
Given "relative_assets" feature is "enabled"
And "images_dir" is set to "img"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/stylesheets/relative_assets.css"
Then I should see "url('../img/blank.gif"
Scenario: Rendering css with a custom images_dir
Given "relative_assets" feature is "enabled"
And "images_dir" is set to "img"
- And the Server is running at "test-app"
+ And the Server is running at "relative-assets-app"
When I go to "/relative_image.html"
Then I should not see "/images/blank.gif"
Then I should not see "/img/blank.gif"
diff --git a/middleman-more/fixtures-old/test-app/config.rb b/middleman-more/fixtures-old/test-app/config.rb
deleted file mode 100644
index 2e360eb3..00000000
--- a/middleman-more/fixtures-old/test-app/config.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require "slim"
-require "liquid"
-require "coffee-filter"
-
-page "/fake.html", :proxy => "/real.html", :layout => false
-page "fake2.html", :proxy => "/real.html", :layout => false
-page "fake3.html", :proxy => "real.html", :layout => false
-page "/fake4.html", :proxy => "real.html", :layout => false
-
-ignore "/should_be_ignored.html"
-page "/should_be_ignored2.html", :ignore => true
-page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
-
-
-ignore "should_be_ignored4.html"
-page "should_be_ignored5.html", :ignore => true
-page "target_ignore2.html", :proxy => "/should_be_ignored6.html", :ignore => true
-page "target_ignore3.html", :proxy => "should_be_ignored7.html", :ignore => true
-page "/target_ignore4.html", :proxy => "should_be_ignored8.html", :ignore => true
-
-%w(one two).each do |num|
- page "/fake/#{num}.html", :proxy => "/real/index.html" do
- @num = num
- end
- page "fake2/#{num}.html", :proxy => "/real/index.html" do
- @num = num
- end
- page "fake3/#{num}.html", :proxy => "real/index.html" do
- @num = num
- end
- page "/fake4/#{num}.html", :proxy => "real/index.html" do
- @num = num
- end
-end
-
-with_layout :content_for do
- page "/content_for_erb.html"
- page "/content_for_haml.html"
- page "/content_for_slim.html"
-end
-
-with_layout false do
- page "/request-path.html"
- page "/lorem.html"
- page "/relative_image.html"
- page "/inline-css.html"
- page "/inline-js.html"
- page "/inline-coffeescript.html"
- page "/spaces in file.html"
- page "/slim.html"
- page "/data.html"
- page "/data2.html"
- page "/data3.html"
- page "/liquid_master.html"
- page "/page-classes.html"
- page "/sub1/page-classes.html"
- page "/sub1/sub2/page-classes.html"
-
- %w{
- /auto-css.html
- /auto-css
- /auto-css/
- /auto-css/auto-css.html
- /auto-css/sub/auto-css.html
- }.each do |path|
- page path
- end
-
- %w{
- /auto-js.html
- /auto-js
- /auto-js/
- /auto-js/auto-js.html
- /auto-js/sub/auto-js.html
- }.each do |path|
- page path
- end
-end
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/_partial.haml b/middleman-more/fixtures-old/test-app/source/_partial.haml
deleted file mode 100755
index a46a3dbf..00000000
--- a/middleman-more/fixtures-old/test-app/source/_partial.haml
+++ /dev/null
@@ -1 +0,0 @@
-%p Test
diff --git a/middleman-more/fixtures-old/test-app/source/a_folder/needs_index.html b/middleman-more/fixtures-old/test-app/source/a_folder/needs_index.html
deleted file mode 100644
index 1eeec11b..00000000
--- a/middleman-more/fixtures-old/test-app/source/a_folder/needs_index.html
+++ /dev/null
@@ -1 +0,0 @@
-Indexable
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/asset_host.html.haml b/middleman-more/fixtures-old/test-app/source/asset_host.html.haml
deleted file mode 100755
index 7588118c..00000000
--- a/middleman-more/fixtures-old/test-app/source/asset_host.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= image_tag "blank.gif"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css.html.haml
deleted file mode 100755
index 36324bb3..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-css.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_stylesheet_link_tag
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-css/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/auto-css.html.haml
deleted file mode 100755
index 36324bb3..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-css/auto-css.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_stylesheet_link_tag
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-css/index.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/index.html.haml
deleted file mode 100755
index 36324bb3..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-css/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_stylesheet_link_tag
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-css/sub/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/sub/auto-css.html.haml
deleted file mode 100755
index 36324bb3..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-css/sub/auto-css.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_stylesheet_link_tag
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-image-sizes.html.haml b/middleman-more/fixtures-old/test-app/source/auto-image-sizes.html.haml
deleted file mode 100755
index 7588118c..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-image-sizes.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= image_tag "blank.gif"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js.html.haml
deleted file mode 100755
index 3bf0eb1e..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-js.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_javascript_include_tag
diff --git a/middleman-more/fixtures-old/test-app/source/auto-js/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/auto-js.html.haml
deleted file mode 100755
index 3bf0eb1e..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-js/auto-js.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_javascript_include_tag
diff --git a/middleman-more/fixtures-old/test-app/source/auto-js/index.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/index.html.haml
deleted file mode 100755
index 3bf0eb1e..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-js/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_javascript_include_tag
diff --git a/middleman-more/fixtures-old/test-app/source/auto-js/sub/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/sub/auto-js.html.haml
deleted file mode 100755
index 3bf0eb1e..00000000
--- a/middleman-more/fixtures-old/test-app/source/auto-js/sub/auto-js.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= auto_javascript_include_tag
diff --git a/middleman-more/fixtures-old/test-app/source/cache-buster.html.haml b/middleman-more/fixtures-old/test-app/source/cache-buster.html.haml
deleted file mode 100755
index adb1540e..00000000
--- a/middleman-more/fixtures-old/test-app/source/cache-buster.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= stylesheet_link_tag "site.css"
-= javascript_include_tag "empty-with-include.js"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb b/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb
deleted file mode 100644
index 0af8266a..00000000
--- a/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% content_for :from_template do %>
- I am the yielded content erb
-<% end %>
-
-I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/content_for_haml.html.haml b/middleman-more/fixtures-old/test-app/source/content_for_haml.html.haml
deleted file mode 100644
index e4a7522a..00000000
--- a/middleman-more/fixtures-old/test-app/source/content_for_haml.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- content_for :from_template do
- = "I am the yielded content haml"
-
-%p I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/content_for_slim.html.slim b/middleman-more/fixtures-old/test-app/source/content_for_slim.html.slim
deleted file mode 100644
index 89267513..00000000
--- a/middleman-more/fixtures-old/test-app/source/content_for_slim.html.slim
+++ /dev/null
@@ -1,4 +0,0 @@
-- content_for :from_template do
- | I am the yielded content slim
-
-| I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/custom-layout-dir/index.html.haml b/middleman-more/fixtures-old/test-app/source/custom-layout-dir/index.html.haml
deleted file mode 100755
index 0582dd93..00000000
--- a/middleman-more/fixtures-old/test-app/source/custom-layout-dir/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Welcome
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/custom-layout.html.haml b/middleman-more/fixtures-old/test-app/source/custom-layout.html.haml
deleted file mode 100755
index 0582dd93..00000000
--- a/middleman-more/fixtures-old/test-app/source/custom-layout.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Welcome
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/data.html.erb b/middleman-more/fixtures-old/test-app/source/data.html.erb
deleted file mode 100644
index a18f3afc..00000000
--- a/middleman-more/fixtures-old/test-app/source/data.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= data.test.map { |r| r.title }.join(":") %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/data3.html.erb b/middleman-more/fixtures-old/test-app/source/data3.html.erb
deleted file mode 100644
index d2ac7634..00000000
--- a/middleman-more/fixtures-old/test-app/source/data3.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= data.test2.map { |r| r.title }.join(":") %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/former_padrino_test.html.haml b/middleman-more/fixtures-old/test-app/source/former_padrino_test.html.haml
deleted file mode 100644
index 8a9751fe..00000000
--- a/middleman-more/fixtures-old/test-app/source/former_padrino_test.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= stylesheet_link_tag "test1"
-= javascript_include_tag "test1"
-= image_tag "test2.png", :alt => "alt"
-
-= link_to "Has param", "test2.com", :class => "test"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb b/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb
deleted file mode 100644
index 205a442f..00000000
--- a/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: false
-title: This is the title
----
-
-
<%= data.page.title %>
-
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb b/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb
deleted file mode 100644
index 044e469d..00000000
--- a/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hola Mundo
-layout: false
----
-<%= data.page.title %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter.html.erb b/middleman-more/fixtures-old/test-app/source/front-matter.html.erb
deleted file mode 100644
index 73d30e72..00000000
--- a/middleman-more/fixtures-old/test-app/source/front-matter.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: false
-title: This is the title
----
-
-
<%= data.page.title %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt b/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt
deleted file mode 100644
index ea9503c0..00000000
--- a/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt
+++ /dev/null
@@ -1 +0,0 @@
-Regular
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/images/Chrome_Logo.svg b/middleman-more/fixtures-old/test-app/source/images/Chrome_Logo.svg
deleted file mode 100644
index e44e9428..00000000
--- a/middleman-more/fixtures-old/test-app/source/images/Chrome_Logo.svg
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
diff --git a/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt b/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt
deleted file mode 100644
index 100b9382..00000000
--- a/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt
+++ /dev/null
@@ -1 +0,0 @@
-README
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/images/cfb_tomb-perennial-energy.svgz b/middleman-more/fixtures-old/test-app/source/images/cfb_tomb-perennial-energy.svgz
deleted file mode 100644
index e2eb29ec..00000000
Binary files a/middleman-more/fixtures-old/test-app/source/images/cfb_tomb-perennial-energy.svgz and /dev/null differ
diff --git a/middleman-more/fixtures-old/test-app/source/index.html.slim b/middleman-more/fixtures-old/test-app/source/index.html.slim
deleted file mode 100755
index 35e9d54e..00000000
--- a/middleman-more/fixtures-old/test-app/source/index.html.slim
+++ /dev/null
@@ -1,9 +0,0 @@
-h1 Welcome
-
-== image_tag "Chrome_Logo.svg"
-== image_tag "cfb_tomb-perennial-energy.svgz"
-
-markdown:
- ## H2
-
- Paragraph
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/inline-css.html.haml b/middleman-more/fixtures-old/test-app/source/inline-css.html.haml
deleted file mode 100755
index 36c2c8e4..00000000
--- a/middleman-more/fixtures-old/test-app/source/inline-css.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-:sass
- body
- test: style
- good: deal
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js
deleted file mode 100644
index 8b137891..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js
deleted file mode 100644
index 8b137891..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js
deleted file mode 100644
index 8b137891..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js
deleted file mode 100644
index 8b137891..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/broken-coffee.js.coffee b/middleman-more/fixtures-old/test-app/source/javascripts/broken-coffee.js.coffee
deleted file mode 100644
index 1af7bf2a..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/broken-coffee.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-function test() {
- hello
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/jquery.plugin.with.dots.js b/middleman-more/fixtures-old/test-app/source/javascripts/jquery.plugin.with.dots.js
deleted file mode 100644
index 2717f3bd..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/jquery.plugin.with.dots.js
+++ /dev/null
@@ -1 +0,0 @@
-// Success
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/jquery_base.js b/middleman-more/fixtures-old/test-app/source/javascripts/jquery_base.js
deleted file mode 100644
index 52111548..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/jquery_base.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//= require "jquery-ui"
-
-function then_do_stuff() {
-
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/multiple_engines.js.coffee.erb b/middleman-more/fixtures-old/test-app/source/javascripts/multiple_engines.js.coffee.erb
deleted file mode 100644
index 360022a5..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/multiple_engines.js.coffee.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert "Hello <%= data.test[0].title %>"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_base.js b/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_base.js
deleted file mode 100644
index fc657dc0..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_base.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//= require "sprockets_sub"
-
-function base() {
-
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_sub.js b/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_sub.js
deleted file mode 100644
index 1b27ea83..00000000
--- a/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_sub.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function sprockets_sub_function() {
-
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/layout.haml b/middleman-more/fixtures-old/test-app/source/layout.haml
deleted file mode 100644
index e5a7a094..00000000
--- a/middleman-more/fixtures-old/test-app/source/layout.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%html
- %head
- %title My Sample Site
- / Comment in layout
- %body
- = yield
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb b/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb
deleted file mode 100644
index 30a09340..00000000
--- a/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-In Layout: <%= yield_content(:from_template).chomp.strip %>
-
-In Template:
-<%= yield %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/layouts/custom.haml b/middleman-more/fixtures-old/test-app/source/layouts/custom.haml
deleted file mode 100755
index 87de0ed3..00000000
--- a/middleman-more/fixtures-old/test-app/source/layouts/custom.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%html
- %head
- %title Custom Layout
- %body
- = yield
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/lorem.html.erb b/middleman-more/fixtures-old/test-app/source/lorem.html.erb
deleted file mode 100644
index 924dab7d..00000000
--- a/middleman-more/fixtures-old/test-app/source/lorem.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= lorem.word %>
-<%= lorem.words(5) %>
-<%= lorem.sentence %>
-<%= lorem.sentences(2) %>
-<%= lorem.paragraph %>
-<%= lorem.paragraphs(2) %>
-<%= lorem.date %>
-<%= lorem.name %>
-<%= lorem.first_name %>
-<%= lorem.last_name %>
-<%= lorem.email %>
-<%= image_tag lorem.image(100) %>
-<%= image_tag placekitten(100) %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/needs_index.html b/middleman-more/fixtures-old/test-app/source/needs_index.html
deleted file mode 100644
index 1eeec11b..00000000
--- a/middleman-more/fixtures-old/test-app/source/needs_index.html
+++ /dev/null
@@ -1 +0,0 @@
-Indexable
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/other_layout.erb b/middleman-more/fixtures-old/test-app/source/other_layout.erb
deleted file mode 100644
index e4d2addd..00000000
--- a/middleman-more/fixtures-old/test-app/source/other_layout.erb
+++ /dev/null
@@ -1 +0,0 @@
-This is another layout!
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/page-classes.html.haml
deleted file mode 100755
index 0a933c0a..00000000
--- a/middleman-more/fixtures-old/test-app/source/page-classes.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= page_classes
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/real.html b/middleman-more/fixtures-old/test-app/source/real.html
deleted file mode 100644
index cb312952..00000000
--- a/middleman-more/fixtures-old/test-app/source/real.html
+++ /dev/null
@@ -1 +0,0 @@
-I am real
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/real/index.html.erb b/middleman-more/fixtures-old/test-app/source/real/index.html.erb
deleted file mode 100644
index 190d84ec..00000000
--- a/middleman-more/fixtures-old/test-app/source/real/index.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
----
-layout: false
----
-
-I am real: <%= @num %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/request-path.html.erb b/middleman-more/fixtures-old/test-app/source/request-path.html.erb
deleted file mode 100644
index cb134235..00000000
--- a/middleman-more/fixtures-old/test-app/source/request-path.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= current_path == request.path %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/services/index.html.haml b/middleman-more/fixtures-old/test-app/source/services/index.html.haml
deleted file mode 100755
index bb6a9fca..00000000
--- a/middleman-more/fixtures-old/test-app/source/services/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h2 Services
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored.html
deleted file mode 100644
index fb81d5c0..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me!
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html
deleted file mode 100644
index 0940fd7c..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 2
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html
deleted file mode 100644
index 98007c81..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 3
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html
deleted file mode 100644
index b11a0596..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 4
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html
deleted file mode 100644
index f348b0ad..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 5
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html
deleted file mode 100644
index 234e60b7..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 6
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html
deleted file mode 100644
index 4179fb19..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 7
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html
deleted file mode 100644
index 2c2c24ab..00000000
--- a/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html
+++ /dev/null
@@ -1 +0,0 @@
-
Ignore me! 8
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/slim.html.slim b/middleman-more/fixtures-old/test-app/source/slim.html.slim
deleted file mode 100644
index e13e5b60..00000000
--- a/middleman-more/fixtures-old/test-app/source/slim.html.slim
+++ /dev/null
@@ -1,7 +0,0 @@
-doctype 5
-html lang='en'
- head
- meta charset="utf-8"
-
- body
- h1 Welcome to Slim
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb b/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb
deleted file mode 100644
index c67dbe85..00000000
--- a/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= "spaces" %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/static.html b/middleman-more/fixtures-old/test-app/source/static.html
deleted file mode 100755
index 7e50df4e..00000000
--- a/middleman-more/fixtures-old/test-app/source/static.html
+++ /dev/null
@@ -1 +0,0 @@
-Static, no code!
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css
deleted file mode 100755
index 8a4ef0de..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css
+++ /dev/null
@@ -1,3 +0,0 @@
-auto {
- css: 1;
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css
deleted file mode 100755
index 76ded88e..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css
+++ /dev/null
@@ -1,3 +0,0 @@
-auto {
- css: 2;
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css
deleted file mode 100755
index f68dee75..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css
+++ /dev/null
@@ -1,3 +0,0 @@
-auto {
- css: 3;
-}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/layout.css.sass b/middleman-more/fixtures-old/test-app/source/stylesheets/layout.css.sass
deleted file mode 100644
index aeab4b37..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/layout.css.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-html
- test: value
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/site_scss.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/site_scss.css.scss
deleted file mode 100755
index 0cc04182..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/site_scss.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "compass/reset";
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base1.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base1.css.scss
deleted file mode 100644
index 8b56cb7d..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base1.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-//= require "sprockets_sub"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base2.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base2.css.scss
deleted file mode 100644
index eeb7e5c3..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base2.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "sprockets_sub";
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_sub.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_sub.css.scss
deleted file mode 100644
index 7940d263..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_sub.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-hello { world: "hi"; }
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/static.css b/middleman-more/fixtures-old/test-app/source/stylesheets/static.css
deleted file mode 100755
index 536410d1..00000000
--- a/middleman-more/fixtures-old/test-app/source/stylesheets/static.css
+++ /dev/null
@@ -1,2 +0,0 @@
-body {
- font-size: 12px; }
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/sub1/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/sub1/page-classes.html.haml
deleted file mode 100755
index 0a933c0a..00000000
--- a/middleman-more/fixtures-old/test-app/source/sub1/page-classes.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= page_classes
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/sub1/sub2/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/sub1/sub2/page-classes.html.haml
deleted file mode 100755
index 0a933c0a..00000000
--- a/middleman-more/fixtures-old/test-app/source/sub1/sub2/page-classes.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= page_classes
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/tiny_src.html.haml b/middleman-more/fixtures-old/test-app/source/tiny_src.html.haml
deleted file mode 100644
index 94a61171..00000000
--- a/middleman-more/fixtures-old/test-app/source/tiny_src.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= image_tag "http://test.com/image.jpg"
\ No newline at end of file
diff --git a/middleman-more/fixtures/asset-host-app/config.rb b/middleman-more/fixtures/asset-host-app/config.rb
new file mode 100644
index 00000000..3338c450
--- /dev/null
+++ b/middleman-more/fixtures/asset-host-app/config.rb
@@ -0,0 +1,6 @@
+set :layout, false
+
+activate :asset_host
+set :asset_host do |asset|
+ "http://assets%d.example.com" % (asset.hash % 4)
+end
\ No newline at end of file
diff --git a/middleman-core/fixtures/passthrough-app/source/.htaccess b/middleman-more/fixtures/asset-host-app/source/.htaccess
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/.htaccess
rename to middleman-more/fixtures/asset-host-app/source/.htaccess
diff --git a/middleman-more/fixtures-old/test-app/source/images/blank.gif b/middleman-more/fixtures/asset-host-app/source/images/blank.gif
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/images/blank.gif
rename to middleman-more/fixtures/asset-host-app/source/images/blank.gif
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/asset_host.css.sass b/middleman-more/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
old mode 100755
new mode 100644
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/stylesheets/asset_host.css.sass
rename to middleman-more/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/index.css b/middleman-more/fixtures/liquid-app/config.rb
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/index.css
rename to middleman-more/fixtures/liquid-app/config.rb
diff --git a/middleman-more/fixtures-old/test-app/data/test.yml b/middleman-more/fixtures/liquid-app/data/test.yml
similarity index 100%
rename from middleman-more/fixtures-old/test-app/data/test.yml
rename to middleman-more/fixtures/liquid-app/data/test.yml
diff --git a/middleman-more/fixtures-old/test-app/data/test2.json b/middleman-more/fixtures/liquid-app/data/test2.json
similarity index 100%
rename from middleman-more/fixtures-old/test-app/data/test2.json
rename to middleman-more/fixtures/liquid-app/data/test2.json
diff --git a/middleman-more/fixtures-old/test-app/source/_liquid_partial.liquid b/middleman-more/fixtures/liquid-app/source/_liquid_partial.liquid
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/_liquid_partial.liquid
rename to middleman-more/fixtures/liquid-app/source/_liquid_partial.liquid
diff --git a/middleman-more/fixtures-old/test-app/source/data2.html.liquid b/middleman-more/fixtures/liquid-app/source/data2.html.liquid
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/data2.html.liquid
rename to middleman-more/fixtures/liquid-app/source/data2.html.liquid
diff --git a/middleman-more/fixtures-old/test-app/source/liquid_master.html.liquid b/middleman-more/fixtures/liquid-app/source/liquid_master.html.liquid
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/liquid_master.html.liquid
rename to middleman-more/fixtures/liquid-app/source/liquid_master.html.liquid
diff --git a/middleman-more/fixtures/minify-css-app/config.rb b/middleman-more/fixtures/minify-css-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass b/middleman-more/fixtures/minify-css-app/source/stylesheets/site.css.sass
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass
rename to middleman-more/fixtures/minify-css-app/source/stylesheets/site.css.sass
diff --git a/middleman-more/fixtures/minify-js-app/config.rb b/middleman-more/fixtures/minify-js-app/config.rb
new file mode 100644
index 00000000..e80254e0
--- /dev/null
+++ b/middleman-more/fixtures/minify-js-app/config.rb
@@ -0,0 +1 @@
+require "coffee-filter"
\ No newline at end of file
diff --git a/middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml b/middleman-more/fixtures/minify-js-app/source/inline-coffeescript.html.haml
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml
rename to middleman-more/fixtures/minify-js-app/source/inline-coffeescript.html.haml
diff --git a/middleman-core/fixtures/passthrough-app/source/inline-js.html.haml b/middleman-more/fixtures/minify-js-app/source/inline-js.html.haml
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/inline-js.html.haml
rename to middleman-more/fixtures/minify-js-app/source/inline-js.html.haml
diff --git a/middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee b/middleman-more/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
rename to middleman-more/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
diff --git a/middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js b/middleman-more/fixtures/minify-js-app/source/javascripts/js_test.js
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js
rename to middleman-more/fixtures/minify-js-app/source/javascripts/js_test.js
diff --git a/middleman-core/fixtures/passthrough-app/config.rb b/middleman-more/fixtures/passthrough-app/config.rb
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/config.rb
rename to middleman-more/fixtures/passthrough-app/config.rb
diff --git a/middleman-more/fixtures-old/test-app/source/.htaccess b/middleman-more/fixtures/passthrough-app/source/.htaccess
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/.htaccess
rename to middleman-more/fixtures/passthrough-app/source/.htaccess
diff --git a/middleman-more/fixtures-old/test-app/source/inline-coffeescript.html.haml b/middleman-more/fixtures/passthrough-app/source/inline-coffeescript.html.haml
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/inline-coffeescript.html.haml
rename to middleman-more/fixtures/passthrough-app/source/inline-coffeescript.html.haml
diff --git a/middleman-core/fixtures/passthrough-app/source/inline-css.html.haml b/middleman-more/fixtures/passthrough-app/source/inline-css.html.haml
similarity index 100%
rename from middleman-core/fixtures/passthrough-app/source/inline-css.html.haml
rename to middleman-more/fixtures/passthrough-app/source/inline-css.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/inline-js.html.haml b/middleman-more/fixtures/passthrough-app/source/inline-js.html.haml
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/inline-js.html.haml
rename to middleman-more/fixtures/passthrough-app/source/inline-js.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/coffee_test.js.coffee b/middleman-more/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/javascripts/coffee_test.js.coffee
rename to middleman-more/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/js_test.js b/middleman-more/fixtures/passthrough-app/source/javascripts/js_test.js
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/javascripts/js_test.js
rename to middleman-more/fixtures/passthrough-app/source/javascripts/js_test.js
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/site.css.sass b/middleman-more/fixtures/passthrough-app/source/stylesheets/site.css.sass
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/stylesheets/site.css.sass
rename to middleman-more/fixtures/passthrough-app/source/stylesheets/site.css.sass
diff --git a/middleman-more/fixtures/relative-assets-app/config.rb b/middleman-more/fixtures/relative-assets-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/fixtures-old/test-app/source/img/blank.gif b/middleman-more/fixtures/relative-assets-app/source/images/blank.gif
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/img/blank.gif
rename to middleman-more/fixtures/relative-assets-app/source/images/blank.gif
diff --git a/middleman-more/fixtures/relative-assets-app/source/img/blank.gif b/middleman-more/fixtures/relative-assets-app/source/img/blank.gif
new file mode 100755
index 00000000..2498f1aa
Binary files /dev/null and b/middleman-more/fixtures/relative-assets-app/source/img/blank.gif differ
diff --git a/middleman-more/fixtures-old/test-app/source/relative_image.html.erb b/middleman-more/fixtures/relative-assets-app/source/relative_image.html.erb
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/relative_image.html.erb
rename to middleman-more/fixtures/relative-assets-app/source/relative_image.html.erb
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/relative_assets.css.sass b/middleman-more/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
similarity index 100%
rename from middleman-more/fixtures-old/test-app/source/stylesheets/relative_assets.css.sass
rename to middleman-more/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
diff --git a/middleman-more/lib/middleman-more.rb b/middleman-more/lib/middleman-more.rb
index 63a6c415..ef2bec78 100644
--- a/middleman-more/lib/middleman-more.rb
+++ b/middleman-more/lib/middleman-more.rb
@@ -29,20 +29,10 @@ module Middleman
# relative to the root of the project or use an absolute URL.
autoload :RelativeAssets, "middleman-more/extensions/relative_assets"
- # AssetHost allows you to setup multiple domains to host your static
- # assets. Calls to asset paths in dynamic templates will then rotate
- # through each of the asset servers to better spread the load.
- autoload :AssetHost, "middleman-more/extensions/asset_host"
-
# CacheBuster adds a query string to assets in dynamic templates to avoid
# browser caches failing to update to your new content.
autoload :CacheBuster, "middleman-more/extensions/cache_buster"
- # AutomaticImageSizes inspects the images used in your dynamic templates
- # and automatically adds width and height attributes to their HTML
- # elements.
- autoload :AutomaticImageSizes, "middleman-more/extensions/automatic_image_sizes"
-
# MinifyCss uses the YUI compressor to shrink CSS files
autoload :MinifyCss, "middleman-more/extensions/minify_css"
diff --git a/middleman-more/lib/middleman-more/core_extensions/compass.rb b/middleman-more/lib/middleman-more/core_extensions/compass.rb
index 97f8b5f1..cbbf8a66 100644
--- a/middleman-more/lib/middleman-more/core_extensions/compass.rb
+++ b/middleman-more/lib/middleman-more/core_extensions/compass.rb
@@ -50,6 +50,10 @@ module Middleman::CoreExtensions::Compass
config.asset_cache_buster :none
config.output_style = :nested
+
+ if respond_to?(:asset_host) && asset_host.is_a?(Proc)
+ config.asset_host(&asset_host)
+ end
end
# Change paths when in build mode. Required for relative paths
diff --git a/middleman-more/lib/middleman-more/extensions/minify_css.rb b/middleman-more/lib/middleman-more/extensions/minify_css.rb
index ae6d3973..206ed89d 100644
--- a/middleman-more/lib/middleman-more/extensions/minify_css.rb
+++ b/middleman-more/lib/middleman-more/extensions/minify_css.rb
@@ -4,7 +4,7 @@ module Middleman::Extensions
def registered(app)
app.after_configuration do
if !css_compressor
- require "middleman-core/extensions/minify_css/cssmin"
+ require "middleman-more/extensions/minify_css/cssmin"
set :css_compressor, ::CSSMin
end
end