lib/active_support/deprecation/reporting.rb in activesupport-5.0.0.beta2 vs lib/active_support/deprecation/reporting.rb in activesupport-5.0.0.beta3

@@ -1,5 +1,7 @@
+require 'rbconfig'
+
 module ActiveSupport
   class Deprecation
     module Reporting
       # Whether to print a message (silent mode)
       attr_accessor :silenced
@@ -79,27 +81,33 @@
         end
 
         def extract_callstack(callstack)
           return _extract_callstack(callstack) if callstack.first.is_a? String
 
-          rails_gem_root = File.expand_path("../../../../..", __FILE__) + "/"
           offending_line = callstack.find { |frame|
-            frame.absolute_path && !frame.absolute_path.start_with?(rails_gem_root)
+            frame.absolute_path && !ignored_callstack(frame.absolute_path)
           } || callstack.first
+
           [offending_line.path, offending_line.lineno, offending_line.label]
         end
 
         def _extract_callstack(callstack)
           warn "Please pass `caller_locations` to the deprecation API" if $VERBOSE
-          rails_gem_root = File.expand_path("../../../../..", __FILE__) + "/"
-          offending_line = callstack.find { |line| !line.start_with?(rails_gem_root) } || callstack.first
+          offending_line = callstack.find { |line| !ignored_callstack(line) } || callstack.first
+
           if offending_line
             if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
               md.captures
             else
               offending_line
             end
           end
+        end
+
+        RAILS_GEM_ROOT = File.expand_path("../../../../..", __FILE__) + "/"
+
+        def ignored_callstack(path)
+          path.start_with?(RAILS_GEM_ROOT) || path.start_with?(RbConfig::CONFIG['rubylibdir'])
         end
     end
   end
 end