From 1fc97d9d7bbe8edb5d54c64d2870bb7d40569e08 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Tue, 31 Jan 2012 22:15:45 -0800 Subject: [PATCH] A minor simplification of Sitemap::Store#path - it can no longer take a block --- middleman-core/lib/middleman-core/sitemap/store.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 9071f1b6..18987019 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -47,18 +47,16 @@ module Middleman::Sitemap # @param [String] target # @return [void] def proxy(path, target) - page(path) { proxy_to(target.sub(%r{^/}, "")) } + page(path).proxy_to(target.sub(%r{^/}, "")) app.cache.remove(:proxied_paths) end # Get a page instance for a given path # @param [String] path # @return [Middleman::Sitemap::Page] - def page(path, &block) + def page(path) path = path.sub(/^\//, "").gsub("%20", " ") - @pages[path] = ::Middleman::Sitemap::Page.new(self, path) unless @pages.has_key?(path) - @pages[path].instance_exec(&block) if block_given? - @pages[path] + @pages.fetch(path) { @pages[path] = ::Middleman::Sitemap::Page.new(self, path) } end # Loop over known pages