Merge rescue settings in mounted apps. Issue ruby-grape#214.

Author: aiwilliams

lib/grape/endpoint.rb

@@ -197,12 +197,12 @@ def header(key = nil, val = nil)
         @header
       end
     end
-    
+
     # Set response content-type
     def content_type(val)
       header('Content-Type', val)
     end
-    
+
     # Set or get a cookie
     #
     # @example
@@ -268,7 +268,7 @@ def present(object, options = {})
       representation = { root => representation } if root
       body representation
     end
-    
+
     # Returns route information for the current request.
     #
     # @example
@@ -290,16 +290,16 @@ def run(env)
 
       self.extend helpers
       cookies.read(@request)
-            
+
       Array(settings[:validations]).each do |validator|
         validator.validate!(params)
       end
-      
+
       run_filters befores
       response_text = instance_eval &self.block
       run_filters afters
       cookies.write(header)
-      
+
       [status, header, [body || response_text]]
     end
 
@@ -310,10 +310,10 @@ def build_middleware
       b.use Grape::Middleware::Error,
         :default_status => settings[:default_error_status] || 403,
         :rescue_all => settings[:rescue_all],
-        :rescued_errors => settings[:rescued_errors],
+        :rescued_errors => aggregate_setting(:rescued_errors),
         :format => settings[:error_format] || :txt,
         :rescue_options => settings[:rescue_options],
-        :rescue_handlers => settings[:rescue_handlers] || {}
+        :rescue_handlers => merged_setting(:rescue_handlers)
 
       b.use Rack::Auth::Basic, settings[:auth][:realm], &settings[:auth][:proc] if settings[:auth] && settings[:auth][:type] == :http_basic
       b.use Rack::Auth::Digest::MD5, settings[:auth][:realm], settings[:auth][:opaque], &settings[:auth][:proc] if settings[:auth] && settings[:auth][:type] == :http_digest
@@ -325,7 +325,7 @@ def build_middleware
           :version_options => settings[:version_options]
         }
       end
-      
+
       b.use Grape::Middleware::Formatter,
         :format => settings[:format],
         :default_format => settings[:default_format] || :txt,
@@ -356,6 +356,12 @@ def aggregate_setting(key)
       end
     end
 
+    def merged_setting(key)
+      settings.stack.inject({}) do |merged, frame|
+        merged.merge(frame[key] || {})
+      end
+    end
+
     def run_filters(filters)
       (filters || []).each do |filter|
         instance_eval &filter

spec/grape/api_spec.rb

@@ -68,7 +68,7 @@ def app; subject end
     end
 
     it 'should route if any media type is allowed' do
-      
+
     end
   end
 
@@ -133,7 +133,7 @@ def app; subject end
       get '/members/23'
       last_response.body.should == "23"
     end
-    
+
     it 'should be callable with nil just to push onto the stack' do
       subject.namespace do
         version 'v2', :using => :path
@@ -146,7 +146,7 @@ def app; subject end
       get '/hello'
       last_response.body.should == "outer"
     end
-    
+
     %w(group resource resources segment).each do |als|
       it "`.#{als}` should be an alias" do
         subject.send(als, :awesome) do
@@ -191,7 +191,7 @@ def app; subject end
           RSpec::Mocks::Mock.new(:to_json => 'abc', :to_txt => 'def')
         end
       end
-    
+
       it "should allow .json" do
         get '/abc.json'
         last_response.status.should == 200
@@ -245,7 +245,7 @@ def app; subject end
       subject.route([:get, :post], '/:id/first') do
         "first"
       end
-      
+
       subject.route([:get, :post], '/:id') do
         "ola"
       end
@@ -356,7 +356,7 @@ def app; subject end
       last_response.headers['Content-Type'].should eql 'application/json'
     end
   end
-  
+
   context 'custom middleware' do
     module ApiSpec
       class PhonyMiddleware
@@ -390,7 +390,7 @@ def call(env)
           {:middleware => [[ApiSpec::PhonyMiddleware, 'foo']]}
         ]
         subject.stub!(:settings).and_return(settings)
