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

Merge pull request #677 from CaseyLeask/empty-yaml

Browse source 
Empty yaml fix
This commit is contained in:
Ben Hollis 2012-12-13 19:45:00 -08:00
parent 865c2c34f9 fd8855eff0
commit 0801f93ffb
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,4 +69,15 @@ Feature: YAML Front Matter
<%= data.page.title %>
"""
When I go to "/front-matter-change.html"
Then I should see "Hola Mundo"
Then I should see "Hola Mundo"
Scenario: A template should handle an empty YAML feed
Given the Server is running at "frontmatter-app"
And the file "source/front-matter-change.html.erb" has the contents
"""
---
---
Hello World
"""
When I go to "/front-matter-change.html"
Then I should see "Hello World"

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

@ -31,7 +31,7 @@ module Middleman::CoreExtensions
)
sitemap.provides_metadata do |path|
fmdata = frontmatter_manager.data(path).first
fmdata = frontmatter_manager.data(path).first || {}
data = {}
%w(layout layout_engine).each do |opt|
@ -158,7 +158,7 @@ module Middleman::CoreExtensions
# @return [void]
def manipulate_resource_list(resources)
resources.each do |r|
if !r.proxy? && r.data["ignored"] == true
if !r.proxy? && !r.data.nil? && r.data["ignored"] == true
r.frontmatter_ignored = true
end
end