@@ -29,7 +29,3 @@ require "merb-core/controller/merb_controller" module Merb module InlineTemplates; end end - -# StatusCodes does not autoload properly if placed with the above autoload -# statements. ControllerExceptions depends upon StatusCodes loading first. -require "merb-core/controller/status_codes" lib/merb-core/autoload.rb @@ -1,5 +1,5 @@ module Merb - + module StatusCodes STATUS_CODES = [] @@ -82,7 +82,7 @@ module Merb class ServiceUnavailable < Merb::StatusCodes::ServerError; def self.status; 503 end end class GatewayTimeout < Merb::StatusCodes::ServerError; def self.status; 504 end end class HTTPVersionNotSupported < Merb::StatusCodes::ServerError; def self.status; 505 end end - + STATUS_CODES.each do |item| item[:status] = item[:child_class].status end lib/merb-core/controller/status_codes.rb c122ec92e2defdddb6ed1fc6b317990696f74b45 David James djwonk@collectiveinsight.net http://github.com/wycats/merb-core/commit/5078b8bf11f23b1f4e42c701438c37c6140fd93e 5078b8bf11f23b1f4e42c701438c37c6140fd93e 2008-10-12T19:31:06-07:00 2008-10-12T18:14:07-07:00 Fixed warning about STATUS_CODES due to 2 requires. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 745c53f7251cd27048a069865f4052ec652f6dd9 Michael S. Klishin michael@novemberain.com