bugsnag 2.5.1 → 2.6.0

data/spec/rack_spec.rb

@@ -5,9 +5,9 @@ describe Bugsnag::Rack do
     rack_env = {"key" => "value"}
     app = lambda { |env| ['response', {}, env] }
     rack_stack = Bugsnag::Rack.new(app)
-  
+
     response = rack_stack.call(rack_env)
-  
+
     expect(response).to eq(['response', {}, rack_env])
   end
 
@@ -23,22 +23,23 @@ describe Bugsnag::Rack do
     end
 
     it "delivers an exception if auto_notify is enabled" do
-      expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
-        exception_class = payload[:events].first[:exceptions].first[:errorClass]
+      rack_stack.call(rack_env) rescue nil
+
+      expect(Bugsnag).to have_sent_notification{ |payload|
+        exception_class = payload["events"].first["exceptions"].first["errorClass"]
         expect(exception_class).to eq(exception.class.to_s)
-      end
+      }
 
-      rack_stack.call(rack_env) rescue nil
     end
-    
+
     it "does not deliver an exception if auto_notify is disabled" do
       Bugsnag.configure do |config|
         config.auto_notify = false
       end
 
-      expect(Bugsnag::Notification).not_to receive(:deliver_exception_payload)
-
       rack_stack.call(rack_env) rescue nil
+
+      expect(Bugsnag::Notification).not_to have_sent_notification
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,32 +1,52 @@
 require 'bugsnag'
 
+require 'webmock/rspec'
+require 'rspec/expectations'
+
 class BugsnagTestException < RuntimeError; end
 
 def get_event_from_payload(payload)
-  expect(payload[:events].size).to eq(1)
-  payload[:events].first
+  expect(payload["events"].size).to eq(1)
+  payload["events"].first
 end
 
 def get_exception_from_payload(payload)
   event = get_event_from_payload(payload)
-  expect(event[:exceptions].size).to eq(1)
-  event[:exceptions].last
+  expect(event["exceptions"].size).to eq(1)
+  event["exceptions"].last
+end
+
+def notify_test_exception(*args)
+  Bugsnag.notify(RuntimeError.new("test message"), *args)
 end
 
 RSpec.configure do |config|
   config.order = "random"
-  
+
   config.before(:each) do
+    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
       # silence logger in tests
       config.logger = Logger.new(StringIO.new)
     end
   end
-  
+
   config.after(:each) do
     Bugsnag.configuration.clear_request_data
   end
 end
+
+def have_sent_notification(&matcher)
+  have_requested(:post, "https://notify.bugsnag.com/").with do |request|
+    if matcher
+      matcher.call JSON.parse(request.body)
+    else
+      true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !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
 email: james@bugsnag.com
 executables: []
@@ -125,6 +139,9 @@ files:
 - lib/bugsnag/configuration.rb
 - lib/bugsnag/delay/resque.rb
 - lib/bugsnag/delayed_job.rb
+- lib/bugsnag/delivery.rb
+- lib/bugsnag/delivery/synchronous.rb
+- lib/bugsnag/delivery/thread_queue.rb
 - lib/bugsnag/deploy.rb
 - lib/bugsnag/helpers.rb
 - lib/bugsnag/mailman.rb
@@ -136,7 +153,6 @@ files:
 - lib/bugsnag/middleware/warden_user.rb
 - lib/bugsnag/middleware_stack.rb
 - lib/bugsnag/notification.rb
-- lib/bugsnag/queue.rb
 - lib/bugsnag/rack.rb
 - lib/bugsnag/rails.rb
 - lib/bugsnag/rails/action_controller_rescue.rb
@@ -152,6 +168,10 @@ files:
 - lib/bugsnag/version.rb
 - lib/generators/bugsnag/bugsnag_generator.rb
 - rails/init.rb
+- spec/code_spec.rb
+- spec/fixtures/crashes/end_of_file.rb
+- spec/fixtures/crashes/short_file.rb
+- spec/fixtures/crashes/start_of_file.rb
 - spec/helper_spec.rb
 - spec/integration_spec.rb
 - spec/middleware_spec.rb

data/lib/bugsnag/queue.rb

@@ -1,36 +0,0 @@
-require 'thread'
-
-module Bugsnag
-  class Queue < ::Queue
-    MAX_OUTSTANDING_REQUESTS = 100
-    STOP = Object.new
-
-    def push(*)
-      if length > MAX_OUTSTANDING_REQUESTS
-        Bugsnag.warn("Dropping notification, #{length} outstanding requests")
-        return
-      end
-      @thread ||= create_processor
-      super
-    end
-
-    private
-
-    def create_processor
-      t = Thread.new do
-        while x = pop
-          break if x == STOP
-          x.call
-        end
-      end
-
-      at_exit do
-        Bugsnag.warn("Waiting for #{length} outstanding request(s)") unless empty?
-        push STOP
-        t.join
-      end
-
-      t
-    end
-  end
-end