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

Merge pull request #284 from bhollis/layout

Browse source 
Bad error message for extensionless files
This commit is contained in:
Thomas Reynolds 2012-07-03 13:30:38 -07:00
parent a5a2e1568b 89afc86a5b
commit be2589de0d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,9 +115,13 @@ module Middleman
# handles cases like `style.css.sass.erb` # handles cases like `style.css.sass.erb`
content = nil content = nil
while ::Tilt[path] while ::Tilt[path]
begin
opts[:template_body] = content if content opts[:template_body] = content if content
content = render_individual_file(path, locs, opts, context) content = render_individual_file(path, locs, opts, context)
path = File.basename(path, File.extname(path)) path = File.basename(path, File.extname(path))
rescue LocalJumpError => e
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 end
# Certain output file types don't use layouts # Certain output file types don't use layouts