middleman-core 3.3.12 → 4.4.2

data/features/cache_buster.feature

@@ -5,7 +5,7 @@ Feature: Generate mtime-based query string for busting browser caches
     Given "cache_buster" feature is "disabled"
     And the Server is running at "cache-buster-app"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "blank.gif'"
+    Then I should see 'blank.gif"'
     
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"
@@ -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/chained_templates.feature

@@ -7,16 +7,19 @@ Feature: Templates should be chainable
     Then I should see "Title</h1>"
     And I should see "Subtitle</h2>"
     And I should see "Sup</h3>"
-    
+
   Scenario: Build chained template
     Given a successfully built app at "chained-app"
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-
+      | test.erb.combobreaker                         |
     And the file "index.html" should contain "Title</h1>"
     And the file "index.html" should contain "Subtitle</h2>"
     And the file "index.html" should contain "Sup</h3>"
+    And the file "test.erb.combobreaker" should contain "Title</h1>"
+    And the file "test.erb.combobreaker" should contain "Subtitle</h2>"
+    And the file "test.erb.combobreaker" should contain "Sup</h3>"
 
   Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb
     Given a fixture app "partial-chained_templates-app"
@@ -29,7 +32,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.md.erb" with:
     """
     ## My Partial
-    
+
     <%= 'hello world' %>
     """
     And the Server is running
@@ -58,7 +61,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.md.erb" with:
     """
     ## My Partial
-    
+
     <%= 'hello world' %>
     """
     And the Server is running
@@ -87,7 +90,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.erb" with:
     """
     <h2>My Partial</h2>
-    
+
     <%= 'hello world' %>
     """
     And the Server is running

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:
@@ -42,3 +58,21 @@ Feature: Build Clean
     Then the following files should not exist:
       | sub/dir/about.html         |
       | sub/dir/nested/nested.html |
+
+  Scenario: Build and clean an app under a hidden directory
+    Given a fixture app "clean-app"
+    And app "clean-app" is using config "hidden-dir-before"
+    And a built app at "clean-app"
+    Then the following files should exist:
+      | .build/index.html              |
+      | .build/should_be_ignored.html  |
+      | .build/should_be_ignored2.html |
+      | .build/should_be_ignored3.html |
+    Given app "clean-app" is using config "hidden-dir-after"
+    And a built app at "clean-app"
+    Then the following files should exist:
+      | .build/index.html              |
+    And the following files should not exist:
+      | .build/should_be_ignored.html  |
+      | .build/should_be_ignored2.html |
+      | .build/should_be_ignored3.html |

data/features/collections.feature

