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

Don't look for frontmatter on binary files. Fixes #728

Browse source
This commit is contained in:
Thomas Reynolds 2013-01-11 16:58:02 -08:00
parent 7231f9dfe2
commit a76b02a55b
3 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,23 +130,27 @@ module Middleman::CoreExtensions
# @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
def frontmatter_and_content(path)
full_path = File.expand_path(File.join(@app.source_dir, path))
content = File.read(full_path)
data = {}
content = nil
begin
if content =~ /\A.*coding:/
lines = content.split(/\n/)
lines.shift
content = lines.join("\n")
end
if !::Middleman::Util.binary?(full_path)
content = File.read(full_path)
begin
if content =~ /\A.*coding:/
lines = content.split(/\n/)
lines.shift
content = lines.join("\n")
end
if result = parse_yaml_front_matter(content)
data, content = result
elsif result = parse_json_front_matter(content)
data, content = result
if result = parse_yaml_front_matter(content)
data, content = result
elsif result = parse_json_front_matter(content)
data, content = result
end
rescue => e
# Probably a binary file, move on
end
rescue => e
# Probably a binary file, move on
end
[data, content]