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

Fix frontmatter parsing changes from #1608

Browse source 
Only allow frontmatter at the top of the page:
  Now manually removing encoding lines as before

Fix handling of postscript data:
  If there is no frontmatter and the filetype is known,
  parse the whole file

Allow empty frontmatter

Update the documentation comments
This commit is contained in:
Eliott Appleford 2015-09-23 20:06:11 +00:00
parent 11fc90f93c
commit 47bdcb2d9c
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,20 +23,23 @@ module Middleman::Util::Data
return [{}, nil]
end
case known_type
when :yaml
return [parse_yaml(content, full_path), nil]
when :json
return [parse_json(content, full_path), nil]
end
/
(?<start>^[-;]{3})[ ]*\r?\n
(?<frontmatter>.*?)[ ]*\r?\n
(?<stop>^[-.;]{3})[ ]*\r?\n?
\A(.*?coding:.*?\n)?
(?<start>[-;]{3})[ ]*\r?\n
(?<frontmatter>.*?)[ ]*\r?\n?
(?<stop>[-.;]{3})[ ]*\r?\n?
(?<additional_content>.*)
/mx =~ content
unless frontmatter
case known_type
when :yaml
return [parse_yaml(content, full_path), nil]
when :json
return [parse_json(content, full_path), nil]
end
end
case [start, stop]
when %w[--- ---], %w[--- ...]
[parse_yaml(frontmatter, full_path), additional_content]
@ -49,10 +52,10 @@ module Middleman::Util::Data
# Parse YAML frontmatter out of a string
# @param [String] content
# @return [Array<Hash, String>]
# @return [Hash]
Contract String, Pathname, Bool => Hash
def parse_yaml(content, full_path)
symbolize_recursive(YAML.load(content))
symbolize_recursive(YAML.load(content) || {})
rescue StandardError, Psych::SyntaxError => error
warn "YAML Exception parsing #{full_path}: #{error.message}"
{}
@ -60,10 +63,10 @@ module Middleman::Util::Data
# Parse JSON frontmatter out of a string
# @param [String] content
# @return [Array<Hash, String>]
# @return [Hash]
Contract String, Pathname => Hash
def parse_json(content, full_path)
symbolize_recursive(JSON.parse(content))
symbolize_recursive(JSON.parse(content) || {})
rescue StandardError => error
warn "JSON Exception parsing #{full_path}: #{error.message}"
{}