middleman-core 4.3.0.rc.4 → 4.3.0

data/features/unicode_filenames.feature

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

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

@@ -1,3 +1,4 @@
+
 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 /css$/.match?(env['PATH_INFO'])
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
       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-minified-app/config.rb

@@ -1,5 +1,5 @@
 configure :build do
-  # Minify JavaScript on build
+  # Minify Javascript on build
   activate :minify_javascript
   activate :asset_hash
 end

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

@@ -1,5 +1,6 @@
+
 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 /css$/.match?(env['PATH_INFO'])
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
       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,3 +1,4 @@
+
 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 /css$/.match?(env['PATH_INFO'])
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
       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 +1,2 @@
 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/dynamic-pages-app/config.rb

@@ -1,33 +1,34 @@
-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
+# -*- 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
 
-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" }
 
-%w[tom dick harry].each do |name|
-  proxy "/about/#{name}.html", '/should_be_ignored9.html', locals: { person_name: name }, ignore: true
+["tom", "dick", "harry"].each do |name|
+  proxy "/about/#{name}.html", "/should_be_ignored9.html", locals: { person_name: name }, ignore: true
 end

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/env-app/source/stylesheets/site.css.scss

@@ -1,3 +1,3 @@
 body {
-  background: red;
+  backgroud: red;
 }

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,5 +1,3 @@
 module Derp
-  def three
-    'Three'
-  end
+  def three; "Three"; end
 end

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

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

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

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

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

@@ -1,5 +1,3 @@
 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/generator-test/config.rb

@@ -1,3 +1,16 @@
+###
+# Compass
+###
+
+# Susy grids in Compass
+# First: gem install compass-susy-plugin
+# require 'susy'
+
+# Change Compass configuration
+# compass_config do |config|
+#   config.output_style = :compact
+# end
+
 ###
 # Page options, layouts, aliases and proxies
 ###
@@ -40,9 +53,10 @@
 
 # Production configuration
 configure :production do
+  # For example, change the Compass output style for deployment
   # activate :minify_css
 
-  # Minify JavaScript
+  # Minify Javascript
   # activate :minify_javascript
 
   # Enable cache buster

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 @@
-%i[en es].each do |locale|
-  proxy "/#{locale}/index.html", 'index.html', ignore: true, lang: locale
+[: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: %i[en es]
+activate :i18n, mount_at_root: :en, langs: [:en, :es]

data/fixtures/i18n-test-app/locales/en.yml

@@ -1,10 +1,4 @@
 ---
 en:
-  paths:
-    hello: "hello"
-    morning: "morning"
-    tac: "terms-and-conditions"
-
   greetings: "Howdy"
-  hi: "Hello"
-  tac: "Terms & Conditions"
+  hi: "Hello"

data/fixtures/i18n-test-app/locales/es.yml

@@ -4,7 +4,6 @@ es:
     hello: "hola"
     morning: "manana"
     one: "una"
-
+  
   greetings: "Como Esta?"
   hi: "Hola"
-  tac: "Condiciones Generales"

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-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/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
 ---