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

merge PR

Browse source
This commit is contained in:
Thomas Reynolds 2014-05-30 14:23:44 -07:00
parent ba01a0a72b ca0573d92a
commit 1006739e98
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
middleman-core/features/more-sitemap_traversal.feature
View file

@ -71,3 +71,13 @@ Feature: Step through sitemap as a tree (more)
Then I should see "Child: directory-indexed/sibling2.html"
Then I should see "Child: directory-indexed/sub2/index.html"
Then I should see "Sibling: root.html"
Scenario: Child pages can see their parent and siblings too in named directory
Given the Server is running at "more-traversal-app"
When I go to "/directory-indexed/sibling"
Then I should see "Path: directory-indexed/sibling.html"
Then I should see "Parent: directory-indexed.html"
Then I should see "Sibling: directory-indexed/fake.html"
Then I should see "Sibling: directory-indexed/fake2.html"
Then I should see "Sibling: directory-indexed/sibling2.html"
Then I should see "Sibling: directory-indexed/sub2/index.html"

10
middleman-core/features/sitemap_traversal.feature
View file

@ -71,3 +71,13 @@ Feature: Step through sitemap as a tree
Then I should see "Child: directory-indexed/sibling2.html"
Then I should see "Child: directory-indexed/sub2/index.html"
Then I should see "Sibling: root.html"
Scenario: Child pages can see their parent and siblings too in named directory
Given the Server is running at "traversal-app"
When I go to "/directory-indexed/sibling.html"
Then I should see "Path: directory-indexed/sibling.html"
Then I should see "Parent: directory-indexed.html"
Then I should see "Sibling: directory-indexed/fake.html"
Then I should see "Sibling: directory-indexed/fake2.html"
Then I should see "Sibling: directory-indexed/sibling2.html"
Then I should see "Sibling: directory-indexed/sub2/index.html"

21
middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb
View file

@ -6,16 +6,23 @@ module Middleman
# @return [Middleman::Sitemap::Resource, nil]
def parent
parts = path.split('/')
parts.pop if path.include?(app.config[:index_file])
tail = parts.pop
is_index = (tail == app.config[:index_file])
return nil if parts.length < 1
return nil if is_index && parts.length < 1
parts.pop
parts << app.config[:index_file]
test_expr = parts.join('\\/')
# eponymous reverse-lookup
found = store.resources.find do |candidate|
candidate.path =~ %r!^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$!
end
parent_path = '/' + parts.join('/')
store.find_resource_by_destination_path(parent_path)
if found
found
else
parts.pop if is_index
store.find_resource_by_destination_path("#{parts.join('/')}/#{app.config[:index_file]}")
end
end
# This resource's child resources