middleman-core 4.3.0.rc.1 → 4.3.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52f86ed81089423f830d056b3618e36218d4e478
-  data.tar.gz: a70572a4e9e68a10ce50860dee7b1bbf012e38d7
+SHA256:
+  metadata.gz: 407a6cefc4af923494308fd89533f224e4a41ace633f3047443481148181d5fc
+  data.tar.gz: fa06797e795bf36af4fd50b2174f6de794eb11aaa40f1ed39b242852181188ef
 SHA512:
-  metadata.gz: f9e6f7ff55b3a7cfb86f966a1ba8c2bdfcbef8481ffcbcfce66d46febd5ad8edd297f813bf1e4e7ccc1b7fd6258a1271752f22180983d9a9ca9d0a2057d0518b
-  data.tar.gz: e27b12b8c5888a6b5eacd3bf9ae72c7d6b370b09ecc3c71182cf2a4f1f18b1a33347f60b81ee3a17556f7a7a6d8b7ae3ab89de3e14eda4f08ef40b8dac3da071
+  metadata.gz: 129679da5f716ac7a5bc64b8928fe0211add698897af3875f57b32f0f89c3bedf0bf11b08f9ba15d7454eb208e7d9cc5c81befd1a71fb624471ac518afb839b4
+  data.tar.gz: bedf2d6090c39aa9aa0159d2b31a99b88317fe64252adf6da06222f57f0300b234b87559b5da8a50805d261230ecc8d2b2be7c0dacf7539f2037adc03eb8ea81

data/Rakefile

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

data/cucumber.yml

@@ -1,2 +1,2 @@
-default: --require features --tags ~@wip
-wip: --require features --tags @wip
+default: --fail-fast --require features --tags 'not @wip'
+wip: --fail-fast --require features --tags @wip

data/features/asset_hash.feature

@@ -179,14 +179,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-58447acf.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
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-72fbbb45.css'
+    Then I should see 'href="../stylesheets/uses_partials-08ee47a7.css'
 
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"

data/features/collections.feature

@@ -111,7 +111,7 @@ Feature: Collections
       """
       ---
       title: "Blog3 Another Article"
-      date: 2011-01-02
+      date: "2011-01-02"
       tags:
         - foo
       ---
@@ -133,7 +133,7 @@ Feature: Collections
       """
       ---
       title: "Blog2 Yet Another Article"
-      date: 2011-01-02
+      date: "2011-01-02"
       tags:
         - foo
       ---

data/features/i18n_mixed_sources.feature

@@ -37,3 +37,11 @@ Feature: i18n merging path trees
     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"
+
+    When I go to "/c/d/index.html"
+    Then I should see "Current locale: en"
+    Then I should see "path: is-localized Home # c/d/index.html.erb"
+
+    When I go to "/es/c/d/index.html"
+    Then I should see "Current locale: es"
+    Then I should see "path: is-localized Home # c/d/index.html.erb"

data/features/markdown.feature

@@ -6,7 +6,6 @@ Feature: Markdown support
     When I go to "/index.html"
     Then I should see "<p>Hello World</p>"
 
-  @encoding
   Scenario: Markdown extensions (Maruku)
     Given the Server is running at "markdown-app"
     When I go to "/smarty_pants.html"

data/features/multiple-sources-reload.feature

@@ -0,0 +1,40 @@
+Feature: Allow content with multiple sources to reload
+  Scenario: With source that does not specify a destination directory
+    Given the Server is running at "multiple-sources-without-destination-dir"
+    When I go to "/page.html"
+    Then I should see "Before edit"
+
+    When the file "external/page.html.erb" has the contents
+      """
+      After edit
+      """
+    And I go to "/page.html"
+    Then I should see "After edit"
+
+
+  Scenario: With source that specifies destination directory
+    Given the Server is running at "multiple-sources-with-destination-dir"
+    When I go to "/external/page.html"
+    Then I should see "Before edit"
+
+    When the file "external/page.html.erb" has the contents
+      """
+      After edit
+      """
+    And I go to "/external/page.html"
+    Then I should see "After edit"
+
+  Scenario: With external source and a destination directory name different from source directory name
+    Given a fixture app "destination-dir-different-from-source-dir-name"
+    And I cd to "my-app"
+    And the Server is running
+
+    When I go to "/my_dir/page.html"
+    Then I should see "Before edit"
+
+    When the file "../external/page.html.erb" has the contents
+      """
+      After edit
+      """
+    And I go to "/my_dir/page.html"
+    Then I should see "After edit"

