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

Allow frontmatter to be parsed on templates outside the project root

Browse source
This commit is contained in:
Thomas Reynolds 2013-02-06 13:19:09 -08:00
parent 8d5dd8e8ce
commit c9290c6b11
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
require 'pathname'
# Extensions namespace # Extensions namespace
module Middleman::CoreExtensions module Middleman::CoreExtensions
@ -128,7 +130,12 @@ module Middleman::CoreExtensions
# @param [String] path # @param [String] path
# @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>] # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
def frontmatter_and_content(path) def frontmatter_and_content(path)
full_path = File.expand_path(File.join(@app.source_dir, path)) full_path = if Pathname(path).relative?
File.join(@app.source_dir, path)
else
path
end
data = {} data = {}
content = nil content = nil
@ -156,7 +163,7 @@ module Middleman::CoreExtensions
end end
def normalize_path(path) def normalize_path(path)
path.sub(@app.source_dir, "").sub(/^\//, "") path.sub(%r{^#{@app.source_dir}\/}, "")
end end
# Update the main sitemap resource list # Update the main sitemap resource list