-  
+
         subject.middleware.should eql [
           [ApiSpec::PhonyMiddleware, 123],
           [ApiSpec::PhonyMiddleware, 'abc'],
@@ -630,7 +630,7 @@ def three
       subject.get '/def' do
         'def'
       end
-      
+
       get '/new/abc'
       last_response.status.should eql 404
       get '/legacy/abc'
@@ -671,6 +671,76 @@ def three
     end
   end
 
+  describe ".rescue_from klass, block" do
+    it 'should rescue Exception' do
+      subject.rescue_from RuntimeError do |e|
+        rack_response("rescued from #{e.message}", 202)
+      end
+      subject.get '/exception' do
+        raise "rain!"
+      end
+      get '/exception'
+      last_response.status.should eql 202
+      last_response.body.should == 'rescued from rain!'
+    end
+    it 'should rescue an error via rescue_from :all' do
+      class ConnectionError < RuntimeError; end
+      subject.rescue_from :all do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/exception' do
+        raise ConnectionError
+      end
+      get '/exception'
+      last_response.status.should eql 500
+      last_response.body.should == 'rescued from ConnectionError'
+    end
+    it 'should rescue a specific error' do
+      class ConnectionError < RuntimeError; end
+      subject.rescue_from ConnectionError do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/exception' do
+        raise ConnectionError
+      end
+      get '/exception'
+      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|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/uncaught' do
+        raise CommunicationError
+      end
+      lambda { get '/uncaught' }.should raise_error(CommunicationError)
+    end
+  end
+
   describe ".error_format" do
     it 'should rescue all errors and return :txt' do
       subject.rescue_from :all
@@ -981,85 +1051,15 @@ def three
       ]
     end
   end
-  
-  describe ".rescue_from klass, block" do
-    it 'should rescue Exception' do
-      subject.rescue_from RuntimeError do |e|
-        rack_response("rescued from #{e.message}", 202)
-      end
-      subject.get '/exception' do
-        raise "rain!"
-      end
-      get '/exception'
-      last_response.status.should eql 202
-      last_response.body.should == 'rescued from rain!'
-    end
-    it 'should rescue an error via rescue_from :all' do
-      class ConnectionError < RuntimeError; end
-      subject.rescue_from :all do |e|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.get '/exception' do
-        raise ConnectionError
-      end
-      get '/exception'
-      last_response.status.should eql 500
-      last_response.body.should == 'rescued from ConnectionError'
-    end
-    it 'should rescue a specific error' do
-      class ConnectionError < RuntimeError; end
-      subject.rescue_from ConnectionError do |e|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.get '/exception' do
-        raise ConnectionError
-      end
-      get '/exception'
-      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|
-        rack_response("rescued from #{e.class.name}", 500)
-      end
-      subject.get '/uncaught' do
-        raise CommunicationError
-      end
-      lambda { get '/uncaught' }.should raise_error(CommunicationError)
-    end
-  end
 
   describe '.mount' do
     let(:mounted_app){ lambda{|env| [200, {}, ["MOUNTED"]]} }
-  
+
     context 'with a bare rack app' do
       before do
         subject.mount mounted_app => '/mounty'
       end
-    
+
       it 'should make a bare Rack app available at the endpoint' do
         get '/mounty'
         last_response.body.should == 'MOUNTED'
@@ -1107,6 +1107,21 @@ class CommunicationError < RuntimeError; end
         get '/v1/cool/awesome'
         last_response.body.should == 'yo'
       end
+
+      it 'should inherit rescues even when some defined by mounted' do
+        subject.rescue_from :all do |e|
+          rack_response("rescued from #{e.message}", 202)
+        end
+        subject.namespace :mounted do
+          app = Class.new(Grape::API)
+          app.rescue_from ArgumentError
+          app.get('/fail') { raise "doh!" }
+          mount app
+        end
+        get '/mounted/fail'
+        last_response.status.should eql 202
+        last_response.body.should == 'rescued from doh!'
+      end
     end
   end
 
@@ -1133,7 +1148,7 @@ class CommunicationError < RuntimeError; end
       subject.instance.should be_nil
     end
   end
-  
+
   describe ".route" do
     context "plain" do
       before(:each) do