data/features/partials.feature

@@ -37,7 +37,7 @@ Feature: Provide Sane Defaults for Partial Behavior
   Scenario: Partials can be passed locals
     Given the Server is running at "partials-app"
     When I go to "/locals.html"
-    Then I should see "Local var is bar"
+    Then I should see "Local vars are 'foo', 'bar' and 'baz'"
 
   Scenario: Partial and Layout use different engines
     Given the Server is running at "different-engine-partial"

data/features/support/env.rb

@@ -1,5 +1,6 @@
-ENV["TEST"] = "true"
+ENV['TEST'] = 'true'
 
+require 'backports/latest'
 require 'sassc'
 
 require 'simplecov'
@@ -8,6 +9,8 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 require 'phantomjs/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
+Capybara.server = :webrick
+
 require 'simplecov'
 SimpleCov.start
 

data/features/tilde_directories.feature

@@ -1,5 +1,3 @@
-@encoding
-
 Feature: Tilde directories
   In order to support ~ characters in directories
 

data/features/unicode_filenames.feature

@@ -1,4 +1,4 @@
-@encoding @travishatesme @wip
+@wip
 
 Feature: Unicode filenames
   In order to support non-ASCII characters in filenames

data/fixtures/asset-hash-app/config.rb

@@ -1,4 +1,3 @@
-
 activate :asset_hash
 
 activate :relative_assets

data/fixtures/asset-hash-app/lib/middleware.rb

@@ -6,8 +6,8 @@ class Middleware
   def call(env)
     status, headers, response = @app.call(env)
     body = ''
-    response.each {|part| body += part }
-    if (env["PATH_INFO"] =~ /css$/)
+    response.each { |part| body += part }
+    if /css$/.match?(env['PATH_INFO'])
       body += "\n/* Added by Rack filter */"
       status, headers, response = Rack::Response.new(body, status, headers).finish
     end

data/fixtures/asset-hash-app/source/stylesheets/_partial.sass

@@ -1,2 +1,2 @@
 body
-  font-size: 18px
+  font-size: 18px

data/fixtures/asset-hash-prefix/config.rb

@@ -1,6 +1,5 @@
-
 activate :asset_hash,
-  prefix: "myprefix-"
+         prefix: 'myprefix-'
 
 activate :relative_assets
 

data/fixtures/asset-hash-prefix/lib/middleware.rb

@@ -6,8 +6,8 @@ class Middleware
   def call(env)
     status, headers, response = @app.call(env)
     body = ''
-    response.each {|part| body += part }
-    if (env["PATH_INFO"] =~ /css$/)
+    response.each { |part| body += part }
+    if /css$/.match?(env['PATH_INFO'])
       body += "\n/* Added by Rack filter */"
       status, headers, response = Rack::Response.new(body, status, headers).finish
     end

data/fixtures/asset-hash-source-map/config.rb

@@ -1,4 +1,3 @@
-
 activate :asset_hash
 
 activate :relative_assets

data/fixtures/asset-hash-source-map/lib/middleware.rb

@@ -6,8 +6,8 @@ class Middleware
   def call(env)
     status, headers, response = @app.call(env)
     body = ''
-    response.each {|part| body += part }
-    if (env["PATH_INFO"] =~ /css$/)
+    response.each { |part| body += part }
+    if /css$/.match?(env['PATH_INFO'])
       body += "\n/* Added by Rack filter */"
       status, headers, response = Rack::Response.new(body, status, headers).finish
     end

data/fixtures/asset-host-app/config.rb

@@ -1 +1 @@
-      activate :asset_host, host: "http://assets1.example.com"
+activate :asset_host, host: 'http://assets1.example.com'

data/fixtures/auto-css-app/config.rb

@@ -1,9 +1,9 @@
-%w{
+%w[
   /auto-css.html
   /auto-css
   /auto-css/
   /auto-css/auto-css.html
   /auto-css/sub/auto-css.html
-}.each do |path|
+].each do |path|
   page path, layout: false
 end

data/fixtures/auto-js-app/config.rb

