Changeset 1073
- Timestamp:
- 12/08/07 16:48:56 (1 year ago)
- Files:
-
- trunk/lib/merb/exceptions.rb (modified) (1 diff)
- trunk/lib/merb/mixins/controller.rb (modified) (1 diff)
- trunk/lib/merb/session/mem_cache_session.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/merb/exceptions.rb
r1049 r1073 164 164 class GatewayTimeout < Merb::ControllerExceptions::ServerError; STATUS = 504; end 165 165 class HTTPVersionNotSupported < Merb::ControllerExceptions::ServerError; STATUS = 505; end 166 class InternalServerError < Merb::ControllerExceptions::ServerError; STATUS = 500 166 class InternalServerError < Merb::ControllerExceptions::ServerError; 167 STATUS = 500 167 168 DEFAULT_TEMPLATE = ::Merb::Dispatcher::DEFAULT_ERROR_TEMPLATE 168 169 trunk/lib/merb/mixins/controller.rb
r1052 r1073 96 96 end 97 97 route = symbol.is_a?(Symbol) ? Merb::Router.named_routes[symbol] : symbol 98 raise "URL could not be constructed. Route symbol not found: #{symbol.inspect}" unless route 98 unless route 99 raise InternalServerError, "URL could not be constructed. Route symbol not found: #{symbol.inspect}" 100 end 99 101 path = route.generate(new_params, params) 100 102 keys = route.symbol_segments trunk/lib/merb/session/mem_cache_session.rb
r1047 r1073 69 69 session = generate 70 70 end 71 if session.is_a?( MemCacheSession)71 if session.is_a?(MemCacheSession) 72 72 [session, session.session_id] 73 73 else
