@@ -575,11 +575,16 @@ module Sinatra # Find an custom error block for the key(s) specified. def error_block!(*keys) - errmap = self.class.errors keys.each do |key| - if block = errmap[key] - res = instance_eval(&block) - return res + base = self.class + while base.respond_to?(:errors) + if block = base.errors[key] + # found a handler, eval and return result + res = instance_eval(&block) + return res + else + base = base.superclass + end end end nil @@ -900,7 +905,7 @@ module Sinatra @templates = {} @conditions = [] @filters = [] - @errors = base.errors.dup + @errors = {} @middleware = base.middleware.dup @prototype = nil @extensions = [] lib/sinatra/base.rb @@ -101,6 +101,37 @@ class MappedErrorTest < Test::Unit::TestCase assert_equal 404, status assert_equal "Lost, are we?", body end + + it 'inherits error mappings from base class' do + base = Class.new(Sinatra::Base) + base.error(FooError) { 'base class' } + + mock_app(base) { + set :raise_errors, false + get '/' do + raise FooError + end + } + + get '/' + assert_equal 'base class', body + end + + it 'overrides error mappings in base class' do + base = Class.new(Sinatra::Base) + base.error(FooError) { 'base class' } + + mock_app(base) { + set :raise_errors, false + error(FooError) { 'subclass' } + get '/' do + raise FooError + end + } + + get '/' + assert_equal 'subclass', body + end end describe 'Custom Error Pages' do test/mapped_error_test.rb 4de90276a0b5dcfa42b8378fb2a2f1153087fb75 Ryan Tomayko rtomayko@gmail.com http://github.com/bmizerany/sinatra/commit/5c405a76d1e9e65e41b728abc82bc7a1402986c1 5c405a76d1e9e65e41b728abc82bc7a1402986c1 2009-06-07T04:12:20-07:00 2009-03-26T09:02:40-07:00 Better error mapping inheritance 8cda27f755309a4e8309cf8bbd9277bf46cfbc7b Ryan Tomayko rtomayko@gmail.com