@@ -278,6 +278,8 @@ module Merb class ServerError < Merb::ControllerExceptions::Base; end + class InternalServerError < Merb::ControllerExceptions::ServerError; self.status = 500; end + class NotImplemented < Merb::ControllerExceptions::ServerError; self.status = 501; end class BadGateway < Merb::ControllerExceptions::ServerError; self.status = 502; end @@ -287,21 +289,6 @@ module Merb class GatewayTimeout < Merb::ControllerExceptions::ServerError; self.status = 504; end class HTTPVersionNotSupported < Merb::ControllerExceptions::ServerError; self.status = 505; end - - class InternalServerError < Merb::ControllerExceptions::ServerError #:doc: - self.status = 500; - def initialize(exception = nil) - @exception = exception - end - - def backtrace - @exception ? @exception.backtrace : backtrace - end - - def message - @exception ? @exception.message : message - end - end end # Required to show exceptions in the log file lib/merb-core/controller/exceptions.rb e3159c418376bab845df40ed733960b62818581a David James dj@collectiveinsight.net http://github.com/wycats/merb-core/commit/21db301aa5d4277dd19d9b1b1a30e469de012298 21db301aa5d4277dd19d9b1b1a30e469de012298 2008-09-28T19:10:36-07:00 2008-09-28T19:10:36-07:00 Fixes #503; raise InternalServerError works now. http://merb.lighthouseapp.com/projects/7433/tickets/503 InternalServerError's (ISE's) used to be 'special' in a previous release. They aren't special anymore. We should add a spec in addition to this change. I looked over the specs and I'm not sure where a spec should go. 91ee88f4ba0688aab815e095b19c53ba2b4db45e David James dj@collectiveinsight.net