@@ -10,7 +10,7 @@ module ResourceController # Only execute the action on a non-GET request. This provides safety, and also # the ability to create a "login" method that both prints the form and handles # the login action, but only runs the action code on POST. - if request.method == :get or action action_name + if action action_name after action_name set_flash action_name response_for action_name @@ -18,16 +18,6 @@ module ResourceController set_flash action_name, :failure => true response_for action_name, :failure => true end - rescue Exception => e - # roundabout way due to Ruby losing special Exception class - if rescues(action_name).include? e.class - @exception = e # provide access to controller - set_flash action_name, :failure => true - response_for action_name, :failure => true - else - raise - end end - end end lib/resource_controller/handler.rb @@ -44,7 +44,7 @@ module ResourceController::Helpers::Internal # Executes the action block def action(action_name) - invoke_callbacks *self.class.send(action_name).action + self.class.send(action_name).action.nil? ? true : invoke_callbacks(*self.class.send(action_name).action) end # Returns a list of those exceptions which the call rescues lib/resource_controller/helpers/internal.rb @@ -55,10 +55,5 @@ class TagsControllerTest < Test::Unit::TestCase should_be_restful do |resource| resource.formats = [:html] end - - should "render text for a missing object" do - get :show, :id => 50000 - assert @response.body.match(/not found/i), @response.body - end end end test/test/functional/tags_controller_test.rb 6202b9bed08f1a9f1052cb7f263efe5ee4e2a919 James Golick james@giraffesoft.ca http://github.com/giraffesoft/resource_controller/commit/0a8903d9de26da9158882486b9735251ae6e8de4 0a8903d9de26da9158882486b9735251ae6e8de4 2008-05-07T19:08:08-07:00 2008-05-07T19:08:08-07:00 refactor away the request safety built in to the controller c9e52b2c9f5162c9afa29da7fcf90f3e2b742677 James Golick james@giraffesoft.ca