Mark Bugsnag frames as out of project

lib/bugsnag/stacktrace.rb

@@ -27,7 +27,7 @@ def initialize(backtrace, configuration)
         # Parse the stacktrace line
 
         # Skip stacktrace lines inside lib/bugsnag
-        next(nil) if file.nil? || file =~ %r{lib/bugsnag(/|\.rb)}
+        next(nil) if file.nil?
 
         # Expand relative paths
         p = Pathname.new(file)

spec/report_spec.rb

@@ -501,7 +501,7 @@ def gloops
     expect(WebMock).to have_requested(:post, "https://notify.bugsnag.com")
   end
 
-  it "does not mark the top-most stacktrace line as inProject if out of project" do
+  it "does not mark the top-most non-bugsnag stacktrace line as inProject if out of project" do
     Bugsnag.configuration.project_root = "/Random/location/here"
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
@@ -512,14 +512,15 @@ def gloops
     }
   end
 
-  it "marks the top-most stacktrace line as inProject if necessary" do
+  it "marks the top-most non-bugsnag stacktrace line as inProject if necessary" do
     Bugsnag.configuration.project_root = File.expand_path File.dirname(__FILE__)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
     expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
       expect(exception["stacktrace"].size).to be >= 1
-      expect(exception["stacktrace"].first["inProject"]).to eq(true)
+      top_frame = get_project_frame(exception["stacktrace"])
+      expect(top_frame["inProject"]).to eq(true)
     }
   end
 
@@ -1051,11 +1052,11 @@ def gloops
       expect(exception["errorClass"]).to eq("RuntimeError")
       expect(exception["message"]).to eq("'nil' was notified as an exception")
 
-      stacktrace = exception["stacktrace"][0]
-      expect(stacktrace["lineNumber"]).to eq(1047)
+      stacktrace = get_project_frame(exception["stacktrace"])
+      expect(stacktrace["lineNumber"]).to eq(1048)
       expect(stacktrace["file"]).to end_with("spec/report_spec.rb")
-      expect(stacktrace["code"]["1046"]).to eq("  it 'uses an appropriate message if nil is notified' do")
-      expect(stacktrace["code"]["1047"]).to eq("    Bugsnag.notify(nil)")
+      expect(stacktrace["code"]["1047"]).to eq("  it 'uses an appropriate message if nil is notified' do")
+      expect(stacktrace["code"]["1048"]).to eq("    Bugsnag.notify(nil)")
     }
   end
 

spec/spec_helper.rb

@@ -84,3 +84,18 @@ def have_sent_notification(&matcher)
     end
   end
 end
+
+def get_project_frame(stacktrace, count=0)
+  index = 0
+  stacktrace.find do |frame|
+    found = false
+    if /.*lib\/bugsnag.*\.rb/.match(frame["file"]).nil?
+      if index == count
+        found = true
+      else
+        index += 1
+        found = false
+      end
+    end
+  end
+end

spec/stacktrace_spec.rb

@@ -12,8 +12,9 @@
 
     expect(Bugsnag).to have_sent_notification{ |payload, headers|
       exception = get_exception_from_payload(payload)
-      starting_line = __LINE__ - 10
-      expect(exception["stacktrace"][1]["code"]).to eq({
+      starting_frame = get_project_frame(exception["stacktrace"], 1)
+      starting_line = __LINE__ - 11
+      expect(starting_frame["code"]).to eq({
         (starting_line + 0).to_s => "    _a = 1",
         (starting_line + 1).to_s => "    _b = 2",
         (starting_line + 2).to_s => "    _c = 3",
@@ -25,6 +26,21 @@
     }
   end
 
+  it "includes bugsnag lines marked out of project" do
+    notify_test_exception
+    expect(Bugsnag).to have_sent_notification{ |payload, headers|
+      exception = get_exception_from_payload(payload)
+      bugsnag_count = 0
+      exception["stacktrace"].each do |frame|
+        if /.*lib\/bugsnag.*\.rb/.match(frame["file"])
+          bugsnag_count += 1
+          expect(frame["inProject"]).to be_nil
+        end
+      end
+      expect(bugsnag_count).to be > 0
+    }
+  end
+
   it "allows you to disable sending code" do
     Bugsnag.configuration.send_code = false