From 45f954fa323ce5901e2ffb5ac73f5bdc48bd13b6 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Sun, 21 Nov 2010 22:59:04 +0100
Subject: [PATCH] ignore bundler when setting app_file (thus finding the
 correct views folder)

---
 lib/sinatra/base.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index d1313a38..38eca243 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -1201,7 +1201,8 @@ module Sinatra
         /\(.*\)/,                                        # generated code
         /rubygems\/custom_require\.rb$/,                 # rubygems require hacks
         /active_support/,                                # active_support require hacks
-        /<internal:/,                                    # internal in ruby >= 1.9.2
+        /bundler(\/runtime)?\.rb/,                       # bundler require hacks
+        /<internal:/                                     # internal in ruby >= 1.9.2
       ]
 
       # add rubinius (and hopefully other VM impls) ignore patterns ...