honeybadger 1.3.1 → 1.4.0

data/test/unit/backtrace_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'stringio'
 
-class BacktraceTest < Honeybadger::UnitTest
+class BacktraceTest < Test::Unit::TestCase
   should "parse a backtrace into lines" do
     array = [
       "app/models/user.rb:13:in `magic'",
@@ -112,32 +112,43 @@ class BacktraceTest < Honeybadger::UnitTest
 
     backtrace = Honeybadger::Backtrace.parse(array)
 
-    assert_empty backtrace.lines.first.source
-    assert_empty backtrace.lines.second.source
+    assert_equal backtrace.lines.first.source, {}
+    assert_equal backtrace.lines.second.source, {}
+  end
+
+  should "have an empty application trace by default" do
+    backtrace = Honeybadger::Backtrace.parse(build_backtrace_array)
+    assert_equal backtrace.application_lines, []
   end
 
   context "with a project root" do
     setup do
       @project_root = '/some/path'
       Honeybadger.configure {|config| config.project_root = @project_root }
-    end
-
-    teardown do
-      reset_config
-    end
 
-    should "filter out the project root" do
-      backtrace_with_root = Honeybadger::Backtrace.parse(
+      @backtrace_with_root = Honeybadger::Backtrace.parse(
         ["#{@project_root}/app/models/user.rb:7:in `latest'",
          "#{@project_root}/app/controllers/users_controller.rb:13:in `index'",
+         "#{@project_root}/vendor/plugins/foo/bar.rb:42:in `baz'",
          "/lib/something.rb:41:in `open'"],
          :filters => default_filters)
-         backtrace_without_root = Honeybadger::Backtrace.parse(
-           ["[PROJECT_ROOT]/app/models/user.rb:7:in `latest'",
-            "[PROJECT_ROOT]/app/controllers/users_controller.rb:13:in `index'",
-            "/lib/something.rb:41:in `open'"])
+      @backtrace_without_root = Honeybadger::Backtrace.parse(
+        ["[PROJECT_ROOT]/app/models/user.rb:7:in `latest'",
+         "[PROJECT_ROOT]/app/controllers/users_controller.rb:13:in `index'",
+         "[PROJECT_ROOT]/vendor/plugins/foo/bar.rb:42:in `baz'",
+         "/lib/something.rb:41:in `open'"])
+    end
 
-            assert_equal backtrace_without_root, backtrace_with_root
+    should "filter out the project root" do
+      assert_equal @backtrace_without_root, @backtrace_with_root
+    end
+
+    should "have an application trace" do
+      assert_equal @backtrace_without_root.application_lines, @backtrace_without_root.lines[0..1]
+    end
+
+    should "filter ./vendor from application trace" do
+      assert_does_not_contain @backtrace_without_root.application_lines, @backtrace_without_root.lines[2]
     end
   end
 
@@ -148,10 +159,6 @@ class BacktraceTest < Honeybadger::UnitTest
       Honeybadger.configure {|config| config.project_root = @project_root }
     end
 
-    teardown do
-      reset_config
-    end
-
     should "filter out the project root" do
       backtrace_with_root = Honeybadger::Backtrace.parse(
         ["#{@project_root}/app/models/user.rb:7:in `latest'",
@@ -172,10 +179,6 @@ class BacktraceTest < Honeybadger::UnitTest
       Honeybadger.configure {|config| config.project_root = '' }
     end
 
-    teardown do
-      reset_config
-    end
-
     should "not filter line numbers with respect to any project root" do
       backtrace = ["/app/models/user.rb:7:in `latest'",
                    "/app/controllers/users_controller.rb:13:in `index'",

data/test/unit/capistrano_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 require 'capistrano/configuration'
 require 'honeybadger/capistrano'
 
-class CapistranoTest < Honeybadger::UnitTest
+class CapistranoTest < Test::Unit::TestCase
   def setup
     super
     reset_config

data/test/unit/configuration_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
-class ConfigurationTest < Honeybadger::UnitTest
-  include DefinesConstants
-
+class ConfigurationTest < Test::Unit::TestCase
   should "provide default values" do
     assert_config_default :proxy_host,          nil
     assert_config_default :proxy_port,          nil
@@ -28,6 +26,24 @@ class ConfigurationTest < Honeybadger::UnitTest
                           Honeybadger::Configuration::IGNORE_DEFAULT
     assert_config_default :framework, 'Standalone'
     assert_config_default :source_extract_radius, 2
+    assert_config_default :async, nil
+  end
+
+  should "configure async as Proc" do
+    config = Honeybadger::Configuration.new
+    async_handler = Proc.new { |n| n.deliver }
+    assert !config.async?, 'Configuration#async? should be falsey'
+    config.async = async_handler
+    assert config.async?, 'Configuration#async? should be truthy'
+    assert_equal config.async, async_handler
+  end
+
+  should "configure async with block" do
+    config = Honeybadger::Configuration.new
+    assert !config.async?, 'Configuration#async? should be falsey'
+    config.async { |n| n }
+    assert config.async?, 'Configuration#async? should be truthy'
+    assert_equal config.async.call('foo'), 'foo'
   end
 
   should "stub current_user_method" do

data/test/unit/honeybadger_tasks_test.rb

@@ -6,7 +6,7 @@ require 'fakeweb'
 
 FakeWeb.allow_net_connect = false
 
-class HoneybadgerTasksTest < Honeybadger::UnitTest
+class HoneybadgerTasksTest < Test::Unit::TestCase
   def successful_response(body = "")
     response = Net::HTTPSuccess.new('1.2', '200', 'OK')
     response.stubs(:body).returns(body)

data/test/unit/logger_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class LoggerTest < Honeybadger::UnitTest
+class LoggerTest < Test::Unit::TestCase
   def stub_http(response, body = nil)
     response.stubs(:body => body) if body
     @http = stub(:post => response,

data/test/unit/notice_test.rb

@@ -1,9 +1,7 @@
 require 'test_helper'
 require 'json'
 
-class NoticeTest < Honeybadger::UnitTest
-  include DefinesConstants
-
+class NoticeTest < Test::Unit::TestCase
   def configure
     Honeybadger::Configuration.new.tap do |config|
       config.api_key = 'abc123def456'
@@ -24,6 +22,16 @@ class NoticeTest < Honeybadger::UnitTest
                       :env         => { 'three' => 'four' } }.update(attrs))
   end
 
+  should "deliver to sender" do
+    sender = stub_sender!
+    notice = build_notice
+    notice.stubs(:to_json => { :foo => 'bar' })
+
+    notice.deliver
+
+    assert_received(sender, :send_to_honeybadger) { |expect| expect.with(notice.to_json) }
+  end
+
   should "generate json from as_json template" do
     notice = build_notice
     hash = {'foo' => 'bar'}
@@ -74,11 +82,40 @@ class NoticeTest < Honeybadger::UnitTest
 
   context "with a backtrace" do
     setup do
-      @backtrace_array = ['my/file/backtrace:3']
+      @source = <<-RUBY
+        $:<<'lib'
+        require 'honeybadger'
+
+        begin
+          raise StandardError
+        rescue => e
+          puts Honeybadger::Notice.new(exception: e).backtrace.to_json
+        end
+      RUBY
+
+      @backtrace_array = ["my/file/backtrace:3",
+                          "test/honeybadger/rack_test.rb:2:in `build_exception'",
+                   "test/honeybadger/rack_test.rb:52:in `test_delivers_exception_from_rack'",
+                   "foo/bar/baz.rb:28:in `run'"]
+
       @exception = build_exception
       @exception.set_backtrace(@backtrace_array)
     end
 
+    should "pass its backtrace filters for parsing" do
+      Honeybadger::Backtrace.expects(:parse).with(@backtrace_array, {:filters => 'foo'}).returns(mock(:lines => []))
+
+      notice = Honeybadger::Notice.new({:exception => @exception, :backtrace_filters => 'foo'})
+    end
+
+    should "pass its backtrace line filters for parsing" do
+      @backtrace_array.each do |line|
+        Honeybadger::Backtrace::Line.expects(:parse).with(line, {:filters => 'foo'})
+      end
+
+      notice = Honeybadger::Notice.new({:exception => @exception, :backtrace_filters => 'foo'})
+    end
+
     should "accept a backtrace from an exception or hash" do
       backtrace = Honeybadger::Backtrace.parse(@backtrace_array)
       notice_from_exception = build_notice(:exception => @exception)
@@ -93,23 +130,41 @@ class NoticeTest < Honeybadger::UnitTest
         "backtrace was not correctly set from a hash"
     end
 
-    should "pass its backtrace filters for parsing" do
-      Honeybadger::Backtrace.expects(:parse).with(@backtrace_array, {:filters => 'foo'}).returns(mock(:lines => []))
-
-      notice = Honeybadger::Notice.new({:exception => @exception, :backtrace_filters => 'foo'})
+    context "without application trace" do
+      setup do
+        Honeybadger.configuration.project_root = '/foo/bar'
+        @string_io = StringIO.new(@source)
+        File.stubs(:exists?).with('my/file/backtrace').returns true
+        File.stubs(:open).with('my/file/backtrace').yields @string_io
+      end
+
+      should "include source extract from backtrace" do
+        backtrace = Honeybadger::Backtrace.parse(@backtrace_array)
+        notice_from_exception = build_notice(:exception => @exception)
+        @string_io.rewind
+
+        assert_not_equal notice_from_exception.source_extract, {}, 'Expected backtrace source extract to be found'
+        assert_equal backtrace.lines.first.source, notice_from_exception.source_extract
+      end
     end
 
-    should "pass its backtrace line filters for parsing" do
-      Honeybadger::Backtrace::Line.expects(:parse).with(@backtrace_array.first, {:filters => 'foo'})
+    context 'with an application trace' do
+      setup do
+        Honeybadger.configuration.project_root = 'test/honeybadger/'
 
-      notice = Honeybadger::Notice.new({:exception => @exception, :backtrace_filters => 'foo'})
-    end
+        @string_io = StringIO.new(@source)
+        File.stubs(:exists?).with('test/honeybadger/rack_test.rb').returns true
+        File.stubs(:open).with('test/honeybadger/rack_test.rb').yields @string_io
+      end
 
-    should "include source extract from backtrace" do
-      backtrace = Honeybadger::Backtrace.parse(@backtrace_array)
-      notice_from_exception = build_notice(:exception => @exception)
+      should "include source extract from first line of application trace" do
+        backtrace = Honeybadger::Backtrace.parse(@backtrace_array)
+        notice_from_exception = build_notice(:exception => @exception)
+        @string_io.rewind
 
-      assert_equal backtrace.lines.first.source, notice_from_exception.source_extract
+        assert_not_equal notice_from_exception.source_extract, {}, 'Expected backtrace source extract to be found'
+        assert_equal backtrace.lines.second.source, notice_from_exception.source_extract
+      end
     end
   end
 

data/test/unit/notifier_test.rb

@@ -1,14 +1,12 @@
 require 'test_helper'
 
-class NotifierTest < Honeybadger::UnitTest
+class NotifierTest < Test::Unit::TestCase
   class OriginalException < Exception
   end
 
   class ContinuedException < Exception
   end
 
-  include DefinesConstants
-
   def setup
     super
     reset_config
@@ -16,7 +14,6 @@ class NotifierTest < Honeybadger::UnitTest
 
   def assert_sent(notice, notice_args)
     assert_received(Honeybadger::Notice, :new) {|expect| expect.with(has_entries(notice_args)) }
-    assert_received(notice, :to_json)
     assert_received(Honeybadger.sender, :send_to_honeybadger) {|expect| expect.with(notice.to_json) }
   end
 
@@ -59,6 +56,29 @@ class NotifierTest < Honeybadger::UnitTest
     assert_equal sender, Honeybadger.sender
   end
 
+  should "create and send a notice asynchronously" do
+    set_public_env
+    notice = stub_notice!
+    notice_args = { :error_message => 'uh oh' }
+
+    async_expectation = stub(:received => true)
+    async_handler = Proc.new do |notice|
+      async_expectation.received
+      notice.deliver
+    end
+
+    Honeybadger.configure do |config|
+      config.async = async_handler
+    end
+
+    stub_sender!
+
+    Honeybadger.notify(notice_args)
+
+    assert_received(async_expectation, :received)
+    assert_sent(notice, notice_args)
+  end
+
   should "create and send a notice for an exception" do
     set_public_env
     exception = build_exception
@@ -156,7 +176,7 @@ class NotifierTest < Honeybadger::UnitTest
     config_opts = { 'one' => 'two', 'three' => 'four' }
     notice = stub_notice!
     stub_sender!
-    Honeybadger.configuration = stub('config', :merge => config_opts, :public? => true)
+    Honeybadger.configuration = stub('config', :merge => config_opts, :public? => true, :async? => false)
 
     Honeybadger.notify(exception)
 

data/test/unit/rack_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RackTest < Honeybadger::UnitTest
+class RackTest < Test::Unit::TestCase
   should "call the upstream app with the environment" do
     environment = { 'key' => 'value' }
     app = lambda { |env| ['response', {}, env] }
@@ -54,6 +54,26 @@ class RackTest < Honeybadger::UnitTest
     end
   end
 
+  should "deliver an exception in sinatra.error" do
+    Honeybadger.stubs(:notify_or_ignore)
+    exception = build_exception
+    environment = { 'key' => 'value' }
+
+    response = [200, {}, ['okay']]
+    app = lambda do |env|
+      env['sinatra.error'] = exception
+      response
+    end
+    stack = Honeybadger::Rack.new(app)
+
+    actual_response = stack.call(environment)
+
+    assert_equal response, actual_response
+    assert_received(Honeybadger, :notify_or_ignore) do |expect|
+      expect.with(exception, :rack_env => environment)
+    end
+  end
+
   should "clear context after app is called" do
     Honeybadger.context( :foo => :bar )
     assert_equal({ :foo => :bar }, Thread.current[:honeybadger_context])

data/test/unit/rails/action_controller_catcher_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'honeybadger/rails'
 
-class ActionControllerCatcherTest < Honeybadger::UnitTest
+class ActionControllerCatcherTest < Test::Unit::TestCase
   include DefinesConstants
 
   def setup

data/test/unit/rails_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'honeybadger/rails'
 
-class RailsInitializerTest < Honeybadger::UnitTest
+class RailsInitializerTest < Test::Unit::TestCase
   include DefinesConstants
 
   should "trigger use of Rails' logger if logger isn't set and Rails' logger exists" do

data/test/unit/sender_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SenderTest < Honeybadger::UnitTest
+class SenderTest < Test::Unit::TestCase
   def setup
     reset_config
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: sham_rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -108,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 2.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,87 +138,87 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sham_rack
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 description: Make managing application errors a more pleasant experience.
 email: josh@honeybadger.io
 executables: []
@@ -211,29 +227,34 @@ extra_rdoc_files:
 - README.md
 - MIT-LICENSE
 files:
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- SUPPORTED_RAILS_VERSIONS
-- TESTING.md
 - features/metal.feature
 - features/rack.feature
 - features/rails.feature
 - features/rake.feature
 - features/sinatra.feature
-- features/step_definitions/file_steps.rb
 - features/step_definitions/metal_steps.rb
 - features/step_definitions/rack_steps.rb
-- features/step_definitions/rails_application_steps.rb
+- features/step_definitions/rails_steps.rb
 - features/step_definitions/rake_steps.rb
 - features/support/env.rb
 - features/support/honeybadger_shim.rb.template
 - features/support/rails.rb
 - features/support/rake/Rakefile
-- features/support/terminal.rb
+- gemfiles/rails2.3.gemfile
+- gemfiles/rails2.3.gemfile.lock
+- gemfiles/rails3.0.gemfile
+- gemfiles/rails3.0.gemfile.lock
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.1.gemfile.lock
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
 - generators/honeybadger/honeybadger_generator.rb
 - generators/honeybadger/lib/insert_commands.rb
 - generators/honeybadger/lib/rake_commands.rb
@@ -289,6 +310,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2390415498026321705
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -297,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Error reports you can be happy about.