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

data/fixtures/ember-cli-app/config.rb

@@ -1,5 +1,5 @@
 activate :external_pipeline,
-  name: :ember,
-  command: "cd test-app/ && ember #{build? ? :build : :serve} --environment #{config[:environment]}",
-  source: "test-app/dist",
-  latency: 2
+         name: :ember,
+         command: "cd test-app/ && ember #{build? ? :build : :serve} --environment #{config[:environment]}",
+         source: 'test-app/dist',
+         latency: 2

data/fixtures/env-app/environments/development.rb

@@ -1 +1 @@
-set :api_key, "dev1"
+set :api_key, 'dev1'

data/fixtures/env-app/environments/production.rb

@@ -1,2 +1,2 @@
-set :api_key, "prod2"
+set :api_key, 'prod2'
 activate :minify_css

data/fixtures/extension-hooks-app/config.rb

@@ -12,20 +12,20 @@ class MyFeature < Middleman::Extension
       puts '/// ready ///'
     end
 
-    app.before_render do |body, path, locs, template_class|
-      puts "/// before_render ///"
+    app.before_render do |_body, _path, _locs, _template_class|
+      puts '/// before_render ///'
     end
 
-    app.after_render do |content, path, locs, template_class|
-      puts "/// after_render ///"
+    app.after_render do |_content, _path, _locs, _template_class|
+      puts '/// after_render ///'
     end
 
-    app.before_build do |builder|
-      puts "/// before_build ///"
+    app.before_build do |_builder|
+      puts '/// before_build ///'
     end
 
-    app.after_build do |builder|
-      puts "/// after_build ///"
+    app.after_build do |_builder|
+      puts '/// after_build ///'
     end
   end
 

data/fixtures/external-helpers/config.rb

@@ -1,4 +1,4 @@
-require "lib/hello_helper"
+require 'lib/hello_helper'
 helpers HelloHelper
 
-page "/", layout: false
+page '/', layout: false

data/fixtures/external-helpers/helpers/derp.rb

@@ -1,3 +1,5 @@
 module Derp
-  def three; "Three"; end
+  def three
+    'Three'
+  end
 end

data/fixtures/external-helpers/helpers/four_helpers.rb

@@ -1,3 +1,5 @@
 module FourHelpers
-  def four; "Four"; end
+  def four
+    'Four'
+  end
 end

data/fixtures/external-helpers/helpers/one_helper.rb

@@ -1,3 +1,5 @@
 module OneHelper
-  def one; "One"; end
+  def one
+    'One'
+  end
 end

data/fixtures/external-helpers/helpers/yet_another_thingy.rb

@@ -1,3 +1,5 @@
 module YetAnotherThingy
-  def two; "Two"; end
+  def two
+    'Two'
+  end
 end

data/fixtures/external-helpers/lib/hello_helper.rb

@@ -1,5 +1,5 @@
 module HelloHelper
   def hello
-    "Hello World"
+    'Hello World'
   end
 end

data/fixtures/external-pipeline-error/config.rb

@@ -1,5 +1,5 @@
 activate :external_pipeline,
-  name: :failing,
-  command: "mv does-not-exist tmp/file.js",
-  source: "tmp",
-  latency: 2
+         name: :failing,
+         command: 'mv does-not-exist tmp/file.js',
+         source: 'tmp',
+         latency: 2

data/fixtures/feature-params-app/config.rb

@@ -13,4 +13,4 @@ end
 
 Middleman::Extensions.register :extension_a, ExtensionA
 
-activate :extension_a, hello: "world", hola: "mundo"
+activate :extension_a, hello: 'world', hola: 'mundo'

data/fixtures/frontmatter-app/config.rb

@@ -1 +1 @@
-config[:frontmatter_delims][:yaml] << %w(\\--- \\---)
+config[:frontmatter_delims][:yaml] << %w[\\--- \\---]

data/fixtures/glob-app/config.rb

@@ -1 +1 @@
-page "/index.html", layout: false
+page '/index.html', layout: false

data/fixtures/i-8859-1-app/config.rb

@@ -1 +1 @@
-set :encoding, "ISO-8859-1"
+set :encoding, 'ISO-8859-1'

data/fixtures/i18n-force-locale/config.rb

@@ -1,11 +1,11 @@
-[:en, :es].each do |locale|
-  proxy "/#{locale}/index.html", "index.html", ignore: true, lang: locale
+%i[en es].each do |locale|
+  proxy "/#{locale}/index.html", 'index.html', ignore: true, lang: locale
 end
 
-proxy "/fr/index.html", "index.html", lang: :fr
+proxy '/fr/index.html', 'index.html', lang: :fr
 
 activate :i18n
 
-# This is what breaks i18n, just because it adds a resource list manipulator that 
+# This is what breaks i18n, just because it adds a resource list manipulator that
 # forces a rebuild of the resource list.
 activate :asset_hash

data/fixtures/i18n-mixed-sources/config.rb

@@ -1 +1 @@
-activate :i18n, mount_at_root: :en, langs: [:en, :es]
+activate :i18n, mount_at_root: :en, langs: %i[en es]

data/fixtures/i18n-mixed-sources/source/c/d/index.html.erb

@@ -0,0 +1,9 @@
+---
+title: c/d/index.html.erb
+---
+Current locale: <%= I18n.locale %>
+path: <%=
+hierarchy = [current_page]
+hierarchy.unshift hierarchy.first.parent true while hierarchy.first.parent true
+hierarchy.collect {|page| page.data.title }.join(" # ")
+%>

data/fixtures/i18n-mixed-sources/source/localizable/c/d/index.html.erb

@@ -0,0 +1,9 @@
+---
+title: c/d/index.html.erb
+---
+Current locale: <%= I18n.locale %>
+path: <%=
+hierarchy = [current_page]
+hierarchy.unshift hierarchy.first.parent true while hierarchy.first.parent true
+hierarchy.collect {|page| page.data.title }.join(" # ")
+%>

data/fixtures/import-app/config.rb

@@ -1,7 +1,7 @@
-import_file File.expand_path("static.html", root), "/static2.html"
+import_file File.expand_path('static.html', root), '/static2.html'
 
-import_path File.expand_path("bower_components/", root)
+import_path File.expand_path('bower_components/', root)
 
-import_path File.expand_path("bower_components", root) do |target_path, original_path|
+import_path File.expand_path('bower_components', root) do |target_path, _original_path|
   target_path.sub('bower_components', 'bower_components2')
 end

data/fixtures/indexable-app/config.rb

@@ -1,5 +1,5 @@
 activate :directory_indexes
-page "/leave_me_alone.html", directory_index: false
+page '/leave_me_alone.html', directory_index: false
 
-page "/wildcard*", directory_index: false
-page /regex_.*/, directory_index: false
+page '/wildcard*', directory_index: false
+page(/regex_.*/, directory_index: false)

data/fixtures/large-build-app/config.rb

@@ -1,3 +1,3 @@
-page "/spaces in file.html", layout: false
+page '/spaces in file.html', layout: false
 
 config[:port] = 5555

data/fixtures/manual-layout-override/config.rb

@@ -1,3 +1,3 @@
 set :layout, :custom
 
-page "/", layout: :another
+page '/', layout: :another

data/fixtures/missing-tilt-library-app/config.rb

@@ -1,2 +1,2 @@
-ignore "danger-zone/*"
-ignore "*.textile"
+ignore 'danger-zone/*'
+ignore '*.textile'

data/fixtures/more-traversal-app/config.rb

@@ -1,7 +1,7 @@
 activate :directory_indexes
 
-proxy "/sub/fake.html", "/proxied.html", ignore: true
-proxy "/sub/fake2.html", "/proxied.html", ignore: true
+proxy '/sub/fake.html', '/proxied.html', ignore: true
+proxy '/sub/fake2.html', '/proxied.html', ignore: true
 
-proxy "/directory-indexed/fake.html", "/proxied.html", ignore: true
-proxy "/directory-indexed/fake2.html", "/proxied.html", ignore: true
+proxy '/directory-indexed/fake.html', '/proxied.html', ignore: true
+proxy '/directory-indexed/fake2.html', '/proxied.html', ignore: true

data/fixtures/multiple-data-sources-app/config.rb

@@ -1,3 +1,3 @@
 files.watch :data, path: File.join(root, 'data0'), priority: 100
 files.watch :data, path: File.join(root, 'data1')
-files.watch :data, path: File.join(root, 'data2')
+files.watch :data, path: File.join(root, 'data2')

data/fixtures/multiple-sources-app/config.rb

@@ -1,3 +1,3 @@
 files.watch :source, path: File.join(root, 'source0'), priority: 100
 files.watch :source, path: File.join(root, 'source1')
