Better file/line detection in sinatra_warn

raggi · Jan 13, 2009 · 4cddd70 · 4cddd70
1 parent 17cb177
commit 4cddd70
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/sinatra/compat.rb b/lib/sinatra/compat.rb
@@ -10,7 +10,9 @@
 
 # Like Kernel#warn but outputs the location that triggered the warning.
 def sinatra_warn(*message)
-  line = caller[1].sub(/:in .*/, '')
+  line = caller.
+    detect { |line| line !~ /(?:lib\/sinatra\/|__DELEGATE__)/ }.
+    sub(/:in .*/, '')
   warn "#{line}: warning: #{message.join(' ')}"
 end