@@ -39,6 +39,6 @@ class Merb::AbstractController end p ? params[arg.to_sym] : default end - __send__(action, *args) || raise(NotImplemented, "Actions must return a string result. Did you forget to call render?") + __send__(action, *args) end end merb-action-args/lib/merb-action-args/abstract_controller.rb @@ -63,9 +63,5 @@ describe Merb::AbstractController do lambda { dispatch_to(ActionArgs, :multi, :foo => "Hello") }.should raise_error( Merb::ControllerExceptions::BadRequest, /were missing bar/) end - - it "should raise NotImplemented on a controller that returns nil" do - lambda { dispatch_to(ActionArgs, :zilch) }.should raise_error( - Merb::ControllerExceptions::NotImplemented) - end + end \ No newline at end of file merb-action-args/spec/action_args_spec.rb @@ -19,9 +19,6 @@ end class ActionArgs < Merb::Controller include ExtraActions - def zilch - end - def nada "NADA" end merb-action-args/spec/controllers/action-args.rb @@ -312,7 +312,7 @@ module Merb # :api: plugin # @overridable def _call_action(action) - send(action) || raise(NotImplemented, "Actions must return a string result. Did you forget to call render?") + send(action) end # Calls a filter chain. merb-core/lib/merb-core/controller/abstract_controller.rb 7732e6355e8dd730caeea798d23dd7fb98898d37 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/333ab8ae067880394fd42bc6b32c4ad5729711cd 333ab8ae067880394fd42bc6b32c4ad5729711cd 2009-03-18T12:48:48-07:00 2009-03-18T12:48:48-07:00 Revert "Made it raise NotImplemented if you don't return something valid from a controller action, as requested in lighthouse ticket #1201." This reverts commit 7732e6355e8dd730caeea798d23dd7fb98898d37. a4377f89f7de9cad4d147d6a9b3549cd44e351c0 Matt Aimonetti mattaimonetti@gmail.com