middleman-core 4.3.0.rc.4 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe804ebc36f4a264dcde64fc13c9a76573d6fd34b50f982136b82e4bc309d6f5
-  data.tar.gz: 759ee3d80a5683d7904a70a196b0eacc4d7f5e8bafc01da763422285e04d9645
+  metadata.gz: 2f2fc5888682b7c060027e651e2a750c951cb0151eb0a4388bec0c8593dd0fd8
+  data.tar.gz: d5885c630ebd13ac9419432adef385485f80c008d853b4e759a0a024113adea4
 SHA512:
-  metadata.gz: 6776538352eff82847ea01c13a3bd1e0afb4bdb38629fda06f15c49e1b6e8e7d0829b12169d4802a1a48a22c7d6c32dd2d62fd73ed9dd165f03b86ad7538598d
-  data.tar.gz: f44eccdd46765b7207e328d560394ea98fa78f11a575e630bf1517dbaf4d566ad3dc25470e857028ed22657a1609ea85c33e6df59594d425a7284e2c0974154f
+  metadata.gz: c2a1183511d4e3662af4d5c72c8120ed637577fc3db721667221ebfddd3fef40c6e80f35d3582a81d25895f61fef6badaf3bb1d392d5a5597c7e2b9176ce2103
+  data.tar.gz: 6a7fbf18e8a691e115b7d0cbcbd42eb208814f89faf29d853a05ebc3a15ee6157f681b11677a687c61e3d4df9eda0a50b6252c4e3e3f8718a613c46de5058ed1

data/cucumber.yml

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

data/features/builder.feature

@@ -41,7 +41,7 @@ Feature: Builder
 
   Scenario: Build empty errors
     Given a built app at "empty-app"
-    Then was not successfully built
+    Then the exit status should be 1
 
   Scenario: Build external_pipeline errors
     Given a built app at "external-pipeline-error"

data/features/chained_templates.feature

@@ -7,13 +7,6 @@ Feature: Templates should be chainable
     Then I should see "Title</h1>"
     And I should see "Subtitle</h2>"
     And I should see "Sup</h3>"
-    When I go to "/stylesheets/main.css"
-
-  Scenario: Scss file in Erb
-    Given the Server is running at "chained-app"
-    When I go to "/stylesheets/main.css"
-    Then I should see "color: from_main;"
-    And I should see "background: from_sub;"
 
   Scenario: Build chained template
     Given a successfully built app at "chained-app"

data/features/coffee-script.feature

@@ -1,5 +1,5 @@
 Feature: Support coffee-script
-  In order to offer an alternative when writing JavaScript
+  In order to offer an alternative when writing Javascript
 
   Scenario: Rendering coffee script
     Given the Server is running at "coffeescript-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/console.feature

@@ -2,7 +2,7 @@ Feature: Console
 
   Scenario: Enter and exit the console
     Given a fixture app "large-build-app"
-    When I run the interactive middleman console
+    When I run `middleman console` interactively
     And I type "puts 'Hello from the console.'"
     And I type "exit"
     Then it should pass with:

data/features/data.feature

@@ -18,6 +18,37 @@ Feature: Local Data API
     When I go to "/data.html"
     Then I should see "No Test Data"
 
+  Scenario: Numeric keys in YAML
+    Given the Server is running at "basic-data-app"
+    When the file "data/by_year.yml" has the contents
+      """
+      -
+        2018: 1
+        2019: 2
+      """
+    And the file "source/years.html.erb" has the contents
+      """
+        <%= data.by_year.first[2018] %>:<%= data.by_year.first[2019] %>
+      """
+    When I go to "/years.html"
+    Then I should see "1:2"
+
+  Scenario: Date keys in YAML
+    Given the Server is running at "basic-data-app"
+    When the file "data/dates.yml" has the contents
+      """
+      2016-03-25:
+        title: "1"
+      2018-03-25:
+        title: "2"
+      """
+    And the file "source/years.html.erb" has the contents
+      """
+        <%= data.dates.values.map(&:title).join(":") %>
+      """
+    When I go to "/years.html"
+    Then I should see "1:2"
+
   Scenario: Rendering json
     Given the Server is running at "basic-data-app"
     When I go to "/data3.html"

