dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path

This commit is contained in:
Parker Moore 2015-01-17 15:16:50 -08:00
parent 1715956baa 3b7091aab7
commit 6d9b4c2aba
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
features/frontmatter_defaults.feature
View File

@ -54,6 +54,28 @@ Feature: frontmatter defaults
And I should see "root: Overview for the webpage" in "_site/index.html" And I should see "root: Overview for the webpage" in "_site/index.html"
And I should see "subfolder: Overview for the special section" in "_site/special/index.html" And I should see "subfolder: Overview for the special section" in "_site/special/index.html"
Scenario: Use frontmatter variables by relative path
Given I have a _layouts directory
And I have a main layout that contains "main: {{ content }}"
And I have a _posts directory
And I have the following post:
| title | date | content |
| about | 2013-10-14 | content of site/2013/10/14/about.html |
And I have a special/_posts directory
And I have the following post in "special":
| title | date | path | content |
| about1 | 2013-10-14 | local | content of site/special/2013/10/14/about1.html |
| about2 | 2013-10-14 | local | content of site/special/2013/10/14/about2.html |
And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "main"}}, {scope: {path: "special/_posts"}, values: {layout: "main"}}, {scope: {path: "_posts"}, values: {layout: "main"}}]"
When I run jekyll build
Then the _site directory should exist
And I should see "main: <p>content of site/2013/10/14/about.html</p>" in "_site/2013/10/14/about.html"
And I should see "main: <p>content of site/special/2013/10/14/about1.html</p>" in "_site/special/2013/10/14/about1.html"
And I should see "main: <p>content of site/special/2013/10/14/about2.html</p>" in "_site/special/2013/10/14/about2.html"
Scenario: Override frontmatter defaults by type Scenario: Override frontmatter defaults by type
Given I have a _posts directory Given I have a _posts directory
And I have the following post: And I have the following post:
@ -81,7 +103,7 @@ Feature: frontmatter defaults
Scenario: Use frontmatter defaults in collections Scenario: Use frontmatter defaults in collections
Given I have a _slides directory Given I have a _slides directory
And I have a "index.html" file that contains "nothing" And I have a "index.html" file that contains "nothing"
And I have a "_slides/slide1.html" file with content: And I have a "_slides/slide1.html" file with content:
""" """
--- ---
--- ---
@ -107,7 +129,7 @@ Feature: frontmatter defaults
Scenario: Override frontmatter defaults inside a collection Scenario: Override frontmatter defaults inside a collection
Given I have a _slides directory Given I have a _slides directory
And I have a "index.html" file that contains "nothing" And I have a "index.html" file that contains "nothing"
And I have a "_slides/slide2.html" file with content: And I have a "_slides/slide2.html" file with content:
""" """
--- ---
myval: Override myval: Override

2
lib/jekyll/post.rb
View File

@ -58,7 +58,7 @@ module Jekyll
read_yaml(@base, name) read_yaml(@base, name)
data.default_proc = proc do |hash, key| data.default_proc = proc do |hash, key|
site.frontmatter_defaults.find(File.join(dir, name), type, key) site.frontmatter_defaults.find(relative_path, type, key)
end end
if data.key?('date') if data.key?('date')