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

Merge commit '24664e4bbab4d1805b8c23509798e4305032ebe5'

Browse source
This commit is contained in:
Thomas Reynolds 2011-12-22 20:48:10 -08:00
parent e0a2c4b301 24664e4bba
commit 3a5fc69a71
5 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
features/nested_layouts.feature
View file

@ -7,3 +7,13 @@ Feature: Allow nesting of layouts
And I should see "Inner"
And I should see "Outer"
And I should see "Master"
Scenario: YAML Front Matter isn't clobbered with nested layouts
Given the Server is running at "nested-layout-app"
When I go to "/data-one.html"
Then I should see "Page Number One"
When I go to "/data-two.html"
Then I should see "Page Number Two"
When I go to "/data-one.html"
Then I should see "Page Number One"
When I go to "/data-two.html"

5
fixtures/nested-layout-app/source/data-one.html.erb Normal file
View file

@ -0,0 +1,5 @@
---
title: Page Number One
layout: outer
---
Page #1

5
fixtures/nested-layout-app/source/data-two.html.erb Normal file
View file

@ -0,0 +1,5 @@
---
title: Page Number Two
layout: outer
---
Page #2

1
fixtures/nested-layout-app/source/layouts/master.erb
View file

@ -1,2 +1,3 @@
Master
<%= data.page.title %>
<%= yield %>

2
lib/middleman/extensions/sitemap_tree.rb
View file

@ -16,7 +16,7 @@ module Middleman::Extensions
if !@sitemap_tree_cache.has_key?(key)
auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
app.sitemap.all_paths.each do |path|
sitemap.all_paths.each do |path|
next if !regex.nil? && !path.match(regex)
sub = auto_hash
path.split( "/" ).each{ |dir| sub[dir]; sub = sub[dir] }