@@ -0,0 +1,265 @@
+Feature: Collections
+  Scenario: Lazy query
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      articles1 = collection :articles1, resources.select { |r|
+        matcher = ::Middleman::Util::UriTemplates.uri_template('blog1/{year}-{month}-{day}-{title}.html')
+        ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url))
+      }
+
+      everything = resources.select do |r|
+        true
+      end
+
+      def get_tags(resource)
+        if resource.data.tags.is_a? String
+          resource.data.tags.split(',').map(&:strip)
+        else
+          resource.data.tags
+        end
+      end
+
+      def group_lookup(resource, sum)
+        results = Array(get_tags(resource)).map(&:to_s).map(&:to_sym)
+
+        results.each do |k|
+          sum[k] ||= []
+          sum[k] << resource
+        end
+      end
+
+      tags = everything
+          .select { |resource| resource.data.tags }
+          .each_with_object({}, &method(:group_lookup))
+
+      class Wrapper
+        attr_reader :stuff
+
+        def initialize
+          @stuff = Set.new
+        end
+
+        def <<((k, v))
+          @stuff << k
+          self
+        end
+      end
+
+      collection :wrapped, tags.reduce(Wrapper.new, :<<)
+
+      set :tags, tags # Expose to templates
+
+      collection :first_tag, tags.keys.sort.first
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      <% collection(:articles1).each do |article| %>
+        Article1: <%= article.data.title %>
+      <% end %>
+
+      Tag Count: <%= collection(:wrapped).stuff.length %>
+
+      <% config[:tags].value.each do |k, items| %>
+        Tag: <%= k %> (<%= items.length %>)
+        <% items.each do |article| %>
+          Article (<%= k %>): <%= article.data.title %>
+        <% end %>
+      <% end %>
+
+      First Tag: <%= collection(:first_tag) %>
+      """
+    Given the Server is running at "collections-app"
+    When I go to "index.html"
+    Then I should see 'Article1: Blog1 Newer Article'
+    And I should see 'Article1: Blog1 Another Article'
+    And I should see 'Tag: foo (4)'
+    And I should see 'Article (foo): Blog1 Newer Article'
+    And I should see 'Article (foo): Blog1 Another Article'
+    And I should see 'Article (foo): Blog2 Newer Article'
+    And I should see 'Article (foo): Blog2 Another Article'
+    And I should see 'Tag: bar (2)'
+    And I should see 'Article (bar): Blog1 Newer Article'
+    And I should see 'Article (bar): Blog2 Newer Article'
+    And I should see 'Tag: 120 (1)'
+    And I should see 'Article (120): Blog1 Another Article'
+    And I should see 'First Tag: 120'
+    And I should see 'Tag Count: 3'
+
+  Scenario: Collected resources update with file changes
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      collection :articles, resources.select { |r|
+        matcher = ::Middleman::Util::UriTemplates.uri_template('blog2/{year}-{month}-{day}-{title}.html')
+        ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url))
+      }
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      <% collection(:articles).each do |article| %>
+        Article: <%= article.data.title || article.file_descriptor[:relative_path] %>
+      <% end %>
+      """
+    Given the Server is running at "collections-app"
+    When I go to "index.html"
+    Then I should not see "Article: index.html.erb"
+    Then I should see 'Article: Blog2 Newer Article'
+    And I should see 'Article: Blog2 Another Article'
+
+    And the file "source/blog2/2011-01-02-another-article.html.markdown" has the contents
+      """
+      ---
+      title: "Blog3 Another Article"
+      date: 2011-01-02
+      tags:
+        - foo
+      ---
+
+      Another Article Content
+
+      """
+    When I go to "index.html"
+    Then I should see "Article: Blog2 Newer Article"
+    And I should not see "Article: Blog2 Another Article"
+    And I should see 'Article: Blog3 Another Article'
+
+    And the file "source/blog2/2011-01-01-new-article.html.markdown" is removed
+    When I go to "index.html"
+    Then I should not see "Article: Blog2 Newer Article"
+    And I should see 'Article: Blog3 Another Article'
+
+    And the file "source/blog2/2014-01-02-yet-another-article.html.markdown" has the contents
+      """
+      ---
+      title: "Blog2 Yet Another Article"
+      date: 2011-01-02
+      tags:
+        - foo
+      ---
+
+      Yet Another Article Content
+      """
+    When I go to "index.html"
+    And I should see 'Article: Blog3 Another Article'
+    And I should see 'Article: Blog2 Yet Another Article'
+
+  Scenario: Work with local helpers
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      module TestHelper
+        def help_me
+          "ok"
+        end
+      end
+
+      include TestHelper
+
+      data.articles.each_with_index do |a, i|
+        proxy "/#{i}-#{help_me}.html", a
+      end
+      """
+    And a file named "data/articles.yaml" with:
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-02-another-article.html"
+      """
+    Given the Server is running at "collections-app"
+    When I go to "0-ok.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1-ok.html"
+    Then I should see 'Another Article Content'
+
+  Scenario: Collected data update with file changes
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      data.articles.each_with_index do |a, i|
+        proxy "/#{i}.html", a
+      end
+      """
+    And a file named "data/articles.yaml" with:
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-02-another-article.html"
+      """
+    Given the Server is running at "collections-app"
+    When I go to "0.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1.html"
+    Then I should see 'Another Article Content'
+    When I go to "2.html"
+    Then I should see 'Not Found'
+
+    When the file "data/articles.yaml" has the contents
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      """
+    When I go to "0.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1.html"
+    Then I should see 'Not Found'
+    When I go to "2.html"
+    Then I should see 'Not Found'
+
+    When the file "data/articles.yaml" has the contents
+      """
+      ---
+      - "/blog2/2011-01-02-another-article.html"
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-01-new-article.html"
+      """
+    When I go to "0.html"
+    Then I should see 'Another Article Content'
+    When I go to "1.html"
+    Then I should see 'Newer Article Content'
+    When I go to "2.html"
+    Then I should see 'Again'
+
+  Scenario: Arbitrary live datasets
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      ignore "/description_template.html"
+
+      live {
+        Dir[File.join(root, "descriptions/*.txt")]
+      }.each do |description_name|
+        base = File.basename(description_name, '.txt')
+        proxy "#{base}.html", "/description_template.html", locals: {
+          contents: File.read(description_name)
+        }
+      end
+      """
+    And a file named "source/description_template.html.erb" with:
+      """
+      <%= contents %>
+      """
+    And a file named "descriptions/test1.txt" with:
+      """
+      Test1
+      """
+    Given the Server is running at "collections-app"
+    When I go to "test1.html"
+    Then I should see 'Test1'
+    When I go to "test2.html"
+    Then I should see 'Not Found'
+
+    When the file "descriptions/test2.txt" has the contents
+      """
+      Test2
+      """
+    When I go to "test1.html"
+    Then I should see 'Test1'
+    When I go to "test2.html"
+    Then I should see 'Test2'
+
+    When the file "descriptions/test1.txt" is removed
+    When I go to "test1.html"
+    Then I should see 'Not Found'
+    When I go to "test2.html"
+    Then I should see 'Test2'

