middleman-core 3.3.12 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6bfeb7129e9a3c6e06a50e32856e7ec973c597a5
-  data.tar.gz: dbff503bac895a4e4ffa2f734e52144d0ebe3a6b
+SHA256:
+  metadata.gz: 13aa21c1035525447cfbccc018a28fc08b230dc5014e8403a4f6bf3a1fb20c79
+  data.tar.gz: 28e8922409bddf4309a5b0b98afd5d778420d95c390344fc149448771e495b73
 SHA512:
-  metadata.gz: d983aca0f6732cad2fc53273562e67570d36f5cd20d100f756901849f256e55b8ee20583b620e227b5ee4b671b74074ab982d58aa904a3146752c4fe40d798a5
-  data.tar.gz: 1aed9d493d38c379270fff5b2e5da9373c88c1af73e3ea468e824e0333fb0351a0428b07be8347a790d5e328efde579f35782792ae73b40ad98b540e63f6f639
+  metadata.gz: be9c030e750a5db77379753eeb71a432d27ee3b03c7f8530dad5e01de61cf3b67f395b28212773ea651417a51bd04535055525c532ee53160f292cab19a18e85
+  data.tar.gz: 8e4d535a621ce5e874935d5ba65c608a7f2f5b9016d586496643be679a08f74fb93b7ea749dcfe0ac02216247379c69d8e1c60cfd6a1dd63fb8380183cd0d5c3

data/.rspec

@@ -0,0 +1 @@
+--color

data/.yardopts

@@ -1,10 +1,6 @@
 lib/**/*.rb
 --exclude lib/vendored-middleman-deps/
 --exclude lib/middleman-core/step_definitions
---exclude lib/middleman-core/templates/default/
---exclude lib/middleman-core/templates/html5/
---exclude lib/middleman-core/templates/mobile/
---exclude lib/middleman-core/templates/shared/
---exclude lib/middleman-core/templates/extension/
 --no-private
---hide-void-return
+--hide-void-return
+--markup=markdown

data/Rakefile

@@ -1,7 +1,3 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
+RAKE_ROOT = __FILE__.freeze
 GEM_NAME = ENV['NAME'] || 'middleman-core'
-
-require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/cucumber.yml

@@ -0,0 +1,2 @@
+default: --require features --tags ~@wip
+wip: --require features --tags @wip

data/features/asset_hash.feature

@@ -1,43 +1,46 @@
-Feature: Assets get a file hash appended to their and references to them are updated
+Feature: Assets get file hashes appended to them and references to them are updated
   Scenario: Hashed-asset files are produced, and HTML, CSS, JSON and JavaScript gets rewritten to reference the new files
     Given a successfully built app at "asset-hash-app"
     When I cd to "build"
     Then the following files should exist:
-      | index.html |
-      | apple-touch-icon.png |
-      | favicon.ico |
-      | images/100px-1242c368.png |
-      | images/100px-5fd6fb90.jpg |
-      | images/200px-c11eb203.jpg |
-      | images/300px-59adce76.jpg |
-      | images/100px-5fd6fb90.gif |
+      | index.html                          |
+      | apple-touch-icon.png                |
+      | favicon.ico                         |
+      | images/100px-1242c368.png           |
+      | images/100px-5fd6fb90.jpg           |
+      | images/200px-c11eb203.jpg           |
+      | images/300px-59adce76.jpg           |
+      | images/100px-5fd6fb90.gif           |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site-50eaa978.css |
-      | index.html |
-      | subdir/index.html |
-      | other/index.html |
-      | api.json |
-      | subdir/api.json |
+      | stylesheets/site-8bc55985.css       |
+      | index.html                          |
+      | subdir/index.html                   |
+      | other/index.html                    |
+      | api.json                            |
+      | subdir/api.json                     |
     And the following files should not exist:
-      | images/100px.png |
-      | images/100px.jpg |
-      | images/100px.gif |
+      | images/100px.png           |
+      | images/100px.jpg           |
+      | images/100px.gif           |
       | javascripts/application.js |
-      | stylesheets/site.css |
+      | stylesheets/site.css       |
 
     And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
+    And the file "stylesheets/site-8bc55985.css" should contain:
+      """
+      background-image: url("../images/100px-5fd6fb90.jpg")
+      """
     And the file "index.html" should contain 'href="apple-touch-icon.png"'
-    And the file "index.html" should contain 'href="stylesheets/site-50eaa978.css"'
+    And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
     And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
     And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"'
     And the file "index.html" should contain 'src="images/100px-1242c368.png"'
-    And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
     And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
-    And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
@@ -47,26 +50,42 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg'
     And the file "subdir/api.json" should contain 'images/100px-1242c368.png'
 
