V6

.travis.yml

@@ -1,14 +1,35 @@
 sudo: false
 language: ruby
-cache: bundler
-rvm:
-- 2.3.0
-- 2.2.4
-- 2.1.8
-- 2.0.0
-- 1.9.3
-- jruby-19mode
 
 before_install:
-- gem update --system 2.1.11
+- gem install bundler -v 1.12
+- gem update --system
+- bundle --version
 - gem --version
+
+install:
+- bundle _1.12.0_ install --with "$GEMSETS"
+
+script:
+- bundle _1.12.0_ exec rake
+
+jobs:
+  include:
+  - stage: test
+    env: GEMSETS=test
+    rvm: jruby-19mode
+  - stage: test
+    env: GEMSETS=test
+    rvm: 1.9.3
+  - stage: test
+    env: GEMSETS=test
+    rvm: 2.0.0
+  - stage: test
+    env: GEMSETS=test
+    rvm: 2.1.10
+  - stage: test
+    env: GEMSETS="test sidekiq"
+    rvm: 2.2.4
+  - stage: test
+    env: GEMSETS="test sidekiq coverage"
+    rvm: 2.3.0

Gemfile

@@ -1,2 +1,21 @@
 source "https://rubygems.org"
+
+group :test, optional: true do
+    gem 'rake', '~> 10.1.1'
+    gem 'rspec'
+    gem 'rdoc'
+    gem 'pry'
+    gem 'addressable', '~> 2.3.8'
+    gem 'webmock', RUBY_VERSION <= '1.9.3' ? '2.3.2': '>2.3.2'
+end
+
+group :coverage, optional: true do
+    gem 'simplecov'
+    gem 'coveralls'
+end
+
+group :sidekiq, optional: true do
+    gem 'sidekiq', '~> 5.0.4'
+end
+
 gemspec

Rakefile

@@ -3,8 +3,9 @@
 require 'rubygems'
 require 'bundler'
 require 'bundler/gem_tasks'
+
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -24,6 +25,13 @@ end
 # RSpec tasks
 require 'rspec/core'
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |task|
+  begin
+    require 'sidekiq/testing'
+  rescue LoadError
+    puts "Skipping sidekiq tests, missing dependencies"
+    task.rspec_opts = "--exclude-pattern **/integrations/sidekiq_spec.rb"
+  end
+end
 
 task :default  => :spec

bugsnag.gemspec

@@ -18,11 +18,4 @@ Gem::Specification.new do |s|
   ]
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 1.9.2'
-
-  s.add_development_dependency 'rake', '~> 10.1.1'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'addressable', '~> 2.3.8'
-  s.add_development_dependency 'webmock'
 end

example/padrino/README.md

@@ -35,7 +35,10 @@ explicitly.
 
 ```
 error 500 do
-  Bugsnag.auto_notify($!)
+  Bugsnag.notify($!) do |report|
+    report.severity = "error"
+  end
+
   erb :'errors/500'
 end
 ```

example/sinatra/README.md

@@ -33,7 +33,9 @@ explicitly.
 
 ```
 error 500 do
-  Bugsnag.auto_notify($!)
+  Bugsnag.notify($!) do |report|
+    report.severity = "error"
+  end
   erb :'errors/500'
 end
 ```

lib/bugsnag.rb

@@ -4,17 +4,16 @@
 require "bugsnag/version"
 require "bugsnag/configuration"
 require "bugsnag/meta_data"
-require "bugsnag/notification"
+require "bugsnag/report"
 require "bugsnag/cleaner"
 require "bugsnag/helpers"
-require "bugsnag/deploy"
 
 require "bugsnag/delivery"
 require "bugsnag/delivery/synchronous"
 require "bugsnag/delivery/thread_queue"
 
-require "bugsnag/rack"
-require "bugsnag/railtie" if defined?(Rails::Railtie)
+require "bugsnag/integrations/rack"
+require "bugsnag/integrations/railtie" if defined?(Rails::Railtie)
 
 require "bugsnag/middleware/rack_request"
 require "bugsnag/middleware/warden_user"
@@ -23,81 +22,70 @@
 require "bugsnag/middleware/sidekiq"
 require "bugsnag/middleware/mailman"
 require "bugsnag/middleware/rake"
-require "bugsnag/middleware/callbacks"
 
 module Bugsnag
-  LOG_PREFIX = "** [Bugsnag] "
   LOCK = Mutex.new
 
   class << self
     # Configure the Bugsnag notifier application-wide settings.
-    def configure(config_hash=nil)
-      if config_hash
-        config_hash.each do |k,v|
-          configuration.send("#{k}=", v) rescue nil if configuration.respond_to?("#{k}=")
-        end
-      end
-
+    def configure
       yield(configuration) if block_given?
