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

Optimisation, Hash#delete returns the deleted item

Browse source
This commit is contained in:
Tim Bates 2012-07-11 15:14:08 +09:30
parent f062bb7c3d
commit ffecc3e4cc
1 changed files with 3 additions and 6 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 path_meta = store.metadata_for_path(path).dup
if path_meta.has_key?(:blocks) if path_meta.has_key?(:blocks)
result[:blocks] << path_meta[:blocks] result[:blocks] << path_meta.delete(:blocks)
path_meta.delete(:blocks)
end end
result.deep_merge!(path_meta) result.deep_merge!(path_meta)
local_meta = @local_metadata.dup local_meta = @local_metadata.dup
if local_meta.has_key?(:blocks) if local_meta.has_key?(:blocks)
result[:blocks] << local_meta[:blocks] result[:blocks] << local_meta.delete(:blocks)
local_meta.delete(:blocks)
end end
result.deep_merge!(local_meta) result.deep_merge!(local_meta)
@ -78,8 +76,7 @@ module Middleman
# @param [Hash] metadata A metadata block like provides_metadata_for_path takes # @param [Hash] metadata A metadata block like provides_metadata_for_path takes
def add_metadata(metadata={}, &block) def add_metadata(metadata={}, &block)
if metadata.has_key?(:blocks) if metadata.has_key?(:blocks)
@local_metadata[:blocks] << metadata[:blocks] @local_metadata[:blocks] << metadata.delete(:blocks)
metadata.delete(:blocks)
end end
@local_metadata.deep_merge!(metadata) @local_metadata.deep_merge!(metadata)
@local_metadata[:blocks] << block if block_given? @local_metadata[:blocks] << block if block_given?