@@ -32,9 +32,11 @@ class Merb::AbstractController arguments, defaults = self.class.action_argument_list[action] args = arguments.map do |arg, default| - arg = arg p = params.key?(arg.to_sym) - raise BadRequest unless p || (defaults && defaults.include?(arg)) + unless p || (defaults && defaults.include?(arg)) + missing = arguments.reject {|arg| params.key?(arg[0].to_sym || arg[1])} + raise BadRequest, "Your parameters (#{params.inspect}) were missing #{missing.join(", ")}" + end p ? params[arg.to_sym] : default end __send__(action, *args) merb-action-args/lib/merb-action-args/abstract_controller.rb @@ -54,4 +54,14 @@ describe Merb::AbstractController do dispatch_to(ActionArgs, :with_default_array, :foo => "bar").body.should == "bar []" end + it "should print out the missing parameters if all are required" do + lambda { dispatch_to(ActionArgs, :multi) }.should raise_error( + Merb::ControllerExceptions::BadRequest, /were missing foo, bar/) + end + + it "should only print out missing parameters" do + lambda { dispatch_to(ActionArgs, :multi, :foo => "Hello") }.should raise_error( + Merb::ControllerExceptions::BadRequest, /were missing bar/) + end + end \ No newline at end of file merb-action-args/spec/action_args_spec.rb 78901c9b011afb087028d8343479efb8850b8912 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1d27895262a5463ad870c4576a7b14447d1f0233 1d27895262a5463ad870c4576a7b14447d1f0233 2009-01-30T15:07:06-08:00 2009-01-30T15:07:06-08:00 Print out an error with BadRequest. ae28652b7c6e07ea0cfd0093e26e3ce0ab76c04b Yehuda Katz wycats@gmail.com