added option to call rescue_from with a method instead of a block

Author: robertopedroso

lib/grape/api.rb

@@ -189,12 +189,19 @@ def default_error_status(new_status = nil)
  # @param [Hash] options Options for the rescue usage.
  # @option options [Boolean] :backtrace Include a backtrace in the rescue response.
  def rescue_from(*args, &block)
+ options = args.last.is_a?(Hash) ? args.pop : {}
+
  if block_given?
- args.each do |arg|
-  imbue(:rescue_handlers, { arg => block })
- end
+ handler = block
+ elsif options.has_key?(:with)
+ handler = proc { options[:with] }
  end
- imbue(:rescue_options, args.pop) if args.last.is_a?(Hash)
+
+ args.each do |arg|
+ imbue(:rescue_handlers, { arg => handler })
+ end
+
+ imbue(:rescue_options, options)
  set(:rescue_all, true) and return if args.include?(:all)
  imbue(:rescued_errors, args)
  end

spec/grape/api_spec.rb

@@ -975,6 +975,17 @@ def three
  lambda{ get '/unrescued' }.should raise_error
  end
 
+ it 'can rescue errors with a method instead of a block' do
+ def rescue_arg_err; Rack::Response.new('Error via method', 400); end
+ subject.rescue_from ArgumentError, with: rescue_arg_err
+
+ subject.get('/exception'){ raise ArgumentError }
+ get '/exception'
+
+ last_response.status.should == 400
+ last_response.body.should == 'Error via method'
+ end
+
  it 'does not re-raise exceptions of type Grape::Exception::Base' do
  class CustomError < Grape::Exceptions::Base; end
  subject.get('/custom_exception'){ raise CustomError }