bugsnag 2.8.12 → 2.8.13

data/docs/README.md

@@ -0,0 +1,14 @@
+# `bugsnag-ruby` Usage and Configuration
+
+## [Configuration](Configuration.md)
+
+Bugsnag includes several configuration for better compatibility with your
+project and network settings.
+
+## [Notification Options](Notification Options.md)
+
+It is often useful to send additional metadata about your app, such as
+information about the currently logged in user, along with any exceptions, to
+help debug problems. This document lists possible per-notification options as
+well as additional configuration available for different project types,
+including Rails, Rails API, and other frameworks.

data/lib/bugsnag/configuration.rb

@@ -14,6 +14,7 @@ module Bugsnag
     attr_accessor :send_environment
     attr_accessor :send_code
     attr_accessor :project_root
+    attr_accessor :vendor_paths
     attr_accessor :app_version
     attr_accessor :app_type
     attr_accessor :params_filters
@@ -79,6 +80,7 @@ module Bugsnag
       self.hostname = default_hostname
       self.delivery_method = DEFAULT_DELIVERY_METHOD
       self.timeout = 15
+      self.vendor_paths = [%r{vendor/}]
 
       # Read the API key from the environment
       self.api_key = ENV["BUGSNAG_API_KEY"]

data/lib/bugsnag/delivery/thread_queue.rb

@@ -11,19 +11,17 @@ module Bugsnag
         def deliver(url, body, configuration)
           start_once!
 
-          if queue.length > MAX_OUTSTANDING_REQUESTS
-            Bugsnag.warn("Dropping notification, #{queue.length} outstanding requests")
+          if @queue.length > MAX_OUTSTANDING_REQUESTS
+            Bugsnag.warn("Dropping notification, #{@queue.length} outstanding requests")
             return
           end
 
           # Add delivery to the worker thread
-          queue.push proc { super(url, body, configuration) }
+          @queue.push proc { super(url, body, configuration) }
         end
 
         private
 
-        attr_reader :queue
-
         def start_once!
           MUTEX.synchronize do
             return if @started
@@ -32,15 +30,15 @@ module Bugsnag
             @queue = Queue.new
 
             worker_thread = Thread.new do
-              while x = queue.pop
+              while x = @queue.pop
                 break if x == STOP
                 x.call
               end
             end
 
             at_exit do
-              Bugsnag.warn("Waiting for #{queue.length} outstanding request(s)") unless queue.empty?
-              queue.push STOP
+              Bugsnag.warn("Waiting for #{@queue.length} outstanding request(s)") unless @queue.empty?
+              @queue.push STOP
               worker_thread.join
             end
           end

data/lib/bugsnag/deploy.rb

@@ -1,4 +1,3 @@
-require "bugsnag"
 require "json"
 
 module Bugsnag

data/lib/bugsnag/notification.rb

@@ -30,7 +30,7 @@ module Bugsnag
     CURRENT_PAYLOAD_VERSION = "2"
 
     attr_accessor :context
-    attr_accessor :user
+    attr_reader :user
     attr_accessor :configuration
     attr_accessor :meta_data
 
@@ -380,7 +380,7 @@ module Bugsnag
 
         # Generate the stacktrace line hash
         trace_hash = {}
-        trace_hash[:inProject] = true if @configuration.project_root && file.match(/^#{@configuration.project_root}/) && !file.match(/vendor\//)
+        trace_hash[:inProject] = true if in_project?(file)
         trace_hash[:lineNumber] = line_str.to_i
 
         if @configuration.send_code
@@ -410,6 +410,17 @@ module Bugsnag
       end.compact
     end
 
+    def in_project?(line)
+      return false if @configuration.vendor_paths && @configuration.vendor_paths.any? do |vendor_path|
+        if vendor_path.is_a?(String)
+          line.include?(vendor_path)
+        else
+          line =~ vendor_path
+        end
+      end
+      @configuration.project_root && line.start_with?(@configuration.project_root.to_s)
+    end
+
     def code(file, line_number, num_lines = 7)
       code_hash = {}
 

data/lib/bugsnag/railtie.rb

@@ -69,9 +69,9 @@ module Bugsnag
 
     initializer "bugsnag.use_rack_middleware" do |app|
       begin
-        app.config.middleware.insert_after ActionDispatch::DebugExceptions, "Bugsnag::Rack"
+        app.config.middleware.insert_after ActionDispatch::DebugExceptions, Bugsnag::Rack
       rescue
-        app.config.middleware.use "Bugsnag::Rack"
+        app.config.middleware.use Bugsnag::Rack
       end
     end
   end

data/lib/bugsnag/tasks/bugsnag.rake

@@ -49,7 +49,7 @@ namespace :bugsnag do
       config_command += " --app #{ENV["HEROKU_APP"]}" if ENV["HEROKU_APP"]
       heroku_env = run_command.call(config_command).split(/[\n\r]/).each_with_object({}) do |c, obj|
         k,v = c.split("=")
-        obj[k] = v.strip.empty? ? nil : v
+        obj[k] = (v.nil? || v.strip.empty?) ? nil : v
       end
 
       # Check for Bugsnag API key (required)

data/spec/notification_spec.rb

@@ -417,6 +417,19 @@ describe Bugsnag::Notification do
     }
   end
 
+  it "does not mark the top-most stacktrace line as inProject if it matches a vendor path" do
+    Bugsnag.configuration.project_root = File.expand_path('../../', __FILE__)
+    Bugsnag.configuration.vendor_paths = [File.expand_path('../', __FILE__)]
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      exception = get_exception_from_payload(payload)
+      expect(exception["stacktrace"].size).to be >= 1
+      expect(exception["stacktrace"].first["inProject"]).to be_nil
+    }
+  end
+
   it "marks the top-most stacktrace line as inProject if necessary" do
     Bugsnag.configuration.project_root = File.expand_path File.dirname(__FILE__)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))

data/spec/spec_helper.rb

@@ -27,12 +27,12 @@ RSpec.configure do |config|
     WebMock.stub_request(:post, "https://notify.bugsnag.com/")
 
     Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
-    Bugsnag.configure do |config|
-      config.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
-      config.release_stage = "production"
-      config.delivery_method = :synchronous
+    Bugsnag.configure do |bugsnag|
+      bugsnag.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
+      bugsnag.release_stage = "production"
+      bugsnag.delivery_method = :synchronous
       # silence logger in tests
-      config.logger = Logger.new(StringIO.new)
+      bugsnag.logger = Logger.new(StringIO.new)
     end
   end
 

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.8.12
+  version: 2.8.13
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby notifier for bugsnag.com
@@ -108,10 +108,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -120,6 +120,9 @@ files:
 - Rakefile
 - VERSION
 - bugsnag.gemspec
+- docs/Configuration.md
+- docs/Notification Options.md
+- docs/README.md
 - lib/bugsnag.rb
 - lib/bugsnag/capistrano.rb
 - lib/bugsnag/capistrano2.rb
@@ -181,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for bugsnag.com