data/features/console.feature

@@ -1,8 +1,9 @@
 Feature: Console
 
   Scenario: Enter and exit the console
-    Given I run `middleman console` interactively
-    When I type "puts 'Hello from the console.'"
+    Given a fixture app "large-build-app"
+    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/content_type.feature

@@ -19,8 +19,8 @@ Feature: Setting the right content type for files
     Given a fixture app "content-type-app"
     And a file named "config.rb" with:
     """
-    page "README", :content_type => 'text/awesome'
-    proxy "bar", "index.html", :content_type => 'text/custom'
+    page "README", content_type: 'text/awesome'
+    proxy "bar", "index.html", content_type: 'text/custom'
     proxy "foo", "README" # auto-delegate to target content type
     """
     And the Server is running at "content-type-app"

data/features/custom_layouts.feature

@@ -1,26 +1,38 @@
 Feature: Custom layouts
   In order easily switch between relative and absolute paths
-  
+
   Scenario: Using custom :layout attribute
-    Given page "/custom-layout.html" has layout "custom"
-    And the Server is running at "custom-layout-app2"
-    When I go to "/custom-layout.html"
-    Then I should see "Custom Layout"
-    
-  Scenario: Using with_layout block
-    Given "/custom-layout.html" with_layout block has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout.html', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
 