-files.watch :source, path: File.join(root, 'source2')
+files.watch :source, path: File.join(root, 'source2')

data/fixtures/multiple-sources-with-destination-dir/config.rb

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

data/fixtures/multiple-sources-with-destination-dir/external/page.html.erb

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

data/fixtures/multiple-sources-with-destination-dir/source/index.html.erb

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

data/fixtures/multiple-sources-with-duplicate-file-names-app/config.rb

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

data/fixtures/multiple-sources-without-destination-dir/config.rb

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

data/fixtures/multiple-sources-without-destination-dir/external/page.html.erb

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

data/fixtures/multiple-sources-without-destination-dir/source/index.html.erb

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

data/fixtures/nested-layout-app/source/another.html.markdown

@@ -1,6 +1,6 @@
 --- 
 title: "New Article Title"
-date: 2011-01-01
+date: "2011-01-01"
 layout: inner
 ---
 

data/fixtures/nested-layout-app/source/haml-test.html.markdown

@@ -1,6 +1,6 @@
 --- 
 title: "New Article Title"
-date: 2011-01-01
+date: "2011-01-01"
 layout: inner_haml
 ---
 

data/fixtures/nested-layout-app/source/slim-test.html.markdown

@@ -1,6 +1,6 @@
 --- 
 title: "New Article Title"
-date: 2011-01-01
+date: "2011-01-01"
 layout: inner_slim
 ---
 

data/fixtures/padrino-helpers-app/config.rb

@@ -1,7 +1,7 @@
 helpers do
   def title
     content_tag :h1 do
-      "Title"
+      'Title'
     end
   end
 end

data/fixtures/page-classes-app/config.rb

@@ -1,2 +1,2 @@
-page "/sub1/page-classes.html", layout: false
-page "/sub1/sub2/page-classes.html", layout: false
+page '/sub1/page-classes.html', layout: false
+page '/sub1/sub2/page-classes.html', layout: false

data/fixtures/page-helper-layout-block-app/config.rb

@@ -1,4 +1,4 @@
-page "/path/*", layout: "alt"
+page '/path/*', layout: 'alt'
 
 # Doesn't work, and shouldn't
 # page "/path/*" do

data/fixtures/page-id-app/config-proc.rb

@@ -1,7 +1,7 @@
-%w(1 2 3).each do |n|
-  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+%w[1 2 3].each do |n|
+  proxy "/#{n}.html", '/index.html', id: "page#{n}"
 end
 
-page "/overwrites/*", id: :"something-else"
+page '/overwrites/*', id: :"something-else"
 
-config[:page_id_generator] = ->(path){ path + "-foo" }
+config[:page_id_generator] = ->(path) { path + '-foo' }

data/fixtures/page-id-app/config.rb

@@ -1,5 +1,5 @@
-%w(1 2 3).each do |n|
-  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+%w[1 2 3].each do |n|
+  proxy "/#{n}.html", '/index.html', id: "page#{n}"
 end
 
-page "/overwrites/*", id: :"something-else"
+page '/overwrites/*', id: :"something-else"

data/fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-01-01
+date: "2011-01-01"
 tags: foo
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown

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

data/fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-01-03
+date: "2011-01-03"
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-01-04
+date: "2011-01-04"
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-01-05
+date: "2011-01-05"
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-02-01
+date: "2011-02-01"
 tags: bar
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Test Article"
-date: 2011-02-02
+date: "2011-02-02"
 tags: bar
 ---
 Test Article Content

data/fixtures/partials-app/source/_locals.erb

@@ -1 +1 @@
-Local var is <%= foo %>
+Local vars are '<%= locals['foo'] %>', '<%= locals[:bar] %>' and '<%= baz %>'

data/fixtures/partials-app/source/locals.html.erb

@@ -1 +1 @@
-<%= partial 'locals', locals: { foo: 'bar' } %>
+<%= partial 'locals', locals: { foo: 'foo', 'bar' => 'bar', 'baz': 'baz' } %>

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

@@ -1,18 +1,17 @@
-# -*- 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
 
-proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
-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
+proxy '/target_ignore.html', '/should_be_ignored3.html', ignore: true
+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 }
+%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 }
 end
 
-proxy "明日がある.html", "/real.html", layout: false
+proxy '明日がある.html', '/real.html', layout: false