deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1350 from docwhat/pandoc-frontmatter

Browse source 
Accept pandoc-style YAML frontmatter
This commit is contained in:
Thomas Reynolds 2014-08-15 13:46:52 -07:00
parent fae0e00f42 6895f30ff3
commit 345cbdcce2
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
middleman-core/features/front-matter.feature
View file

@ -21,6 +21,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"

13
middleman-core/fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb Normal file
View file

@ -0,0 +1,13 @@
---
layout: false
title: Pandoc likes trailing dots...
dotty_string: "..."
famous_quote: To be or not to be
popular_number: 42
...
# This is a document
<%= current_page.data.famous_quote %>
The meaning of life is <%= current_page.data.popular_number %>.

2
middleman-core/lib/middleman-core/core_extensions/front_matter.rb
View file

@ -119,7 +119,7 @@ module Middleman::CoreExtensions
# @param [String] content
# @return [Array<Hash, String>]
def parse_yaml_front_matter(content, full_path)
yaml_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
yaml_regex = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
if content =~ yaml_regex
content = content.sub(yaml_regex, '')