+  Scenario: Hashed fonts assets work with woff and woff2 extension
+    Given a successfully built app at "asset-hash-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | fonts/fontawesome-webfont-56ce13e7.woff  |
+      | fonts/fontawesome-webfont-10752316.woff2 |
+    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "src: url('../fonts/fontawesome-webfont-10752316.woff2')"
+    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "url('../fonts/fontawesome-webfont-56ce13e7.woff')"
+
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-50eaa978.css"'
+    And I should see 'href="stylesheets/site-47c40978.css"'
+    And I should see 'href="stylesheets/fragment-313b648b.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
+    And I should see 'src="images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-47c40978.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-47c40978.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
+    And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="../images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-50eaa978.css"
-    Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
+    When I go to "/stylesheets/site-47c40978.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg");'
     When I go to "/api.json"
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
@@ -75,6 +94,11 @@ Feature: Assets get a file hash appended to their and references to them are upd
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
+    When I go to "/stylesheets/fragment-313b648b.css"
+    And I should see 'url("../images/100px-5fd6fb90.jpg");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Hashed assets work with Slim
     Given the Server is running at "asset-hash-app"
@@ -83,38 +107,89 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
 
-  Scenario: Enabling an asset host still produces hashed files and references
+  Scenario: Enabling an asset host still produces hashed files and references (hash first)
+    Given a fixture app "asset-hash-host-app"
+    And a file named "config.rb" with:
+      """
+      set :sass_source_maps, false
+      activate :asset_hash
+      activate :directory_indexes
+      activate :asset_host, host: 'http://middlemanapp.com'
+      """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    # Asset helpers don't appear to work from Compass right now
-    # When I go to "/stylesheets/site-e5a31a3e.css"
-    # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+    When I go to "/stylesheets/fragment-2902933e.css"
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");'
 
+  Scenario: Enabling an asset host still produces hashed files and references (host first)
+    Given a fixture app "asset-hash-host-app"
+    And a file named "config.rb" with:
+      """
+      set :sass_source_maps, false
+      activate :asset_host, host: 'http://middlemanapp.com'
+      activate :directory_indexes
+      activate :asset_hash
+      """
+    Given the Server is running at "asset-hash-host-app"
+    When I go to "/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+    When I go to "/subdir/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    When I go to "/other/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+    When I go to "/stylesheets/fragment-2902933e.css"
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
+
+  @wip
   Scenario: The asset hash should change when a SASS partial changes
     Given the Server is running at "asset-hash-app"
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
-        font-size: 14px
+      font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
+    Then I should see 'href="../stylesheets/uses_partials-a3c8302b.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
-        font-size: 18px !important
+      font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
+    Then I should see 'href="../stylesheets/uses_partials-08ee47a7.css'
 
+  @wip
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"
     And a file named "config.rb" with:
@@ -123,58 +198,143 @@ Feature: Assets get a file hash appended to their and references to them are upd
       activate :relative_assets
       activate :directory_indexes
       require 'lib/middleware.rb'
-      use Middleware
+      use ::Middleware
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-5770af52.css'
-    When I go to "stylesheets/site-5770af52.css"
-    Then I should see 'background-image'
+    Then I should see 'href="stylesheets/site-41d4c812.css'
+    When I go to "stylesheets/site-41d4c812.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
     Then I should see 'Added by Rack filter'
-    When I go to "stylesheets/site-50eaa978.css"
-    Then I should see 'Not Found'
 
   Scenario: Hashed-asset files are not produced for ignored paths
     Given a fixture app "asset-hash-app"
     And a file named "config.rb" with:
       """
-      activate :asset_hash, :ignore => [%r(javascripts/*), 'images/*']
+      is_stylesheet = proc { |path| path.start_with? 'stylesheets' }
+      activate :asset_hash, ignore: [
+      %r(javascripts/*),
+      'images/*',
+      is_stylesheet
+      ]
       activate :relative_assets
       activate :directory_indexes
       """
     And a successfully built app at "asset-hash-app"
     When I cd to "build"
     Then the following files should exist:
-      | index.html |
-      | apple-touch-icon.png |
-      | favicon.ico |
-      | images/100px.png |
-      | images/100px.jpg |
-      | images/100px.gif |
+      | index.html                 |
+      | apple-touch-icon.png       |
+      | favicon.ico                |
+      | images/100px.png           |
+      | images/100px.jpg           |
+      | images/100px.gif           |
       | javascripts/application.js |
-      | stylesheets/site-50eaa978.css |
-      | index.html |
-      | subdir/index.html |
-      | other/index.html |
-      | api.json |
-      | subdir/api.json |
+      | stylesheets/site.css       |
+      | index.html                 |
+      | subdir/index.html          |
+      | other/index.html           |
+      | api.json                   |
+      | subdir/api.json            |
     And the following files should not exist:
