middleman-core 4.0.0 → 4.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943984d8ce5d131f06921104850e97defd44613d
-  data.tar.gz: d33b774d8f9df3ba11fc3f5218a97533f97aa781
+  metadata.gz: 404deb8049bbd24929ef1847e8cd92598db4e61e
+  data.tar.gz: 758e2ac1ab487d3671e66cf3ac01c9fd5cc80f58
 SHA512:
-  metadata.gz: 933d5babdb56a3bf292c5e2c6503fc2932f9cf6c38592ce7456ed8e2f574b2f59f495cbe050701d5c8e9d71c607d61d41c53fa81b5c371a55f94578cfa56f159
-  data.tar.gz: 867ddaef10a672e7b027fc033217975caccc1b713a0a37c67f5cba9709d8ef5350ae2dadf07b5df6622a7ac609847c4e0abf42222d08f541016246817ccc3d0a
+  metadata.gz: 365df7410bf7945f84b566fc061b6b5aa60eada04c1bc2b28ccd1558ac90b04cd6132588212b601b7c89555d4b1bdcb5fb93bf9e7199cd140a3516338db72c52
+  data.tar.gz: 56a33ca43a78ca4e2078b77fd57c78c25c2d5badfbfb2c75a764e504d7c3150e51cff954852299d71d3cfc2255763c9feec535320a6e0e31f54bc3e5826cf1d5

data/features/asset_hash.feature

@@ -64,9 +64,13 @@ Feature: Assets get file hashes appended to them and references to them are upda
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
     And I should see 'href="stylesheets/site-d2959d87.css"'
+    And I should see 'href="stylesheets/fragment-a06f0dfc.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-d2959d87.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
@@ -75,6 +79,9 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Then I should see 'href="../stylesheets/site-d2959d87.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-d2959d87.css"
@@ -87,6 +94,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     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-a06f0dfc.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"
@@ -99,13 +111,25 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
     Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7af0b5ab.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-e587b659.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-e587b659.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-7af0b5ab.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: The asset hash should change when a SASS partial changes
     Given the Server is running at "asset-hash-app"
@@ -179,6 +203,45 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/application-1d8d5276.js |
       | stylesheets/site-7474cadd.css |
 
+  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"

data/features/asset_host.feature