@@ -1,9 +1,9 @@
-%w{
+%w[
   /auto-js.html
   /auto-js
   /auto-js/
   /auto-js/auto-js.html
   /auto-js/sub/auto-js.html
-}.each do |path|
+].each do |path|
   page path, layout: false
 end

data/fixtures/auto-js-directory-index-app/config.rb

@@ -1 +1 @@
-activate :directory_indexes
+activate :directory_indexes

data/fixtures/automatic-directory-matcher-app/config.rb

@@ -1 +1 @@
-set :automatic_directory_matcher, "--"
+set :automatic_directory_matcher, '--'

data/fixtures/basic-data-app/config.rb

@@ -1,2 +1,2 @@
-page "/data.html", layout: false
-page "/data3.html", layout: false
+page '/data.html', layout: false
+page '/data3.html', layout: false

data/fixtures/capture-html-app/config.rb

@@ -1,5 +1,5 @@
-require "slim"
+require 'slim'
 
-page "/capture_html_erb.html", layout: :capture_html
-page "/capture_html_haml.html", layout: :capture_html
-page "/capture_html_slim.html", layout: :capture_html
+page '/capture_html_erb.html', layout: :capture_html
+page '/capture_html_haml.html', layout: :capture_html
+page '/capture_html_slim.html', layout: :capture_html

data/fixtures/clean-app/config-complications.rb

@@ -1,9 +1,9 @@
-proxy "/fake.html", "/real.html", layout: false
+proxy '/fake.html', '/real.html', layout: false
 
-ignore "/should_be_ignored.html"
-ignore "/should_be_ignored2.html"
-proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
+ignore '/should_be_ignored.html'
+ignore '/should_be_ignored2.html'
+proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true
 
-%w(one two).each do |num|
-  proxy "/fake/#{num}.html", "/real/index.html", locals: { num: num }
+%w[one two].each do |num|
+  proxy "/fake/#{num}.html", '/real/index.html', locals: { num: num }
 end

data/fixtures/clean-app/config-hidden-dir-after.rb

@@ -1,5 +1,5 @@
-set :build_dir, ".build"
+set :build_dir, '.build'
 
-ignore "/should_be_ignored.html"
-ignore "/should_be_ignored2.html"
-proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
+ignore '/should_be_ignored.html'
+ignore '/should_be_ignored2.html'
+proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true

data/fixtures/clean-app/config-hidden-dir-before.rb

@@ -1 +1 @@
-set :build_dir, ".build"
+set :build_dir, '.build'

data/fixtures/clean-app/config.rb

@@ -1,9 +1,9 @@
-proxy "/fake.html", "/real.html", layout: false
+proxy '/fake.html', '/real.html', layout: false
 
-ignore "/should_be_ignored.html"
-ignore "/should_be_ignored2.html"
-proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
+ignore '/should_be_ignored.html'
+ignore '/should_be_ignored2.html'
+proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true
 
-%w(one two).each do |num|
-  proxy "/fake/#{num}.html", "/real/index.html", locals: { num: num }
+%w[one two].each do |num|
+  proxy "/fake/#{num}.html", '/real/index.html', locals: { num: num }
 end

data/fixtures/clean-dir-app/config.rb

@@ -1,2 +1 @@
 activate :directory_indexes
-

data/fixtures/clean-nested-app/config.rb

@@ -1 +1 @@
-set :build_dir, "sub/dir"
+set :build_dir, 'sub/dir'

data/fixtures/collections-app/source/blog1/2011-01-01-new-article.html.markdown

@@ -1,6 +1,6 @@
 --- 
 title: "Blog1 Newer Article"
-date: 2011-01-01
+date: "2011-01-01"
 tags: foo, bar
 ---
 

data/fixtures/collections-app/source/blog1/2011-01-02-another-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Blog1 Another Article"
-date: 2011-01-02
+date: "2011-01-02"
 tags:
   - foo
   - 120

data/fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown

@@ -1,6 +1,6 @@
 --- 
 title: "Blog2 Newer Article"
-date: 2011-01-01
+date: "2011-01-01"
 tags: foo, bar
 ---
 

data/fixtures/collections-app/source/blog2/2011-01-02-another-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Blog2 Another Article"
-date: 2011-01-02
+date: "2011-01-02"
 tags:
   - foo
 ---

data/fixtures/content-for-app/config.rb