-      | images/100px-1242c368.png |
-      | images/100px-5fd6fb90.jpg |
-      | images/100px-5fd6fb90.gif |
+      | images/100px-1242c368.png           |
+      | images/100px-5fd6fb90.jpg           |
+      | images/100px-5fd6fb90.gif           |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site.css |
+      | stylesheets/site-7474cadd.css       |
 
-  # @wip Currently broken, we should move all asset-host functionality out of Compass and into something more similar to asset_hash with Rack-based rewrites
-  # Scenario: Enabling an asset host and referencing assets in CSS with URL fragments are rewritten correctly
-  #   Given a successfully built app at "asset-hash-host-app"
-  #   When I cd to "build"
+  Scenario: Hashed-asset files are not replaced for rewrite ignored paths
+    Given a fixture app "asset-hash-app"
+    And a file named "config.rb" with:
+      """
+      is_stylesheet = proc { |path| path.start_with? '/stylesheets' }
+      activate :asset_hash, rewrite_ignore: [
+      %r(javascripts/*),
+      '/subdir/*',
+      is_stylesheet
+      ]
+      activate :relative_assets
+      activate :directory_indexes
+      """
+    And a successfully built app at "asset-hash-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                          |
+      | subdir/index.html                   |
+      | images/100px-5fd6fb90.jpg           |
+      | javascripts/application-1d8d5276.js |
+      | stylesheets/site-8bc55985.css       |
+    And the following files should not exist:
+      | images/100px.jpg           |
+      | javascripts/application.js |
+      | stylesheets/site.css       |
+    And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px.jpg'"
+    And the file "stylesheets/site-8bc55985.css" should contain:
+      """
+      background-image: url("../images/100px.jpg")
+      """
+    And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
+    And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
+    And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
+    And the file "subdir/index.html" should contain:
+      """
+      <h2>Image url3:</h2>
+      <p><img src="../images/100px.jpg"></p>
+      """
+
+  Scenario: Already minified files should still be hashed
+    Given a successfully built app at "asset-hash-minified-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | javascripts/jquery.min-276c87ff.js |
+      | stylesheets/test-7de2ad06.css      |
+    And the following files should not exist:
+      | javascripts/jquery.min.js |
+    And the file "stylesheets/test-7de2ad06.css" should contain:
+      """
+      .no-bug{background-image:url(/images/100px-5fd6fb90.jpg)}
+      .bug{content:"";background-image:url(/images/100px-5fd6fb90.jpg)}
+      .no-bug{content:""; background-image:url(/images/100px-5fd6fb90.jpg)}
+      """
+
+  Scenario: Source map paths include the hash
+    Given a successfully built app at "asset-hash-source-map"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                              |
+      | javascripts/application-4553338c.js     |
+      | javascripts/application.js-22cc2b5f.map |
+      | index.html                              |
+    And the following files should not exist:
+      | javascripts/application.js     |
+      | javascripts/application.js.map |
 
-  #   Then the following files should exist:
-  #     | images/100px-5fd6fb90.jpg |
-  #     | stylesheets/fragment-c058ecb2.css |
-  #   And the following files should not exist:
-  #     | images/100px.jpg |
+    And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map"
+
+  Scenario: Hashes can contain a prefix
+    Given a successfully built app at "asset-hash-prefix"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                       |
+      | javascripts/application-myprefix-4553338c.js     |
+      | javascripts/application.js-myprefix-22cc2b5f.map |
+      | index.html                                       |
+    And the following files should not exist:
+      | javascripts/application.js     |
+      | javascripts/application.js.map |
+
+    And the file "javascripts/application-myprefix-4553338c.js" should contain "//# sourceMappingURL=application.js-myprefix-22cc2b5f.map"
+
+  Scenario: Filenames can be removed by option
+    Given a successfully built app at "asset-hash-remove-filename"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html               |
+      | javascripts/4553338c.js  |
+      | javascripts/22cc2b5f.map |
+      | index.html               |
+    And the following files should not exist:
+      | javascripts/application.js     |
+      | javascripts/application.js.map |
 
-  #   And the file "stylesheets/fragment-c058ecb2.css" should contain "http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"
-  #   And the file "stylesheets/fragment-c058ecb2.css" should not contain "http://middlemanapp.com/images/100px.jpg#test"
+    And the file "javascripts/4553338c.js" should contain "//# sourceMappingURL=22cc2b5f.map"

data/features/asset_host.feature

@@ -1,56 +1,55 @@
 Feature: Alternate between multiple asset hosts
-  In order to speed up page loading
-  
-  Scenario: Set single host globally
-    Given a fixture app "asset-host-app"
-    And a file named "config.rb" with:
-      """
-      activate :asset_host
-      set :asset_host, "http://assets1.example.com"
-      """
-    And the Server is running
-    When I go to "/asset_host.html"
-    Then I should see "http://assets1"
-    When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets1"
 