@@ -35,3 +35,17 @@ Feature: Alternate between multiple asset hosts
     When I go to "/stylesheets/asset_host.css"
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
+
+  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: "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 content matching %r{http://assets1.example.com/}
+    When I go to "/stylesheets/asset_host.css"
+    Then I should not see content matching %r{http://assets1.example.com/}

data/features/cache_buster.feature

@@ -39,4 +39,18 @@ Feature: Generate mtime-based query string for busting browser caches
     And the Server is running at "cache-buster-app"
     When I go to "/cache-buster.html"
     Then I should see "site.css?"
-    Then I should see "blank.gif?"
+    Then I should see "blank.gif?"
+
+  Scenario: URLs are not rewritten for rewrite ignored paths
+    Given a fixture app "cache-buster-app"
+    And a file named "config.rb" with:
+      """
+      activate :cache_buster, rewrite_ignore: [
+        '/cache-buster.html',
+      ]
+      """
+    And the Server is running at "cache-buster-app"
+    When I go to "/cache-buster.html"
+    Then I should see 'site.css"'
+    Then I should see 'empty-with-include.js"'
+    Then I should see 'blank.gif"'

data/features/clean_build.feature

@@ -16,6 +16,22 @@ Feature: Build Clean
       | build/should_be_ignored3.html |
     And the file "build/index.html" should contain "Comment in layout"
 
+  Scenario: Clean build has a whitelist
+    Given a fixture app "clean-app"
+    When a file named "build/.test" with:
+      """
+      Hello
+      """
+    When a file named "config.rb" with:
+      """
+      set :skip_build_clean do |path|
+        path =~ /\.test/
+      end
+      """
+    Given a built app at "clean-app"
+    Then the following files should exist:
+      | build/.test         |
+
   Scenario: Clean build an app with newly ignored files and a nested output directory
     Given a fixture app "clean-nested-app"
     When a file named "config.rb" with:

data/features/cli/preview_server.feature

@@ -42,7 +42,7 @@ Feature: Run the preview server
     Inspect your site configuration at "http://
     """
 
-  @ruby-2.1
+  @wip
   Scenario: Start the server with defaults in verbose mode, when a local mdns server resolves the local hostname
     Given I start a mdns server for the local hostname
     When I run `middleman server --verbose` interactively
@@ -115,6 +115,7 @@ Feature: Run the preview server
     Inspect your site configuration at "http://127.0.0.1:4567/__middleman"
     """
 
+  @wip
   Scenario: Start the server with bind address 127.0.0.5
 
     This will have no hostname attached because the hosts file, the DNS server
@@ -359,7 +360,6 @@ Feature: Run the preview server
     The Middleman preview server is bound to ":::65432", "0.0.0.0:65432"
     """
 
-  @ruby-2.1
   @wip
   Scenario: Start the server when port is blocked by other middleman instance
     Given `middleman server` is running in background
@@ -469,7 +469,8 @@ Feature: Run the preview server
     Inspect your site configuration at "http://www.example.com:4567/__middleman", "http://127.0.0.1:4567/__middleman"
     """
 
-    @ruby-2.1
+  @ruby-2.1
+  @wip
   Scenario: Start the server with server name "host.local" and the link local name server is used to resolve the server name
 
     To make the mdns resolver resolve a name, it needs to end with ".local".
@@ -501,7 +502,8 @@ Feature: Run the preview server
     Inspect your site configuration at "http://host.local:4567/__middleman", "http://127.0.0.1:4567/__middleman"
     """
 
-    @ruby-2.1
+  @ruby-2.1
+  @wip
   Scenario: Start the server with server name "host" and the link local name server is used to resolve the server name
 
     To make the mdns resolver resolve a name, it needs to end with ".local". If

data/features/cli_extension.feature

@@ -9,6 +9,6 @@ Feature: Middleman New Extension CLI
       | Rakefile                                      |
       | my-extension-library.gemspec                  |
       | features/support/env.rb                       |
-      | lib/middleman_extension.rb                    |
+      | lib/my-extension-library/extension.rb         |
       | lib/my-extension-library.rb                   |
       | .gitignore                                    |

data/features/directory_index.feature

@@ -9,6 +9,7 @@ Feature: Directory Index
       | a_folder/needs_index/index.html               |
       | leave_me_alone.html                           |
       | wildcard_leave_me_alone.html                  |
+      | regex_leave_me_alone2.html                    |
       | evil spaces/index.html                        |
       | regular/index.html                            |
       | .htaccess                                     |
@@ -21,12 +22,13 @@ Feature: Directory Index
       | a_folder/needs_index.html                     |
       | leave_me_alone/index.html                     |
       | wildcard_leave_me_alone/index.html            |
+      | regex_leave_me_alone2/index.html              |
     And the file "needs_index/index.html" should contain "Indexable"
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"
     And the file "regular/index.html" should contain "Regular"
     And the file "evil spaces/index.html" should contain "Filled with Evil Spaces"
-    
+
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"
     When I go to "/needs_index/"

data/features/encoding_option.feature

@@ -0,0 +1,28 @@
+# encoding: iso-8859-1
+Feature: encoding option
+
+  Scenario: No encoding set
+    Given a fixture app "clean-app"
+    Given the Server is running at "clean-app"
+
+    When I go to "/index.html"
+    Then the "Content-Type" header should contain "text/html"
+    Then the "Content-Type" header should contain "charset=utf-8"
+
+  @wip
+  Scenario: Custom encoding set
+    Given a fixture app "i-8859-1-app"
+    And a file named "config.rb" with:
+      """
+      set :encoding, "ISO-8859-1"
+
+      ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=iso-8859-1'
+      ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=iso-8859-1'
+      ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=iso-8859-1'
+      """
+    Given the Server is running at "i-8859-1-app"
+
+    When I go to "/index.html"
+    Then the "Content-Type" header should contain "text/html"
+    Then the "Content-Type" header should contain "charset=iso-8859-1"
+    Then I should see "äöü"

data/features/i18n_mixed_sources.feature

@@ -0,0 +1,39 @@
+Feature: i18n merging path trees
+
+  Scenario: Mixing localized and non-localized sources and merging the path trees (see issue #1709)
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, mount_at_root: :en, langs: [:en, :es]
+      """
+    Given the Server is running at "i18n-mixed-sources"
+
+    When I go to "/"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home"
+    When I go to "/es"
+    Then I should see "Current locale: es"
+    Then I should see "path: is-localized Home"
+
+    When I go to "/a/"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home # a/index.html.erb"
+    When I go to "/es/a/"
+    Then I should see "Current locale: es"
+    Then I should see "path: is-localized Home # a/index.html.erb"
+
+    When I go to "/b/"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home # b/index.html.erb"
+
+    When I go to "/a/sub.html"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home # a/index.html.erb # a/sub.html.erb"
+
+    When I go to "/b/sub.html"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"
+
+    When I go to "/es/b/sub.html"
+    Then I should see "Current locale: es"
+    Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"

data/features/ignore.feature

@@ -12,7 +12,7 @@ Feature: Ignoring paths
     And the following files should not exist:
       | build/plain.html |
       | build/about.html |
-      
+
   Scenario: Ignore a single path (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -28,6 +28,35 @@ Feature: Ignoring paths
     When I go to "/about.html"
     Then I should see "File Not Found"
 
+  Scenario: Ignoring collected values
+    Given a fixture app "ignore-app"
+    And a file named "data/ignores.yaml" with:
+      """
+      ---
+      - "plain"
+      """
+    And a file named "config.rb" with:
+       """
+       data.ignores.each do |name|
+         ignore "#{name}.html"
+       end
+       """
+    And the Server is running
+    When I go to "/plain.html"
+    Then I should see "File Not Found"
+    When I go to "/about.html"
+    Then I should not see "File Not Found"
+
+    When the file "data/ignores.yaml" has the contents
+      """
+      ---
+      - "about"
+      """
+    When I go to "/plain.html"
+    Then I should not see "File Not Found"
+    When I go to "/about.html"
+    Then I should see "File Not Found"
+
   Scenario: Ignore a globbed path (build)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -47,7 +76,7 @@ Feature: Ignoring paths
       | build/reports/index.html |
       | build/reports/another.html |
       | build/images/icons/messages.png |
-      
+
   Scenario: Ignore a globbed path (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -93,7 +122,7 @@ Feature: Ignoring paths
       | build/reports/index.html |
       | build/reports/another.html |
       | build/images/icons/messages.png |
-      
+
   Scenario: Ignore a regex (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -118,4 +147,4 @@ Feature: Ignoring paths
     When I go to "/reports/another.html"
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
-    Then I should see "File Not Found"
+    Then I should see "File Not Found"

data/features/relative_assets.feature

@@ -132,3 +132,17 @@ Feature: Relative Assets
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
     Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
+
+  Scenario: URLs are not rewritten for rewrite ignored paths
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, rewrite_ignore: [
+        '/stylesheets/fonts.css',
+      ]
+      """
+    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'
+    When I go to "/stylesheets/fonts.css"
+    Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'

data/features/support/env.rb

@@ -5,7 +5,7 @@ require 'sassc'
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'capybara/poltergeist'
+require 'phantomjs/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
 require 'coveralls'

data/fixtures/asset-hash-app/source/index.html.erb

@@ -4,6 +4,9 @@
 
 <h2>Image url:</h2>
 <img src="<%= image_path('100px.jpg') %>" srcset="<%= image_path('100px.jpg') %> 1x, <%= image_path('200px.jpg') %> 2x, <%= image_path('300px.jpg') %> 3x">
+<%= image_tag('100px.jpg?test') %>
+<%= image_tag('100px.jpg?#test') %>
+<%= image_tag('100px.jpg#test') %>
 
 <h2>Ignored path:</h2>
 <link rel="apple-touch-icon" href="apple-touch-icon.png">

data/fixtures/asset-hash-app/source/layout.erb

@@ -3,16 +3,16 @@
   <head>
     <meta charset="utf-8">
 
-    <%= stylesheet_link_tag "site" %>
+    <%= stylesheet_link_tag "site", "fragment" %>
     <%= javascript_include_tag "application" %>
     <%= yield_content :head %>
   </head>
-  
+
   <body class="<%= page_classes %>">
 
     <div id="main" role="main">
       <%= yield %>
     </div>
-    
+
   </body>
 </html>