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

sprockets, ruby 19 and yui support

Browse source
This commit is contained in:
tdreyno 2009-09-17 09:40:29 -07:00
parent 37aee34576
commit fc8cd43612
8 changed files with 85 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/middleman.rb
View file

@ -1,8 +1,10 @@
require 'rubygems'
require 'haml'
require 'compass' #must be loaded before sinatra
require 'sinatra/base'
# Sprockets ruby 1.9 hack
require File.join(File.dirname(__FILE__), 'middleman', 'sprockets_ext')
# Include content_for support
require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
@ -91,7 +93,7 @@ class Middleman < Sinatra::Base
end
rescue Haml::Error => e
result = "Haml Error: #{e}"
#result << "<pre>Backtrace: #{e.backtrace.join("\n")}</pre>"
result << "<pre>Backtrace: #{e.backtrace.join("\n")}</pre>"
end
result || pass