-  Scenario: Set proc host globally
+  Scenario: Set single host with inline-option
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host
-      set :asset_host do |asset|
-        "http://assets%d.example.com" % (asset.hash % 4)
-      end
+      activate :asset_host, host: "http://assets1.example.com"
       """
     And the Server is running
     When I go to "/asset_host.html"
-    Then I should see "http://assets"
+    Then I should see "'.google-analytics.com/ga.js'"
+    Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}
+    Then I should see content matching %r{<a href="https://github.com/angular/angular.js">Angular.js</a>}
+    Then I should see content matching %r{'//www.example.com/script.js'}
     When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets"
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}
+    When I go to "/javascripts/asset_host.js"
+    Then I should not see content matching %r{http://assets1.example.com/}
 
-  Scenario: Set single host with inline-option
+  Scenario: Set proc host with inline-option
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host, :host => "http://assets1.example.com"
+      activate :asset_host, host: Proc.new { |asset|
+        hash = Digest::MD5.digest(asset).bytes.map!(&:ord).reduce(&:+)
+        "http://assets%d.example.com" % (hash % 4)
+      }
       """
     And the Server is running
     When I go to "/asset_host.html"
-    Then I should see "http://assets1"
+    Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}
+    Then I should see content matching %r{<a href="https://github.com/angular/angular.js">Angular.js</a>}
+    Then I should see content matching %r{'//www.example.com/script.js'}
     When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets1"
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}
 
-  Scenario: Set proc host with inline-option
+  Scenario: Hosts are not rewritten for rewrite ignored paths
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host, :host => Proc.new { |asset|
-        "http://assets%d.example.com" % (asset.hash % 4)
-      }
+      activate :asset_host, host: "http://assets1.example.com", rewrite_ignore: [
+        '/stylesheets/asset_host.css',
+      ]
       """
     And the Server is running
     When I go to "/asset_host.html"
-    Then I should see "http://assets"
+    Then I should see content matching %r{http://assets1.example.com/}
     When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets"
+    Then I should not see content matching %r{http://assets1.example.com/}

data/features/automatic_image_sizes.feature

@@ -2,15 +2,28 @@ Feature: Automatically detect and insert image dimensions into tags
   In order to speed up development and appease YSlow
 
   Scenario: Rendering an image with the feature disabled
-    Given "automatic_image_sizes" feature is "disabled"
+    Given a fixture app "automatic-image-size-app"
+    And a file named "config.rb" with:
+      """
+      """
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
     And I should not see "height="
-  
+    When I go to "/markdown-sizes.html"
+    Then I should not see "width="
+    And I should not see "height="
+
   Scenario: Rendering an image with the feature enabled
-    Given "automatic_image_sizes" feature is "enabled"
+    Given a fixture app "automatic-image-size-app"
+    And a file named "config.rb" with:
+      """
+      activate :automatic_image_sizes
+      """
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
-    Then I should see "width="
-    And I should see "height="
+    Then I should see 'width="1"'
+    And I should see 'height="1"'
+    When I go to "/markdown-sizes.html"
+    Then I should see 'width="1"'
+    And I should see 'height="1"'

data/features/builder.feature

@@ -20,13 +20,13 @@ Feature: Builder
       | layout                                        |
       | layouts/custom                                |
       | layouts/content_for                           |
-      
+
     And the file "index.html" should contain "Comment in layout"
     And the file "index.html" should contain "<h1>Welcome</h1>"
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
     And the file "stylesheets/static.css" should contain "body"
-    
+
   Scenario: Build glob
     Given a successfully built app at "glob-app" with flags "--glob '*.css'"
     When I cd to "build"
@@ -34,16 +34,28 @@ Feature: Builder
       | index.html                                    |
     Then the following files should exist:
       | stylesheets/site.css                          |
-  
+
   Scenario: Build with errors
     Given a built app at "build-with-errors-app"
     Then the exit status should be 1
-  
+
   Scenario: Build empty errors
     Given a built app at "empty-app"
     Then the exit status should be 1
 
+  Scenario: Build external_pipeline errors
+    Given a built app at "external-pipeline-error"
+    Then the exit status should be 1
+
   Scenario: Build alias (b)
     Given a fixture app "large-build-app"
     When I run `middleman b`
-    Then was successfully built
+    Then was successfully built
+
+  Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644
+    Given a successfully built app at "large-build-app"
+    When I cd to "build"
+    Then the mode of filesystem object "index.html" should match "0644"
+    And the mode of filesystem object "stylesheets/static.css" should match "0644"
+    And the mode of filesystem object "feed.xml" should match "0644"
+    And the mode of filesystem object ".htaccess" should match "0644"