Changeset 569
- Timestamp:
- 09/08/07 06:16:42 (1 year ago)
- Files:
-
- trunk/lib/merb/controller.rb (modified) (1 diff)
- trunk/lib/merb/dispatcher.rb (modified) (1 diff)
- trunk/lib/merb/server.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/merb/controller.rb
r521 r569 8 8 # puts that into params as well. 9 9 class Controller < AbstractController 10 10 11 11 class_inheritable_accessor :_session_id_key, :_session_expiry 12 12 self._session_id_key = :_session_id 13 13 self._session_expiry = Time.now + Merb::Const::WEEK * 2 14 14 15 15 include Merb::ControllerMixin 16 16 include Merb::ResponderMixin 17 17 include Merb::ControllerExceptions::HTTPErrors 18 18 19 19 class << self 20 20 def callable_actions trunk/lib/merb/dispatcher.rb
r565 r569 30 30 31 31 klass = resolve_controller(route_params[:controller]) 32 raise ControllerExceptions::InternalServerError, "The controller class, '#{klass}' was not derived from the Application class (or Merb::AbstractController)" unless klass.respond_to?(:build) 32 33 controller = klass.build( 33 34 merb_request, response, trunk/lib/merb/server.rb
r560 r569 218 218 object = parts[-1].intern 219 219 puts " #{object} from #{base}" 220 base.send(:remove_const, object) 220 base.send(:remove_const, object) if object 221 221 end 222 222
