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

Fix instance variables in dynamic pages

Browse source
This commit is contained in:
Tim Bates 2012-07-23 15:15:10 +09:30
parent 2f7371ca1f
commit 99a8723ea6
6 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -96,7 +96,7 @@ module Middleman
# @param [Hash] locs
# @param [Hash] opts
# @return [String]
def render_template(path, locs={}, opts={})
def render_template(path, locs={}, opts={}, blocks=[])
# Detect the remdering engine from the extension
extension = File.extname(path)
engine = extension[1..-1].to_sym
@ -107,6 +107,9 @@ module Middleman
# Use a dup of self as a context so that instance variables set within
# the template don't persist for other templates.
context = self.dup
blocks.each do |block|
context.instance_eval(&block)
end
# Store current locs/opts for later
@current_locs = locs, @current_opts = opts

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

@ -125,14 +125,11 @@ module Middleman
app.data.store("page", md[:page])
end
md[:blocks].each do |aBlock|
app.instance_eval(&aBlock)
end
app.instance_eval(&block) if block_given?
blocks = md[:blocks].dup rescue []
blocks << block if block_given?
app.current_path ||= self.destination_path
app.render_template(source_file, locs, opts)
app.render_template(source_file, locs, opts, blocks)
end
end