Merge pull request #1061 from BenMorganIO/rack-2-support

Rack 2 Support
2015-12-31 13:03:48 -07:00 · 2015-12-31 13:03:48 -07:00 · 555d476bf1
parent 7610d5faf9 5993492ecc
commit 555d476bf1
1 changed files with 5 additions and 1 deletions
--- a/lib/sinatra/show_exceptions.rb
+++ b/lib/sinatra/show_exceptions.rb
@ -1,4 +1,8 @@
-require 'rack/showexceptions'
+begin
+  require 'rack/show_exceptions'
+rescue LoadError
+  require 'rack/showexceptions'
+end

 module Sinatra
  # Sinatra::ShowExceptions catches all exceptions raised from the app it