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

Merge pull request #528 from rumpuslabs/sitemap_patches

Browse source 
Sitemap patches
This commit is contained in:
Thomas Reynolds 2012-07-11 10:43:20 -07:00
parent f062bb7c3d d30f883e48
commit 5c9a5c9849
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
middleman-core/lib/middleman-core/sitemap/resource.rb
View file

@ -57,15 +57,13 @@ module Middleman
path_meta = store.metadata_for_path(path).dup
if path_meta.has_key?(:blocks)
result[:blocks] << path_meta[:blocks]
path_meta.delete(:blocks)
result[:blocks] << path_meta.delete(:blocks)
end
result.deep_merge!(path_meta)
local_meta = @local_metadata.dup
if local_meta.has_key?(:blocks)
result[:blocks] << local_meta[:blocks]
local_meta.delete(:blocks)
result[:blocks] << local_meta.delete(:blocks)
end
result.deep_merge!(local_meta)
@ -78,8 +76,7 @@ module Middleman
# @param [Hash] metadata A metadata block like provides_metadata_for_path takes
def add_metadata(metadata={}, &block)
if metadata.has_key?(:blocks)
@local_metadata[:blocks] << metadata[:blocks]
metadata.delete(:blocks)
@local_metadata[:blocks] << metadata.delete(:blocks)
end
@local_metadata.deep_merge!(metadata)
@local_metadata[:blocks] << block if block_given?

20
middleman-core/lib/middleman-core/sitemap/store.rb
View file

@ -47,14 +47,16 @@ module Middleman
# @return [void]
def rebuild_resource_list!(reason=nil)
@resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
inst.manipulate_resource_list(result)
end
# Reset lookup cache
@_lookup_cache = { :path => {}, :destination_path => {} }
@resources.each do |resource|
@_lookup_cache[:path][resource.path] = resource
@_lookup_cache[:destination_path][resource.destination_path] = resource
newres = inst.manipulate_resource_list(result)
# Reset lookup cache
@_lookup_cache = { :path => {}, :destination_path => {} }
newres.each do |resource|
@_lookup_cache[:path][resource.path] = resource
@_lookup_cache[:destination_path][resource.destination_path] = resource
end
newres
end
end
@ -214,4 +216,4 @@ module Middleman
end
end
end
end
end