From b1b922d6ea96bca0d0406032b02b1cd4b6e7f6c7 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 27 Feb 2010 17:10:04 -0800 Subject: Revert "Revert "Application detection should also allow dots in the path."" Works after all. Culprit was 226dfc2. This reverts commit 6189480b1878cdadb092fdfa32ba156a91e6a0e1. --- railties/lib/rails/engine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index a259edc826..b6ac48768d 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -17,7 +17,7 @@ module Rails base.called_from = begin # Remove the line number from backtraces making sure we don't leave anything behind call_stack = caller.map { |p| p.split(':')[0..-2].join(':') } - File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-]*/lib/rails|rack[\w\-]*/lib/rack] }) + File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-\.]*/lib/rails|rack[\w\-\.]*/lib/rack] }) end end -- cgit v1.2.3