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

re-raise missing template exception in dev

Browse source
This commit is contained in:
Thomas Reynolds 2011-06-27 12:33:21 -07:00
parent a66a0bb5a8
commit 22efdcfa44
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/middleman/builder.rb
View file

@ -85,10 +85,8 @@ module Middleman
lookup = File.join(lookup, '*') lookup = File.join(lookup, '*')
results = Dir[lookup].sort do |a, b| results = Dir[lookup].sort do |a, b|
simple_a = a.gsub(Middleman::Server.root + "/", '') simple_a = a.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
.gsub(Middleman::Server.views + "/", '') simple_b = b.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
simple_b = b.gsub(Middleman::Server.root + "/", '')
.gsub(Middleman::Server.views + "/", '')
a_dir = simple_a.split("/").first a_dir = simple_a.split("/").first
b_dir = simple_b.split("/").first b_dir = simple_b.split("/").first

4
lib/middleman/server.rb
View file

@ -186,10 +186,14 @@ module Middleman
status 404 status 404
rescue Padrino::Rendering::TemplateNotFound rescue Padrino::Rendering::TemplateNotFound
if settings.environment == :development
raise $!
else
$stderr.puts "File not found: #{request.path}" $stderr.puts "File not found: #{request.path}"
status 404 status 404
end end
end end
end
end end
require "middleman/assets" require "middleman/assets"