data/features/extension_api_deprecations.feature

@@ -1,7 +1,9 @@
 Feature: Extension author could use some hooks
 
   Scenario: When build
-    Given a successfully built app at "extension-api-deprecations-app"
+    Given a fixture app "extension-api-deprecations-app"
+    When I run `middleman build`
+    Then the exit status should be 0
     And the output should contain "`set :layout` is deprecated"
     And the file "build/index.html" should contain "In Index"
     And the file "build/index.html" should not contain "In Layout"

data/features/extension_hooks.feature

@@ -1,7 +1,9 @@
 Feature: Extension author could use some hooks
 
   Scenario: When build
-    Given a successfully built app at "extension-hooks-app"
+    Given a fixture app "extension-hooks-app"
+    When I run `middleman build`
+    Then the exit status should be 0
     And the output should contain "/// after_configuration ///"
     And the output should contain "/// ready ///"
     And the output should contain "/// before_build ///"

data/features/helpers_external.feature

@@ -9,20 +9,4 @@ Feature: Helpers in external files
     Given the Server is running at "external-helpers"
     Then going to "/automatic.html" should not raise an exception
     And I should see "One:Two:Three:Four"
-
-  Scenario: Automatic Helpers Reload
-    Given the Server is running at "external-helpers"
-    Then going to "/automatic.html" should not raise an exception
-    And I should see "One:Two:Three:Four"
-
-    When the file "helpers/one_helper.rb" has the contents
-      """
-      module OneHelper
-        def one
-          'Won'
-        end
-      end
-      """
-    When the Server is reloaded
-    Then going to "/automatic.html" should not raise an exception
-    And I should see "Won:Two:Three:Four"
+    

data/features/i18n_link_to.feature

@@ -34,8 +34,6 @@ Feature: i18n Paths
       <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
       <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
       <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
-      <%= link_to "Current Foobar", "/foobar.html", class: 'current' %>
-      <%= link_to "Other Foobar", "/foobar.html", title: "Other Foobar", locale: ::I18n.locale == :en ? :es : :en %>
 
       <% data.pages.each_with_index do |p, i| %>
         <%= link_to "Current #{p}", "/#{p}", class: 'current' %>
@@ -44,14 +42,6 @@ Feature: i18n Paths
         <% link_to "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
       <% end %>
       """
-    And a file named "source/localizable/foobar.en.html.erb" with:
-      """
-      English foobar
-      """
-    And a file named "source/localizable/foobar.es.html.erb" with:
-      """
-      Spanish foobar
-      """
     And a file named "config.rb" with:
       """
       set :strip_index_file, false
@@ -68,8 +58,6 @@ Feature: i18n Paths
     Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
     Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
     Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
-    Then I should see '<a href="/foobar.html" class="current">Current Foobar</a>'
-    Then I should see '<a href="/es/foobar.html" title="Other Foobar">Other Foobar</a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
     Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
@@ -80,8 +68,6 @@ Feature: i18n Paths
     Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
     Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
     Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
-    Then I should see '<a href="/es/foobar.html" class="current">Current Foobar</a>'
-    Then I should see '<a href="/foobar.html" title="Other Foobar">Other Foobar</a>'
 
   Scenario: link_to is i18n aware and supports relative_links
     Given a fixture app "empty-app"
@@ -176,7 +162,6 @@ Feature: i18n Paths
       es:
         paths:
           hello: "hola"
-          form: "formulario"
         msg: Hola
       """
     And a file named "source/localizable/hello.html.erb" with:
@@ -187,10 +172,6 @@ Feature: i18n Paths
         Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
       <% end %>
       """
