From 932665fe159d82b47ee682d2a92597ed3f402fac Mon Sep 17 00:00:00 2001
From: Kunpei Sakai <namusyaka@gmail.com>
Date: Mon, 4 Feb 2019 01:06:35 +0900
Subject: [PATCH] ignore bundler/inline from callers

Fixes #1507
---
 lib/sinatra/base.rb   | 2 +-
 test/settings_test.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index 4875e0baed..c5379523e8 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -1168,7 +1168,7 @@ class << self
         /^\(.*\)$/,                                         # generated code
         /rubygems\/(custom|core_ext\/kernel)_require\.rb$/, # rubygems require hacks
         /active_support/,                                   # active_support require hacks
-        /bundler(\/runtime)?\.rb/,                          # bundler require hacks
+        /bundler(\/(?:runtime|inline))?\.rb/,               # bundler require hacks
         /<internal:/,                                       # internal in ruby >= 1.9.2
         /src\/kernel\/bootstrap\/[A-Z]/                     # maglev kernel files
       ]
diff --git a/test/settings_test.rb b/test/settings_test.rb
index 0b10ca5fa4..8b9c137911 100644
--- a/test/settings_test.rb
+++ b/test/settings_test.rb
@@ -186,6 +186,12 @@ def foo=(value)
       @base.enable :methodoverride
       assert @base.methodoverride?
     end
+
+    it 'ignores bundler/inline from callers' do
+      @application.stub(:caller, ->(_){ ['/path/to/bundler/inline.rb', $0] }) do
+        assert_equal File.expand_path($0), File.expand_path(@application.send(:caller_files).first)
+      end
+    end
   end
 
   describe 'run' do