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

Fix a bunch of Ruby warnings, including a bug in the not_found method

Browse source
This commit is contained in:
Ben Hollis 2013-04-06 14:48:00 -07:00
parent 1d869b0c08
commit 397ccd2c1e
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,7 @@ module Middleman
opts[:template_body] = content if content
content = render_individual_file(path, locs, opts, context)
path = File.basename(path, File.extname(path))
rescue LocalJumpError => e
rescue LocalJumpError
raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/layouts."
end
end
@ -298,9 +298,9 @@ module Middleman
# Find all the engines which handle this extension in tilt. Look for
# config variables of that name and merge it
extension_class = ::Tilt[ext]
::Tilt.mappings.each do |ext, engines|
::Tilt.mappings.each do |mapping_ext, engines|
next unless engines.include? extension_class
engine_options = config[ext.to_sym] || {}
engine_options = config[mapping_ext.to_sym] || {}
options.merge!(engine_options)
end