Merging in from master.

Author: Michael Bleigh

README.markdown

@@ -168,6 +168,15 @@ class Twitter::API < Grape::API
 end
 ```
 
+    class Twitter::API < Grape::API
+      rescue_from ArgumentError do |e|
+        Rack::Response.new([ "ArgumentError: #{e.message}" ], 500)
+      end
+      rescue_from NotImplementedError do |e|
+        Rack::Response.new([ "NotImplementedError: #{e.message}" ], 500)
+      end
+    end
+
 ## Writing Tests
 
 You can test a Grape API with RSpec. Tests make HTTP requests, therefore they must go into the `spec/request` group. You may want your API code to go into `app/api` - you can match that layout under `spec` by adding the following in `spec/spec_helper.rb`.

lib/grape/api.rb

@@ -52,6 +52,22 @@ def set(key, value)
         @settings.last[key.to_sym] = value
       end
 
+      # Add to a configuration value for this
+      # namespace.
+      #
+      # @param key [Symbol] The key of the configuration variable.
+      # @param value [Object] The value to which to set the configuration variable.
+      def add(key, value)
+        current = @settings.last[key.to_sym]
+        if current.is_a?(Array)
+          current.concat(value)
+        elsif current.is_a?(Hash)
+          current.merge!(value)
+        else
+          @settings.last[key.to_sym] = value
+        end
+      end
+      
       # Define a root URL prefix for your entire
       # API.
       def prefix(prefix = nil)
@@ -122,12 +138,12 @@ def default_error_status(new_status = nil)
       def rescue_from(*args, &block)
         if block_given?
           args.each do |arg|
-            set(:rescue_handlers, { arg => block })
+            add(:rescue_handlers, { arg => block })
           end
         end
-        set(:rescue_options, args.pop) if args.last.is_a?(Hash)
+        add(:rescue_options, args.pop) if args.last.is_a?(Hash)
         set(:rescue_all, true) and return if args.include?(:all)
-        set(:rescued_errors, args)
+        add(:rescued_errors, args)
       end
 
       # Add helper methods that will be accessible from any

lib/grape/middleware/base.rb

@@ -1,4 +1,5 @@
 require 'multi_json'
+require 'multi_xml'
 
 module Grape
   module Middleware
@@ -54,9 +55,11 @@ module Formats
         FORMATTERS = {
           :json => :encode_json,
           :txt => :encode_txt,
+          :xml => :encode_xml
         }
         PARSERS = {
-          :json => :decode_json
+          :json => :decode_json,
+          :xml => :decode_xml
         }
 
         def formatters
@@ -120,6 +123,14 @@ def encode_json(object)
         def encode_txt(object)
           object.respond_to?(:to_txt) ? object.to_txt : object.to_s
         end
+        
+        def decode_xml(object)
+          MultiXml.parse(object)
+        end
+        
+        def encode_xml(object)
+          object.respond_to?(:to_xml) ? object.to_xml : object.to_s
+        end
       end
 
     end

spec/grape/api_spec.rb

@@ -743,6 +743,28 @@ class ConnectionError < RuntimeError; end
       last_response.status.should eql 500
       last_response.body.should == 'rescued from ConnectionError'
     end
+    it 'should rescue multiple specific errors' do
+      class ConnectionError < RuntimeError; end
+      class DatabaseError < RuntimeError; end
+      subject.rescue_from ConnectionError do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.rescue_from DatabaseError do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/connection' do
+        raise ConnectionError
+      end
+      subject.get '/database' do
+        raise DatabaseError
+      end
+      get '/connection'
+      last_response.status.should eql 500
+      last_response.body.should == 'rescued from ConnectionError'
+      get '/database'
+      last_response.status.should eql 500
+      last_response.body.should == 'rescued from DatabaseError'
+    end
     it 'should not rescue a different error' do
       class CommunicationError < RuntimeError; end
       subject.rescue_from RuntimeError do |e|

spec/grape/middleware/formatter_spec.rb

@@ -35,6 +35,17 @@ def serializable_hash
 
       subject.call({'PATH_INFO' => '/somewhere'}).last.each{|b| b.should == '{"abc":"def"}'}
     end
+    
+    it 'should call #to_xml if the content type is xml' do
+      @body = "string"
+      @body.instance_eval do
+        def to_xml
+          "<bar/>"
+        end
+      end
+      
+      subject.call({'PATH_INFO' => '/somewhere.xml'}).last.each{|b| b.should == '<bar/>'}
+    end
   end
 
   context 'detection' do
@@ -130,6 +141,10 @@ def serializable_hash
       subject.env['rack.request.form_hash']['is_boolean'].should be_true
       subject.env['rack.request.form_hash']['string'].should == 'thing'
     end
+    it 'should parse the body from an xml POST/PUT and put the contents into rack.request.from_hash' do
+      subject.call({'PATH_INFO' => '/info.xml', 'Accept' => 'application/xml', 'rack.input' => StringIO.new('<thing><name>Test</name></thing>')})
+      subject.env['rack.request.form_hash']['thing']['name'].should == 'Test'
+    end
     it 'should be able to fail gracefully if the body is regular POST content' do
       subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json', 'rack.input' => StringIO.new('name=Other+Test+Thing')})
       subject.env['rack.request.form_hash'].should be_nil