bugsnag 1.2.1 → 1.2.2

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - 1.8.7

data/Gemfile

@@ -9,6 +9,6 @@ gem "httparty", ">= 0.5", "< 1.0"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.11.0"
-  gem "rdoc"
-  gem "jeweler", "~> 1.6.4"
-end
+  gem "rdoc", "~> 3.12"
+  gem "jeweler", "~> 1.8.4"
+end

data/Gemfile.lock

@@ -6,10 +6,11 @@ GEM
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.7.5)
     multi_json (1.3.6)
     multi_xml (0.5.1)
@@ -30,7 +31,7 @@ PLATFORMS
 
 DEPENDENCIES
   httparty (>= 0.5, < 1.0)
-  jeweler (~> 1.6.4)
+  jeweler (~> 1.8.4)
   multi_json (~> 1.0)
-  rdoc
+  rdoc (~> 3.12)
   rspec (~> 2.11.0)

data/README.md

@@ -391,10 +391,16 @@ Contributing
 
 -   [Fork](https://help.github.com/articles/fork-a-repo) the [notifier on github](https://github.com/bugsnag/bugsnag-ruby)
 -   Commit and push until you are happy with your contribution
+-   Run the tests with `rake spec` and make sure they all pass
 -   [Make a pull request](https://help.github.com/articles/using-pull-requests)
 -   Thanks!
 
 
+Build Status
+------------
+[![Build Status](https://secure.travis-ci.org/bugsnag/bugsnag-ruby.png)](http://travis-ci.org/bugsnag/bugsnag-ruby)
+
+
 License
 -------
 

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/bugsnag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bugsnag"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-09-30"
+  s.date = "2012-10-01"
   s.description = "Ruby notifier for bugsnag.com"
   s.email = "james@bugsnag.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -48,10 +49,10 @@ Gem::Specification.new do |s|
     "lib/bugsnag/version.rb",
     "lib/resque/failure/bugsnag.rb",
     "rails/init.rb",
+    "spec/middleware_spec.rb",
     "spec/notification_spec.rb",
-    "spec/spec_helper.rb",
-    "test/helper.rb",
-    "test/test_bugsnag.rb"
+    "spec/rack_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/bugsnag/bugsnag-ruby"
   s.licenses = ["MIT"]
@@ -66,21 +67,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_runtime_dependency(%q<httparty>, ["< 1.0", ">= 0.5"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.5"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     s.add_dependency(%q<multi_json>, ["~> 1.0"])
     s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.5"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end
 

data/lib/bugsnag/configuration.rb

@@ -61,7 +61,6 @@ module Bugsnag
     end
 
     def set_request_data(key, value)
-      Bugsnag.warn "Overwriting request data for key #{key.to_s}" if self.request_data[key]
       self.request_data[key] = value
     end
     

data/lib/bugsnag/rack.rb

@@ -22,7 +22,7 @@ module Bugsnag
         end
 
         # Hook up rack-based notification middlewares
-        config.middleware.use Bugsnag::Middleware::RackRequest
+        config.middleware.use Bugsnag::Middleware::RackRequest if defined?(::Rack)
         config.middleware.use Bugsnag::Middleware::WardenUser if defined?(Warden)
       end
     end

data/spec/middleware_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Bugsnag::MiddlewareStack do
+  it "should run before_bugsnag_notify callbacks, adding a tab" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      event = get_event_from_payload(payload)
+      event[:metaData][:some_tab].should_not be_nil
+      event[:metaData][:some_tab][:info].should be == "here"
+      event[:metaData][:some_tab][:data].should be == "also here"
+    end
+    
+    callback_run_count = 0
+    Bugsnag.before_notify_callbacks << lambda {|notif|
+      notif.add_tab(:some_tab, {
+        :info => "here",
+        :data => "also here"
+      })
+      callback_run_count += 1
+    }
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+    callback_run_count.should be == 1
+  end
+  
+  it "should run before_bugsnag_notify callbacks, adding custom data" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      event = get_event_from_payload(payload)
+      event[:metaData][:custom].should_not be_nil
+      event[:metaData][:custom][:info].should be == "here"
+      event[:metaData][:custom][:data].should be == "also here"
+    end
+    
+    callback_run_count = 0
+    Bugsnag.before_notify_callbacks << lambda {|notif|
+      notif.add_custom_data(:info, "here")
+      notif.add_custom_data(:data, "also here")
+      
+      callback_run_count += 1
+    }
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+    callback_run_count.should be == 1
+  end
+  
+  it "overrides should override data set in before_notify" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      event = get_event_from_payload(payload)
+      event[:metaData][:custom].should_not be_nil
+      event[:metaData][:custom][:info].should be == "here2"
+      event[:metaData][:custom][:data].should be == "also here"
+    end
+    
+    callback_run_count = 0
+    Bugsnag.before_notify_callbacks << lambda {|notif|
+      notif.add_custom_data(:info, "here")
+      notif.add_custom_data(:data, "also here")
+      
+      callback_run_count += 1
+    }
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "here2"})
+    callback_run_count.should be == 1
+  end
+  
+  it "should have no before or after callbacks by default" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      event = get_event_from_payload(payload)
+      event[:metaData].should have(0).items
+    end
+    
+    Bugsnag.before_notify_callbacks.should have(0).items
+    Bugsnag.after_notify_callbacks.should have(0).items
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+  end
+  
+  it "should run after_bugsnag_notify callbacks" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      event = get_event_from_payload(payload)
+    end
+    
+    callback_run_count = 0
+    Bugsnag.after_notify_callbacks << lambda {|notif|
+      callback_run_count += 1
+    }
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+    
+    callback_run_count.should be == 1
+  end
+end

data/spec/notification_spec.rb

@@ -1,29 +1,9 @@
 require 'spec_helper'
-require 'bugsnag'
 require 'securerandom'
 
 module ActiveRecord; class RecordNotFound < RuntimeError; end; end
-class BugsnagTestException < RuntimeError; end
-
-def get_event_from_payload(payload)
-  payload[:events].should have(1).items
-  payload[:events].first
-end
-
-def get_exception_from_payload(payload)
-  event = get_event_from_payload(payload)
-  event[:exceptions].should have(1).items
-  event[:exceptions].last
-end
 
 describe Bugsnag::Notification do
-  before(:each) do
-    Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
-    Bugsnag.configure do |config|
-      config.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
-    end
-  end
-
   it "should contain an api_key if one is set" do
     Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
       payload[:apiKey].should be == "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
@@ -202,6 +182,14 @@ describe Bugsnag::Notification do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
   end
 
+  it "should use the http://notify.bugsnag.com endpoint by default" do
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      endpoint.should be == "http://notify.bugsnag.com"
+    end
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+  end
+
   it "should use ssl when use_ssl is true" do
     Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
       endpoint.should start_with "https://"

data/spec/rack_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Bugsnag::Rack do
+  it "should call the upstream rack app with the environment" do
+    rack_env = {"key" => "value"}
+    app = lambda { |env| ['response', {}, env] }
+    rack_stack = Bugsnag::Rack.new(app)
+  
+    response = rack_stack.call(rack_env)
+  
+    response.should be == ['response', {}, rack_env]
+  end
+
+  context "when an exception is raised in rack middleware" do
+    # Build a fake crashing rack app
+    exception = BugsnagTestException.new("It crashed")
+    rack_env = {"key" => "value"}
+    app = lambda { |env| raise exception }
+    rack_stack = Bugsnag::Rack.new(app)
+
+    it "should re-raise the exception" do
+      expect { rack_stack.call(rack_env) }.to raise_error(BugsnagTestException)
+    end
+
+    it "should deliver an exception if auto_notify is enabled" do
+      Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+        exception_class = payload[:events].first[:exceptions].first[:errorClass]
+        exception_class.should be == exception.class.to_s
+      end
+
+      rack_stack.call(rack_env) rescue nil
+    end
+    
+    it "should not deliver an exception if auto_notify is disabled" do
+      Bugsnag.configure do |config|
+        config.auto_notify = false
+      end
+
+      Bugsnag::Notification.should_not_receive(:deliver_exception_payload)
+
+      rack_stack.call(rack_env) rescue nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+require 'bugsnag'
+
+class BugsnagTestException < RuntimeError; end
+
+def get_event_from_payload(payload)
+  payload[:events].should have(1).items
+  payload[:events].first
+end
+
+def get_exception_from_payload(payload)
+  event = get_event_from_payload(payload)
+  event[:exceptions].should have(1).items
+  event[:exceptions].last
+end
+
+RSpec.configure do |config|
+  config.order = "random"
+  
+  config.before(:each) do
+    Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
+    Bugsnag.configure do |config|
+      config.api_key = "c9d60ae4c7e70c4b6c4ebd3e8056d2b8"
+    end
+  end
+  
+  config.after(:each) do
+    Bugsnag.configuration.clear_request_data
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-30 00:00:00 Z
+date: 2012-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -74,12 +74,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
-        - 0
-        version: "0"
+        - 3
+        - 12
+        version: "3.12"
   prerelease: false
   type: :development
   name: rdoc
@@ -90,12 +91,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 63
         segments: 
         - 1
-        - 6
+        - 8
         - 4
-        version: 1.6.4
+        version: 1.8.4
   prerelease: false
   type: :development
   name: jeweler
@@ -112,6 +113,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -141,10 +143,10 @@ files:
 - lib/bugsnag/version.rb
 - lib/resque/failure/bugsnag.rb
 - rails/init.rb
+- spec/middleware_spec.rb
 - spec/notification_spec.rb
+- spec/rack_spec.rb
 - spec/spec_helper.rb
-- test/helper.rb
-- test/test_bugsnag.rb
 homepage: http://github.com/bugsnag/bugsnag-ruby
 licenses: 
 - MIT

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'bugsnag'
-
-class Test::Unit::TestCase
-end

data/test/test_bugsnag.rb

@@ -1,22 +0,0 @@
-require 'helper'
-require 'logger'
-
-class BugsnagTestException < RuntimeError; end
-
-class TestBugsnag < Test::Unit::TestCase
-  should "send a normal exception" do
-    Bugsnag.configure do |config|
-      config.api_key = "2dd3f9aaef927b88be4e3c713b663354"
-      config.release_stage = "production"
-      config.project_root = File.dirname(__FILE__)
-      config.logger = Logger.new(STDOUT)
-    end
-    
-    begin
-      raise BugsnagTestException.new("Exception test from bugsnag gem")
-    rescue Exception => e
-      response = Bugsnag.notify(e)
-      flunk "oh my" if response.code != 200
-    end
-  end
-end