middleman-core 4.0.0.alpha.2 → 4.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cdf5b5b1dd7eb3048ca5c047e4f322d65f7d75
-  data.tar.gz: abc48d95a84f5ea6f0956720d14cd89a2f8afb6b
+  metadata.gz: df87c14bd46ecb73f2fbfe74a09b83089bdac09a
+  data.tar.gz: 1e56eb3b6eee26c9b679db3eabde8a8f7a1fa6b4
 SHA512:
-  metadata.gz: aec26562a300ff23b4a95b99fa81d7b066813a716b0388ab268437844e0ddef14d96646e897d4705f6b70b011497937b7874b99eb37b910a691439b6840f82a6
-  data.tar.gz: 76178784355c104abe232162ae142c6269d496eed682b0d4485e55f6102d91798524b22570a9a26e4871858e3c05375f44b1a43f84122ab2e230d6e37a276cc7
+  metadata.gz: c843a53d609564f5395f22c2d4ea4b52902a7e69fa3073c7d6dde9ca198bb2b9f0973eb37925bbc99e208cc04b84f831827787fda641f58ef092a88b88876109
+  data.tar.gz: 17ab0af69079b461b116e942f09d6143a556071ebc7189de70d6b57d111fa4c214a27cdeccb77f2774b1c0522ca2992c64c2277dbf50850b48433a4432788c82

data/features/asset_hash.feature

@@ -1,5 +1,5 @@
 Feature: Assets get a file hash appended to their and references to them are updated
-  Scenario: Hashed-asset files are produced, and HTML, CSS, and JavaScript gets rewritten to reference the new files
+  Scenario: Hashed-asset files are produced, and HTML, CSS, JSON and JavaScript gets rewritten to reference the new files
     Given a successfully built app at "asset-hash-app"
     When I cd to "build"
     Then the following files should exist:
@@ -8,12 +8,16 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | favicon.ico |
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
+      | images/200px-c11eb203.jpg |
+      | images/300px-59adce76.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-1d8d5276.js |
       | stylesheets/site-7474cadd.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
+      | api.json |
+      | subdir/api.json |
     And the following files should not exist:
       | images/100px.png |
       | images/100px.jpg |
@@ -31,11 +35,20 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
     And the file "subdir/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
+    And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
+    And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"'
+    And the file "index.html" should contain 'src="images/100px-1242c368.png"'
     And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     And the file "other/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
+    And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
+    And the file "api.json" should contain 'images/100px-5fd6fb90.jpg'
+    And the file "api.json" should contain 'images/100px-1242c368.png'
+    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.gif'
+    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg'
+    And the file "subdir/api.json" should contain 'images/100px-1242c368.png'
 
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
@@ -44,6 +57,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And I should see 'href="stylesheets/site-7474cadd.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
+    And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
     When I go to "/subdir/"
     Then I should see 'href="../stylesheets/site-7474cadd.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
@@ -55,10 +69,15 @@ Feature: Assets get a file hash appended to their and references to them are upd
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
     When I go to "/stylesheets/site-7474cadd.css"
-    Then I should see:
-      """
-      background-image: url("../images/100px-5fd6fb90.jpg")
-      """
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    When I go to "/api.json"
+    Then I should see 'images/100px-5fd6fb90.gif'
+    And I should see 'images/100px-5fd6fb90.jpg'
+    And I should see 'images/100px-1242c368.png'
+    When I go to "/subdir/api.json"
+    Then I should see 'images/100px-5fd6fb90.gif'
+    And I should see 'images/100px-5fd6fb90.jpg'
+    And I should see 'images/100px-1242c368.png'
 
   Scenario: Enabling an asset host still produces hashed files and references
     Given the Server is running at "asset-hash-host-app"
@@ -71,9 +90,6 @@ Feature: Assets get a file hash appended to their and references to them are upd
     When I go to "/other/"
     Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    # Asset helpers don't appear to work from Compass right now
-    # When I go to "/stylesheets/site-e5a31a3e.css"
-    # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
 
   Scenario: The asset hash should change when a SASS partial changes
     Given the Server is running at "asset-hash-app"
@@ -138,6 +154,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | index.html |
       | subdir/index.html |
       | other/index.html |
+      | api.json |
+      | subdir/api.json |
     And the following files should not exist:
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |

data/features/chained_templates.feature

@@ -16,4 +16,91 @@ Feature: Templates should be chainable
 
     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 "index.html" 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"