-
-      # Use resque for asynchronous notification if required
-      require "bugsnag/delay/resque" if configuration.delay_with_resque && defined?(Resque)
-
-      # Log that we are ready to rock
-      @logged_ready = false unless defined?(@logged_ready)
-
-      if configuration.api_key && !@logged_ready
-        log "Bugsnag exception handler #{VERSION} ready"
-        @logged_ready = true
-      end
     end
 
     # Explicitly notify of an exception
-    def notify(exception, overrides=nil, request_data=nil, &block)
-      notification = Notification.new(exception, configuration, overrides, request_data)
-
-      yield(notification) if block_given?
+    def notify(exception, auto_notify=false, &block)
+      if auto_notify && !configuration.auto_notify
+        configuration.debug("Not notifying because auto_notify is disabled")
+        return
+      end
 
-      notification.deliver
-      notification
-    end
+      if !configuration.valid_api_key?
+        configuration.debug("Not notifying due to an invalid api_key")
+        return
+      end
 
-    # Notify of an exception unless it should be ignored
-    def notify_or_ignore(exception, overrides=nil, request_data=nil, &block)
-      notification = Notification.new(exception, configuration, overrides, request_data)
+      if !configuration.should_notify_release_stage?
+        configuration.debug("Not notifying due to notify_release_stages :#{configuration.notify_release_stages.inspect}")
+        return
+      end
 
-      yield(notification) if block_given?
+      report = Report.new(exception, configuration)
 
-      unless notification.ignore?
-        notification.deliver
-        notification
-      else
-        false
+      # If this is an auto_notify we yield the block before the any middleware is run
+      yield(report) if block_given? && auto_notify
+      if report.ignore?
+        configuration.debug("Not notifying #{report.exceptions.last[:errorClass]} due to ignore being signified in auto_notify block")
+        return
       end
-    end
 
-    # Auto notify of an exception, called from rails and rack exception
-    # rescuers, unless auto notification is disabled, or we should ignore this
-    # error class
-    def auto_notify(exception, overrides=nil, request_data=nil, &block)
-      overrides ||= {}
-      overrides.merge!({:severity => "error"})
-      notify_or_ignore(exception, overrides, request_data, &block) if configuration.auto_notify
-    end
+      # Run internal middleware
+      configuration.internal_middleware.run(report)
+      if report.ignore?
+        configuration.debug("Not notifying #{report.exceptions.last[:errorClass]} due to ignore being signified in internal middlewares")
+        return
+      end
 
-    # Log wrapper
-    def log(message)
-      configuration.logger.info("#{LOG_PREFIX}#{message}")
-    end
+      # Run users middleware
+      configuration.middleware.run(report) do
+        if report.ignore?
+          configuration.debug("Not notifying #{report.exceptions.last[:errorClass]} due to ignore being signified in user provided middleware")
+          return
+        end
 
-    # Warning logger
-    def warn(message)
-      configuration.logger.warn("#{LOG_PREFIX}#{message}")
-    end
+        # If this is not an auto_notify then the block was provided by the user. This should be the last
+        # block that is run as it is the users "most specific" block.
+        yield(report) if block_given? && !auto_notify
+        if report.ignore?
+          configuration.debug("Not notifying #{report.exceptions.last[:errorClass]} due to ignore being signified in user provided block")
+          return
+        end
 
-    # Debug logger
-    def debug(message)
-      configuration.logger.info("#{LOG_PREFIX}#{message}") if configuration.debug
+        # Deliver
+        configuration.info("Notifying #{configuration.endpoint} of #{report.exceptions.last[:errorClass]}")
+        payload_string = ::JSON.dump(Bugsnag::Helpers.trim_if_needed(report.as_json))
+        configuration.debug("Payload: #{payload_string}")
+        Bugsnag::Delivery[configuration.delivery_method].deliver(configuration.endpoint, payload_string, configuration)
+      end
     end
 
     # Configuration getters
@@ -106,33 +94,16 @@ def configuration
       @configuration || LOCK.synchronize { @configuration ||= Bugsnag::Configuration.new }
     end
 
-    # Set "per-request" data, temporal data for use in bugsnag middleware
-    def set_request_data(key, value)
-      Bugsnag.configuration.set_request_data(key, value)
-    end
-
-    # Clear all "per-request" data, temporal data for use in bugsnag middleware
-    # This method should be called after each distinct request or session ends
-    # Eg. After completing a page request in a web app
-    def clear_request_data
-      Bugsnag.configuration.clear_request_data
-    end
-
     # Allow access to "before notify" callbacks
     def before_notify_callbacks
       Bugsnag.configuration.request_data[:before_callbacks] ||= []
     end
-
-    # Allow access to "after notify" callbacks
-    def after_notify_callbacks
-      Bugsnag.configuration.request_data[:after_callbacks] ||= []
-    end
   end
 end
 
 [:resque, :sidekiq, :mailman, :delayed_job].each do |integration|
   begin
-    require "bugsnag/#{integration}"
+    require "bugsnag/integrations/#{integration}"
   rescue LoadError
   end
 end