-  Scenario: Using with_layout block with globs
-    Given "/custom-*" with_layout block has layout "custom"
+  Scenario: Using custom :layout attribute with proxy
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/test/*', layout: :custom
+      proxy "/test/me.html", "/custom-layout.html"
+      live { %w(you) }.each do |who|
+        proxy "/test/#{who}.html", "/custom-layout.html"
+      end
+      """
     And the Server is running at "custom-layout-app2"
-    When I go to "/custom-layout.html"
+    When I go to "/test/me.html"
+    Then I should see "Custom Layout"
+    When I go to "/test/you.html"
     Then I should see "Custom Layout"
-    
+
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir/" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir/', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -28,9 +40,13 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-    
+
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -38,9 +54,13 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-    
+
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir/index.html" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir/index.html', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -48,7 +68,7 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-  
+
   Scenario: Setting layout inside a matching page block
     Given the Server is running at "page-helper-layout-block-app"
     When I go to "/index.html"
@@ -61,4 +81,4 @@ Feature: Custom layouts
     When I go to "/path/index.html"
     Then I should see "Alt"
     And I should see "Monde"
-    And I should not see "Hello"
+    And I should not see "Hello"

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"
@@ -51,3 +82,30 @@ Feature: Local Data API
     Then I should see "title1:Hello"
     Then I should see "title2:More"
     Then I should see "title3:Stuff"
+
+  Scenario: Using data postscript
+    Given the Server is running at "nested-data-app"
+    When I go to "/extracontent.html"
+    Then I should see "<h1>With Content</h1>"
+    Then I should see '<h2 id="header-2">Header 2</h2>'
+    Then I should see "<p>Paragraph 1</p>"
+
+  Scenario: Rendering toml
+    Given the Server is running at "basic-data-app"
+    When I go to "/data4.html"
+    Then I should see "One:Two"
+    When the file "data/test3.toml" has the contents
+      """
+      [titles]
+
+      [titles.first]
+        title = "Three"
+
+      [titles.second]
+        title = "Four"
+      """
+    When I go to "/data4.html"
+    Then I should see "Three:Four"
+    When the file "data/test3.toml" is removed
+    When I go to "/data4.html"
+    Then I should see "No Test Data"

data/features/default-layout.feature

@@ -0,0 +1,90 @@
+Feature: Describe which files get layouts
+
+  Background:
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      page "/about.html", layout: :layout2
+      """
+    And a file named "source/layouts/layout.erb" with:
+      """
+      In Layout
+      <%= yield %>
+      """
+    And a file named "source/layouts/layout2.erb" with:
+      """
+      <root>
+        <title>Second Layout</title>
+        <%= yield %>
+      </root>
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      In Index
+      """
+    And a file named "source/about.html.erb" with:
+      """
+      In About
+      """
+    And a file named "source/style.css.scss" with:
+      """
+      html { border: 1; }
+      """
+    And a file named "source/style2.scss" with:
+      """
+      html { border: 2; }
+      """
+    And a file named "source/data.json" with:
+      """
+      { "hello": "world" }
+      """
+    And a file named "source/script.js" with:
+      """
+      helloWorld();
+      """
+    And a file named "source/test.xml.erb" with:
+      """
+      ---
+      layout: layout2
+      ---
+
+      <test>Hi</test>
+      """
+    And the Server is running at "empty_app"
+
+  Scenario: Normal Template
+    When I go to "/index.html"
+    Then I should see "In Index"
+    And I should see "In Layout"
+
+  Scenario: Normal Template with override
+    When I go to "/about.html"
+    Then I should see "In About"
+    And I should see "Second Layout"
+    And I should not see "In Layout"
+
+  Scenario: Sass
+    When I go to "/style.css"
+    Then I should see "border: 1"
+    And I should not see "In Layout"
+
+  Scenario: Sass with extension
+    When I go to "/style2"
+    Then I should see "border: 2"
+    And I should not see "In Layout"
+
+  Scenario: JSON
+    When I go to "/data.json"
+    Then I should see "hello"
+    And I should not see "In Layout"
+
+  Scenario: JS
+    When I go to "/script.js"
+    Then I should see "helloWorld()"
+    And I should not see "In Layout"
+
+  Scenario: XML
+    When I go to "/test.xml"
+    Then I should see "<test>Hi</test>"
+    And I should see "<title>Second Layout</title>"
+

data/features/default_alt_tag.feature

@@ -0,0 +1,11 @@
+Feature: Add an empty alt tag for images that don't have alt tags specified
+
+  Scenario: Image does not have alt tag specified
+    Given the Server is running at "default-alt-tags-app"
+    When I go to "/empty-alt-tag.html"
+    Then I should see 'alt=""'
+
+  Scenario: Image has alt tag specified
+    Given the Server is running at "default-alt-tags-app"
+    When I go to "/meaningful-alt-tag.html"
+    Then I should see 'alt="Meaningful alt text"'