-    And a file named "source/localizable/form.html.erb" with:
-      """
-      Other: <%= url_for "/form.html", query: { foo: 'bar' }, fragment: "deep", locale: ::I18n.locale == :en ? :es : :en %>
-      """
     And a file named "source/localizable/article.html.erb" with:
       """
       Page Lang: Default
@@ -218,10 +199,6 @@ Feature: i18n Paths
     Then I should see "Page: Hola"
     Then I should see 'Current: /es/hola.html'
     Then I should see 'Other: /hello.html'
-    When I go to "/form.html"
-    Then I should see 'Other: /es/formulario.html?foo=bar#deep'
-    When I go to "/es/formulario.html"
-    Then I should see 'Other: /form.html?foo=bar#deep'
     When I go to "/article.html"
     Then I should see "Page Lang: Default"
     Then I should see 'Current: /article.html'

data/features/i18n_mixed_sources.feature

@@ -37,11 +37,3 @@ 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/i18n_preview.feature

@@ -32,10 +32,6 @@ Feature: i18n Preview
     Then I should see "Buenos días"
     When I go to "/es/una.html"
     Then I should see "Solamente una"
-    When I go to "/terms-and-conditions.html"
-    Then I should see "Terms & Conditions"
-    When I go to "/es/terms-and-conditions.html"
-    Then I should see "Condiciones Generales"
 
   Scenario: A template changes i18n during preview
     Given a fixture app "i18n-test-app"
@@ -253,29 +249,4 @@ Feature: i18n Preview
     Then I should see "More"
     When I go to "/es/"
     Then I should see "Como Esta?"
-    Then I should see "Mucho"
-
-  Scenario: Proxy to localized pages.
-    Given a fixture app "i18n-default-app"
-    And a file named "config.rb" with:
-      """
-      langs = [:en, :es]
-      activate :i18n, mount_at_root: false, langs: langs
-
-      ["Tom", "Jen"].each do |name|
-        langs.each do |lang|
-          proxy "/#{lang}/people/#{name.downcase}.html", "/name.html", locals: { name: name }, locale: lang, ignore: true
-        end
-      end
-      """
-    Given the Server is running at "i18n-default-app"
-    When I go to "/name.html"
-    Then I should see "File Not Found"
-    When I go to "/en/people/tom.html"
-    Then I should see "Howdy Tom"
-    When I go to "/en/people/jen.html"
-    Then I should see "Howdy Jen"
-    When I go to "/es/people/tom.html"
-    Then I should see "Como Esta? Tom"
-    When I go to "/es/people/jen.html"
-    Then I should see "Como Esta? Jen"
+    Then I should see "Mucho"

data/features/ignore.feature

@@ -7,12 +7,11 @@ Feature: Ignoring paths
       ignore 'plain.html'
       """
     And a successfully built app at "ignore-app"
-    When I cd to "build"
     Then the following files should exist:
-      | index.html |
+      | build/index.html |
     And the following files should not exist:
-      | plain.html |
-      | about.html |
+      | build/plain.html |
+      | build/about.html |
 
   Scenario: Ignore a single path (server)
     Given a fixture app "ignore-app"
