Base enable show_exceptions, dump_errors in development

lib/sinatra/base.rb

@@ -1022,14 +1022,14 @@ module Sinatra
 
     reset!
 
-    set :raise_errors, true
-    set :dump_errors, false
+    set :environment, (ENV['RACK_ENV'] || :development).to_sym
+    set :raise_errors, Proc.new { !development? }
+    set :dump_errors, Proc.new { development? }
+    set :show_exceptions, Proc.new { development? }
     set :clean_trace, true
-    set :show_exceptions, false
     set :sessions, false
     set :logging, false
     set :methodoverride, false
-    set :environment, (ENV['RACK_ENV'] || :development).to_sym
 
     set :run, false                       # start server via at-exit hook?
     set :running, false                   # is the built-in server running now?

test/settings_test.rb

@@ -177,8 +177,10 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'raise_errors' do
-    it 'is enabled on Base' do
+    it 'is enabled on Base except under development' do
       assert @base.raise_errors?
+      @base.environment = :development
+      assert !@base.raise_errors?
     end
 
     it 'is enabled on Application only in test' do
@@ -190,8 +192,10 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'show_exceptions' do
-    it 'is disabled on Base' do
+    it 'is disabled on Base except under development' do
       assert ! @base.show_exceptions?
+      @base.environment = :development
+      assert @base.show_exceptions?
     end
 
     it 'is disabled on Application except in development' do
@@ -219,8 +223,10 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'dump_errors' do
-    it 'is disabled on Base' do
+    it 'is disabled on Base except in development' do
       assert ! @base.dump_errors?
+      @base.environment = :development
+      assert @base.dump_errors?
     end
 
     it 'is enabled on Application' do