+    And a template named "my_template.html.erb" with:
+    """
+    <h1>My Template</h1>
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.md.erb" with:
+    """
+    ## My Partial
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1>My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2 id="my-partial">My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """
+
+  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb and inner .md.erb
+    Given a fixture app "partial-chained_templates-app"
+    And a template named "my_template.html.md.erb" with:
+    """
+    # My Template
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.md.erb" with:
+    """
+    ## My Partial
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1 id="my-template">My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2 id="my-partial">My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """
+
+  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb, and inner .erb
+    Given a fixture app "partial-chained_templates-app"
+    And a template named "my_template.html.md.erb" with:
+    """
+    # My Template
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.erb" with:
+    """
+    <h2>My Partial</h2>
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1 id="my-template">My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2>My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """

data/features/cli_init.feature

@@ -37,21 +37,3 @@ Feature: Middleman CLI
   Scenario: Create a new project (alias n)
     When I run `middleman n MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
-
-  # Scenario: Create a new HTML5 project
-  #   When I run `middleman init MY_PROJECT --template=html5`
-  #   Then a directory named "MY_PROJECT" should exist
-  #   When I cd to "MY_PROJECT"
-  #   Then the following files should exist:
-  #     | config.rb                                     |
-  #     | Gemfile                                       |
-  #   Then the following files should not exist:
-  #     | config.ru                                     |
-  #   And the file "config.rb" should contain "set :js_dir, 'js'"
-  #   Then a directory named "source" should exist
-  #   When I cd to "source"
-  #   Then the following files should exist:
-  #     | index.html.erb                                |
-  #     | layouts/layout.erb                            |
-  #     | humans.txt                                    |
-  #     | js/main.js                                    |

data/features/collections.feature

@@ -0,0 +1,145 @@
+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.source_file[: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'

data/features/console.feature

@@ -0,0 +1,11 @@
+Feature: Console
+
+  Scenario: Enter and exit 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:
+    """
+    Hello from the console.
+    """

data/features/front-matter.feature

@@ -18,6 +18,17 @@ Feature: YAML Front Matter
     Then I should see "<?php"
     Then I should not see "---"
 
+  Scenario: Rendering markdown (template-less) (yaml)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/front-matter-pandoc.html"
+    Then I should see ">This is a document</h1>"
+    Then I should see "<p>To be or not to be</p>"
+    Then I should see "The meaning of life is 42"
+    Then I should not see "..."
+    Then I should not see "layout: false"
+    Then I should not see "title: Pandoc likes trailing dots..."
+
+
   Scenario: YAML not on first line, no encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-line-2.html"

data/features/paginate.feature

@@ -0,0 +1,204 @@
+Feature: Pagination
+  Scenario: Basic configuration
+    Given a fixture app "paginate-app"
+    And a file named "config.rb" with:
+      """
+      articles = resources.select { |r|
+        matcher = ::Middleman::Util::UriTemplates.uri_template('blog/2011-{remaining}')
+        ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url))
+      }
+
+      articles.sort { |a, b|
+        b.data.date <=> a.data.date
+      }.per_page(5) do |items, num, meta, is_last|
+        page_path = num == 1 ? '/2011/index.html' : "/2011/page/#{num}.html"
+
+        prev_page = case num
+        when 1
+          nil
+        when 2
+          '/2011/index.html'
+        when 3
+          "/2011/page/#{num-1}.html"
+        end
+
+        next_page = is_last ? nil : "/2011/page/#{num+1}.html"
+
+        proxy page_path, "/archive/2011/index.html", locals: {
+          items: items,
+          pagination: meta,
+          prev_page: prev_page,
+          next_page: next_page
+        }
+      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 = articles
+          .select { |resource| resource.data.tags }
+          .each_with_object({}, &method(:group_lookup))
+
+      tags.each do |k, articles_in_tag|
+        articles_in_tag.sort { |a, b|
+          b.data.date <=> a.data.date
+        }.per_page(2).each do |items, num, meta, is_last|
+          page_path = num == 1 ? "/tags/#{k}.html" : "/tags/#{k}/page/#{num}.html"
+
+          prev_page = case num
+          when 1
+            nil
+          when 2
+            "/tags/#{k}.html"
+          when 3
+            "/tags/#{k}/page/#{num-1}.html"
+          end
+
+          next_page = is_last ? nil : "/tags/#{k}/page/#{num+1}.html"
+
+          proxy page_path, "/archive/2011/index.html", locals: {
+            items: items,
+            pagination: meta,
+            prev_page: prev_page,
+            next_page: next_page
+          }
+        end
+      end
+      """
+    And the Server is running
+    When I go to "/2011/index.html"
+    Then I should see "Paginate: true"
+    Then I should see "Article Count: 5"
+    Then I should see "Page Num: 1"
+    Then I should see "Num Pages: 2"
+    Then I should see "Per Page: 5"
+    Then I should see "Page Start: 1"
+    Then I should see "Page End: 5"
+    Then I should see "Next Page: '/2011/page/2.html'"
+    Then I should see "Prev Page: ''"
+    Then I should not see "/blog/2011-01-01-test-article.html"
+    Then I should not see "/blog/2011-01-02-test-article.html"
+    Then I should see "/blog/2011-01-03-test-article.html"
+    Then I should see "/blog/2011-01-04-test-article.html"
+    Then I should see "/blog/2011-01-05-test-article.html"
+    Then I should see "/blog/2011-02-01-test-article.html"
+    Then I should see "/blog/2011-02-02-test-article.html"
+
+    When I go to "/2011/page/2.html"
+    Then I should see "Article Count: 2"
+    Then I should see "Page Num: 2"
+    Then I should see "Page Start: 6"
+    Then I should see "Page End: 7"
+    Then I should see "Next Page: ''"
+    Then I should see "Prev Page: '/2011/'"
+    Then I should see "/2011-01-01-test-article.html"
+    Then I should see "/2011-01-02-test-article.html"
+    Then I should not see "/2011-01-03-test-article.html"
+    Then I should not see "/2011-01-04-test-article.html"
+    Then I should not see "/2011-01-05-test-article.html"
+    Then I should not see "/2011-02-01-test-article.html"
+    Then I should not see "/2011-02-02-test-article.html"
+
+    When I go to "/tags/bar.html"
+    Then I should see "Paginate: true"
+    Then I should see "Article Count: 2"
+    Then I should see "Page Num: 1"
+    Then I should see "Num Pages: 3"
+    Then I should see "Per Page: 2"
+    Then I should see "Page Start: 1"
+    Then I should see "Page End: 2"
+    Then I should see "Next Page: '/tags/bar/page/2.html'"
+    Then I should see "Prev Page: ''"
+    Then I should see "/2011-02-02-test-article.html"
+    Then I should see "/2011-02-01-test-article.html"
+    Then I should not see "/2011-02-05-test-article.html"
+    Then I should not see "/2011-01-04-test-article.html"
+    Then I should not see "/2011-01-03-test-article.html"
+
+  Scenario: Custom pager method
+    Given a fixture app "paginate-app"
+    And a file named "config.rb" with:
+      """
+      def items_per_page(all_items)
+        [
+          all_items.shift(2),
+          all_items
+        ]
+      end
+
+      articles = resources.select { |r|
+        matcher = ::Middleman::Util::UriTemplates.uri_template('blog/2011-{remaining}')
+        ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url))
+      }
+
+      articles.sort { |a, b|
+        b.data.date <=> a.data.date
+      }.per_page(method(:items_per_page).to_proc).each do |items, num, meta, is_last|
+        page_path = num == 1 ? '/2011/index.html' : "/2011/page/#{num}.html"
+
+        prev_page = case num
+        when 1
+          nil
+        when 2
+          '/2011/index.html'
+        when 3
+          "/2011/page/#{num-1}.html"
+        end
+
+        next_page = is_last ? nil : "/2011/page/#{num+1}.html"
+
+        proxy page_path, "/archive/2011/index.html", locals: {
+          items: items,
+          pagination: meta,
+          prev_page: prev_page,
+          next_page: next_page
+        }
+      end
+      """
+    And the Server is running
+    When I go to "/2011/index.html"
+    Then I should see "Paginate: true"
+    Then I should see "Article Count: 2"
+    Then I should see "Page Num: 1"
+    Then I should see "Num Pages: 2"
+    Then I should see "Per Page: 2"
+    Then I should see "Page Start: 1"
+    Then I should see "Page End: 2"
+    Then I should see "Next Page: '/2011/page/2.html'"
+    Then I should see "Prev Page: ''"
+    Then I should not see "/blog/2011-01-01-test-article.html"
+    Then I should not see "/blog/2011-01-02-test-article.html"
+    Then I should not see "/blog/2011-01-03-test-article.html"
+    Then I should not see "/blog/2011-01-04-test-article.html"
+    Then I should not see "/blog/2011-01-05-test-article.html"
+    Then I should see "/blog/2011-02-01-test-article.html"
+    Then I should see "/blog/2011-02-02-test-article.html"
+
+    When I go to "/2011/page/2.html"
+    Then I should see "Article Count: 5"
+    Then I should see "Page Num: 2"
+    Then I should see "Page Start: 3"
+    Then I should see "Page End: 7"
+    Then I should see "Next Page: ''"
+    Then I should see "Prev Page: '/2011/'"
+    Then I should see "/2011-01-01-test-article.html"
+    Then I should see "/2011-01-02-test-article.html"
+    Then I should see "/2011-01-03-test-article.html"
+    Then I should see "/2011-01-04-test-article.html"
+    Then I should see "/2011-01-05-test-article.html"
+    Then I should not see "/2011-02-01-test-article.html"
+    Then I should not see "/2011-02-02-test-article.html"