@@ -67,17 +66,16 @@ Feature: Ignoring paths
       ignore 'images/**/*.png'
       """
     And a successfully built app at "ignore-app"
-    When I cd to "build"
     Then the following files should exist:
-      | plain.html |
-      | images/portrait.jpg |
-      | images/pic.png |
+      | build/plain.html |
+      | build/images/portrait.jpg |
+      | build/images/pic.png |
     And the following files should not exist:
-      | about.html |
-      | index.html |
-      | reports/index.html |
-      | reports/another.html |
-      | images/icons/messages.png |
+      | build/about.html |
+      | build/index.html |
+      | 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"
@@ -150,57 +148,3 @@ Feature: Ignoring paths
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
     Then I should see "File Not Found"
-
-  Scenario: Ignore localized templates (build)
-    Given a fixture app "i18n-test-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n
-      ignore 'localizable/hello.html.erb'
-      ignore /morning/
-      ignore 'localizable/*.md'
-      """
-    And a successfully built app at "i18n-test-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | es/index.html |
-    And the following files should not exist:
-      | hello.html |
-      | morning.html |
-      | one.html |
-      | es/hola.html |
-      | es/manana.html |
-      | es/una.html |
-      | es/hello.html |
-      | es/morning.html |
-      | es/one.html |
-    And the file "index.html" should contain "Howdy"
-    And the file "es/index.html" should contain "Como Esta?"
-
-  Scenario: Ignore localized templates (server)
-    Given a fixture app "i18n-test-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n
-      ignore 'localizable/hello.html.erb'
-      ignore /morning/
-      ignore 'localizable/*.md'
-      """
-    And the Server is running
-    When I go to "/index.html"
-    Then I should not see "File Not Found"
-    When I go to "/es/index.html"
-    Then I should not see "File Not Found"
-    When I go to "/hello.html"
-    Then I should see "File Not Found"
-    When I go to "/morning.html"
-    Then I should see "File Not Found"
-    When I go to "/one.html"
-    Then I should see "File Not Found"
-    When I go to "/es/hola.html"
-    Then I should see "File Not Found"
-    When I go to "/es/manana.html"
-    Then I should see "File Not Found"
-    When I go to "/es/una.html"
-    Then I should see "File Not Found"

data/features/ignore_already_minified.feature

@@ -1,4 +1,4 @@
-Feature: CSS and JavaScripts which are minify shouldn't be re-minified
+Feature: CSS and Javascripts which are minify shouldn't be re-minified
 
   Scenario: JS files containing ".min" should not be re-compressed
     Given an empty app

data/features/markdown.feature

@@ -6,6 +6,7 @@ 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/minify_javascript.feature

@@ -1,4 +1,4 @@
-Feature: Minify JavaScript
+Feature: Minify Javascript
   In order reduce bytes sent to client and appease YSlow
 
   Scenario: Rendering inline js with the feature disabled
@@ -19,23 +19,23 @@ Feature: Minify JavaScript
       })();
     </script>
     <script>
-    ;(function() {
-      this;
-      should();
-      too();
-    })();
+      ;(function() {
+        this;
+        should();
+        too();
+      })();
     </script>
     <script type='text/javascript'>
-    //<!--
-    ;(function() {
-      one;
-      line();
-      here();
-    })();
-    //-->
+      //<!--
+      ;(function() {
+        one;
+        line();
+        here();
+      })();
+      //-->
     </script>
     <script type='text/html'>
-    I'm a jQuery {{template}}.
+      I'm a jQuery {{template}}.
     </script>
     """
 
@@ -66,23 +66,23 @@ Feature: Minify JavaScript
       })();
     </script>
     <script>
-    ;(function() {
-      this;
-      should();
-      too();
-    })();
+      ;(function() {
+        this;
+        should();
+        too();
+      })();
     </script>
     <script type='text/javascript'>
-    //<!--
-    ;(function() {
-      one;
-      line();
-      here();
-    })();
-    //-->
+      //<!--
+      ;(function() {
+        one;
+        line();
+        here();
+      })();
+      //-->
     </script>
     <script type='text/html'>
-    I'm a jQuery {{template}}.
+      I'm a jQuery {{template}}.
     </script>
     """
 
@@ -108,15 +108,15 @@ Feature: Minify JavaScript
       Hello
     </script>
     <script>
-    Hello
+      Hello
     </script>
     <script type='text/javascript'>
-    //<!--
+      //<!--
     Hello
-    //-->
+      //-->
     </script>
     <script type='text/html'>
-    I'm a jQuery {{template}}.
+      I'm a jQuery {{template}}.
     </script>
     """
 
@@ -134,15 +134,15 @@ Feature: Minify JavaScript
       !function(){should(),all.be(),on={one:line}}();
     </script>
     <script>
-    !function(){should(),too()}();
+      !function(){should(),too()}();
     </script>
     <script type='text/javascript'>
-    //<!--
+      //<!--
     !function(){one,line(),here()}();
-    //-->
+      //-->
     </script>
     <script type='text/html'>
