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

Fix JSON frontmatter parsing

Browse source
This commit is contained in:
Eliott Appleford 2015-09-24 20:27:36 +01:00
parent fe66beacc3
commit 97cd1c1411
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/util/data.rb
View file

@ -24,7 +24,7 @@ module Middleman::Util::Data
end end
/ /
\A(.*?coding:.*?\n)? \A(.*?coding:.*?\r?\n)?
(?<start>[-;]{3})[ ]*\r?\n (?<start>[-;]{3})[ ]*\r?\n
(?<frontmatter>.*?)[ ]*\r?\n? (?<frontmatter>.*?)[ ]*\r?\n?
(?<stop>^[-.;]{3})[ ]*\r?\n? (?<stop>^[-.;]{3})[ ]*\r?\n?
@ -44,7 +44,7 @@ module Middleman::Util::Data
when %w(--- ---), %w(--- ...) when %w(--- ---), %w(--- ...)
[parse_yaml(frontmatter, full_path), additional_content] [parse_yaml(frontmatter, full_path), additional_content]
when %w(;;; ;;;) when %w(;;; ;;;)
[parse_json(frontmatter, full_path), additional_content] [parse_json("{#{frontmatter}}", full_path), additional_content]
else else
[{}, content] [{}, content]
end end