From ffecc3e4cc5c3a40f14c6d07a97cd053c2b910ef Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Wed, 11 Jul 2012 15:14:08 +0930 Subject: [PATCH] Optimisation, Hash#delete returns the deleted item --- middleman-core/lib/middleman-core/sitemap/resource.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 44c3bc9b..7d6975d3 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -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?