@@ -1,5 +1,5 @@
-require "slim"
+require 'slim'
 
-page "/content_for_erb.html", layout: :content_for
-page "/content_for_haml.html", layout: :content_for
-page "/content_for_slim.html", layout: :content_for
+page '/content_for_erb.html', layout: :content_for
+page '/content_for_haml.html', layout: :content_for
+page '/content_for_slim.html', layout: :content_for

data/fixtures/destination-dir-different-from-source-dir-name/external/page.html.erb

@@ -0,0 +1 @@
+Before edit

data/fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb

@@ -0,0 +1,2 @@
+files.watch :source, path: File.join(root, '..', 'external'),
+                     destination_dir: 'my_dir'

data/fixtures/destination-dir-different-from-source-dir-name/my-app/source/index.html.erb

@@ -0,0 +1 @@
+Don't care

data/fixtures/dynamic-pages-app/config.rb

@@ -1,34 +1,33 @@
-# -*- coding: utf-8 -*-
-proxy "/fake.html", "/real.html", layout: false
-proxy "fake2.html", "/real.html", layout: false
-proxy "fake3.html", "real.html", layout: false
-proxy "/fake4.html", "real.html", layout: false
+proxy '/fake.html', '/real.html', layout: false
+proxy 'fake2.html', '/real.html', layout: false
+proxy 'fake3.html', 'real.html', layout: false
+proxy '/fake4.html', 'real.html', layout: false
 
-ignore "/should_be_ignored.html"
-ignore "/should_be_ignored2.html"
-proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
+ignore '/should_be_ignored.html'
+ignore '/should_be_ignored2.html'
+proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true
 
-ignore "should_be_ignored4.html"
-ignore "should_be_ignored5.html"
-proxy "target_ignore2.html", "/should_be_ignored6.html", ignore: true
-proxy "target_ignore3.html", "should_be_ignored7.html", ignore: true
-proxy "/target_ignore4.html", "should_be_ignored8.html", ignore: true
+ignore 'should_be_ignored4.html'
+ignore 'should_be_ignored5.html'
+proxy 'target_ignore2.html', '/should_be_ignored6.html', ignore: true
+proxy 'target_ignore3.html', 'should_be_ignored7.html', ignore: true
+proxy '/target_ignore4.html', 'should_be_ignored8.html', ignore: true
 
-%w(one two).each do |num|
-  proxy "/fake/#{num}.html", "/real/index.html", ignore: true, locals: { num: num }
-  proxy "fake2/#{num}.html", "/real/index.html", ignore: true, locals: { num: num }
-  proxy "fake3/#{num}.html", "real/index.html", ignore: true, locals: { num: num }
-  proxy "/fake4/#{num}.html", "real/index.html", ignore: true, locals: { num: num }
+%w[one two].each do |num|
+  proxy "/fake/#{num}.html", '/real/index.html', ignore: true, locals: { num: num }
+  proxy "fake2/#{num}.html", '/real/index.html', ignore: true, locals: { num: num }
+  proxy "fake3/#{num}.html", 'real/index.html', ignore: true, locals: { num: num }
+  proxy "/fake4/#{num}.html", 'real/index.html', ignore: true, locals: { num: num }
 end
 
-proxy "明日がある.html", "/real.html", layout: false
+proxy '明日がある.html', '/real.html', layout: false
 
-page "f*/*", locals: { all_glob: "I am all glob" }
-page "fake/*", locals: { glob_var: "I am one glob" }
-page "fake2/*", locals: { glob_var: "I am two glob" }
-page "fake3/*", locals: { glob_var: "I am three glob" }
-page "fake4/*", locals: { glob_var: "I am four glob" }
+page 'f*/*', locals: { all_glob: 'I am all glob' }
+page 'fake/*', locals: { glob_var: 'I am one glob' }
+page 'fake2/*', locals: { glob_var: 'I am two glob' }
+page 'fake3/*', locals: { glob_var: 'I am three glob' }
+page 'fake4/*', locals: { glob_var: 'I am four glob' }
 
-["tom", "dick", "harry"].each do |name|
-  proxy "/about/#{name}.html", "/should_be_ignored9.html", locals: { person_name: name }, ignore: true
+%w[tom dick harry].each do |name|
+  proxy "/about/#{name}.html", '/should_be_ignored9.html', locals: { person_name: name }, ignore: true
 end