@@ -3,15 +3,28 @@ module MerbExceptions def self.included(mod) mod.class_eval do - def internal_server_error - self.render_and_notify :layout=>false + def base + self.render_and_notify template_or_message, :layout=>false + end + + def exception + self.render_and_notify template_or_message, :layout=>false + end + + private + + def template_or_message + if File.exists?(Merb.root / 'app' / 'views' / 'exceptions' / 'internal_server_error.html.erb') + :internal_server_error + else + '500 exception. Please customize this page by creating app/views/exceptions/internal_server_error.html.erb.' + end end end end - - def render_and_notify(opts={}) - self.render_then_call(render(opts)) { notify_of_exceptions } + def render_and_notify(*opts) + self.render_then_call(render(*opts)) { notify_of_exceptions } end def notify_of_exceptions lib/merb_exceptions/controller_extensions.rb bafef0076b7cdc700e4df4079b50bacb97b3a965 Martyn Loughran martyn@new-bamboo.co.uk http://github.com/newbamboo/merb_exceptions/commit/b73e3810deb8eb5ffe13202da308c48b9c7831a6 b73e3810deb8eb5ffe13202da308c48b9c7831a6 2008-09-29T08:53:10-07:00 2008-09-29T08:53:10-07:00 Changes to support latest version of merb * The base and exception actions now replace internal_server_error action. * Keep using internal_server_error.html.erb but does not blow up if this file is missing. 92626df078f51b0ed10c05456a411a0030ec489c Martyn Loughran martyn@new-bamboo.co.uk