-    I'm a jQuery {{template}}.
+      I'm a jQuery {{template}}.
     </script>
     """
 

data/features/mount_rack.feature

@@ -1,4 +1,3 @@
-@wip
 Feature: Support Rack apps mounted using map
 
   Scenario: Mounted Rack App at /sinatra

data/features/page-id.feature

@@ -11,7 +11,7 @@ Feature: Page IDs
     And I should see 'URL5: <a href="/implicit.html">Imp</a>'
     And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
     And I should see 'URL7: <a href="/feed.xml">Feed</a>'
-    And I should see "URL8: /forty-two.html"
+    And I should see "URL8: /fourty-two.html"
 
     When I go to "/fm.html"
     Then I should see "I am: frontmatter"
@@ -46,7 +46,7 @@ Feature: Page IDs
     And I should see "URL2: /2.html"
     And I should see 'URL3: <a href="/3.html">Hi</a>'
     And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
-    And I should see "URL8: /forty-two.html"
+    And I should see "URL8: /fourty-two.html"
     And I should see 'URL9: <a href="/implicit.html">Imp</a>'
     And I should see 'URL10: <a href="/folder/foldern.html">Foldern</a>'
     And I should see 'URL11: <a href="/feed.xml">Feed</a>'

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 vars are 'foo', 'bar' and 'baz'"
+    Then I should see "Local var is bar"
 
   Scenario: Partial and Layout use different engines
     Given the Server is running at "different-engine-partial"

data/features/relative_assets_helpers_only.feature

@@ -1,12 +1,13 @@
 Feature: Relative Assets (Helpers Only)
 
+  @wip
   Scenario: Rendering css with the feature enabled
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
       """
       activate :relative_assets, helpers_only: true
       """
-    And a file named "source/stylesheets/relative_assets_helper.css.sass.erb" with:
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
       """
       h1
         background: url("<%= asset_url('images/blank.gif') %>")
@@ -38,7 +39,7 @@ Feature: Relative Assets (Helpers Only)
       }
       """
     And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets_helper.css"
+    When I go to "/stylesheets/relative_assets.css"
     Then I should see 'url("../images/blank.gif'
     And I should see 'url("../images/blank2.gif'
     When I go to "/javascripts/application.js"
@@ -88,6 +89,7 @@ Feature: Relative Assets (Helpers Only)
     When I go to "/sub/image_tag.html"
     Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
 
+  @wip
   Scenario: URLs are not rewritten for rewrite ignored paths
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
@@ -96,7 +98,7 @@ Feature: Relative Assets (Helpers Only)
         '/stylesheets/fonts3.css',
       ], helpers_only: true
       """
-    And a file named "source/stylesheets/relative_assets_helper.css.sass.erb" with:
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
       """
       h1
         background: url("<%= asset_url('images/blank.gif') %>")
@@ -117,7 +119,7 @@ Feature: Relative Assets (Helpers Only)
       }
       """
     And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets_helper.css"
+    When I go to "/stylesheets/relative_assets.css"
     Then I should see 'url("../images/blank.gif'
     When I go to "/stylesheets/fonts3.css"
     Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'

data/features/scss-support.feature

@@ -9,4 +9,9 @@ Feature: Support SCSS Syntax
  Scenario: Rendering scss
    Given the Server is running at "scss-app"
    When I go to "/stylesheets/layout.css"
-   Then I should see "html"
+   Then I should see "html"
+
+ Scenario: Rendering scss errors
+   Given the Server is running at "scss-app"
+   When I go to "/stylesheets/error.css"
+   Then I should see "Error:"

data/features/support/env.rb

@@ -1,15 +1,15 @@
-ENV['TEST'] = 'true'
+ENV["TEST"] = "true"
 
-require 'backports/latest'
 require 'sassc'
 
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-# Capybara.server = :webrick
+require 'coveralls'
+Coveralls.wear!
 
-require 'simplecov'
-SimpleCov.start
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')

data/features/tilde_directories.feature

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