merb-action-args 1.0.8.1 → 1.0.9

data/lib/merb-action-args/abstract_controller.rb

@@ -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)

data/spec/action_args_spec.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 1.0.8.1
+  version: 1.0.9
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.8.1
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby