honeybadger 1.15.3 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfe3439d58b7af28a565d2de4933b569739de24
-  data.tar.gz: bbce3f75341c717bb1509ef572e13d5383b7e156
+  metadata.gz: 96b32638a5a4110849fe17df1314fe7af3c7db78
+  data.tar.gz: d7336c7884a124058b0c244d7853848fe5576c62
 SHA512:
-  metadata.gz: 4e26c85da0f200e09d0d89a19cef8d49d01bab91ef6a430257c4b39987636b29b927cdda9a1d15d880507383309b62b1b1ad01fa8a391620273db44542fb3a6b
-  data.tar.gz: 43a4170cc003e0c4f1191255734bb3437c632ce30c708b12b8031fcf323927d1fcdd6825d26bf49001acc5cc41a02545a52a3fc6313567e844fa55bd46cb0e3c
+  metadata.gz: 622deae28180540415aade234278decc7fc70bf4903adff5fa0259f6dedd7e6a87af629fe6e9b28f9dd185ffc66ae04bc0885fc684c68c2ee679461575eb2f5a
+  data.tar.gz: 2130c58c2ba59741f5ed5da2d45ffb180f06e7fb11d9b9ea4f20412ad3365ce710380e5153b794456ce04abf2755be63a96c7c3082a4af020277ee6e5ee48ef4

data/Appraisals

@@ -36,6 +36,11 @@ appraise 'rails2.3' do
   gem 'capistrano', '~> 2.0'
 end
 
+appraise 'delayed_job' do
+  gem 'delayed_job'
+  gem 'honeybadger', :path => '../'
+end
+
 if RUBY_VERSION > '1.9'
   appraise 'rails3.0' do
     gem 'rails', '~> 3.0.17'

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## Honeybadger 1.16.0 ##
+
+* Compress requests using deflate.
+
+  *Joshua Wood*
+
+* Fix a bug where context wasn't reported from Sinatra applications
+
+  *Gavin Stark*
+
+* Fix a bug which affected Rails 3.0 apps
+  (`ActiveRecord::Base.connection_config` missing).
+
+  *Joshua Wood*
+
+* Stop sending non-server env.
+
+  *Joshua Wood*
+
+* Automatically fork worker when Unicorn forks (removes the need to call
+  `Honeybadger::Monitor.worker.fork` in Unicorn's `after_fork` block.)
+
+  *Joshua Wood*
+
+* Ruby 1.8.7 and 1.9.2 are no longer supported.
+
 ## Honeybadger 1.15.3 ##
 
 * Send User-Agent header

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.15.3)
+    honeybadger (1.16.0)
       json
 
 GEM

data/README.md

@@ -8,17 +8,19 @@ This is the notifier gem for integrating apps with the :zap: [Honeybadger Except
 When an uncaught exception occurs, Honeybadger will POST the relevant data
 to the Honeybadger server specified in your environment.
 
-## Documentation
-
-[View the Documentation](http://docs.honeybadger.io/article/50-honeybadger-gem-documentation)
-
 ## Supported Ruby versions
 
-Honeybadger supports Ruby 1.8.7 through 2.1.
+#### IMPORTANT: As of version 1.16.0, Ruby 1.8.7 and 1.9.2 are unsupported. Please ensure you are running Ruby 1.9.3 or greater before upgrading.
+
+Honeybadger supports Ruby 1.9.3 through 2.1.
 
 ## Supported Rails versions
 
-Honeybadger supports Rails 2.3.18 through Rails 4.1.0.
+Honeybadger supports Rails 2.3 through Rails 4.1 (latest releases).
+
+## Documentation
+
+[View the Documentation](http://docs.honeybadger.io/article/50-honeybadger-gem-documentation)
 
 ## Contributing
 

data/Rakefile

@@ -102,7 +102,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git commit --allow-empty -a -e -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"

data/features/rails.feature

@@ -233,9 +233,8 @@ Feature: Install the Gem in a Rails application
     And I perform a request to "http://example.com:123/test/index?param=value&secret=blue42"
     Then I should receive a Honeybadger notification
     And the request should not contain "red23"
-    And the request params should contain "FILTERED"
     And the request should not contain "blue42"
-    And the request cgi_data should contain "FILTERED"
+    And the request params should contain "FILTERED"
 
   Scenario: Filtering session in a controller
     When I configure my application to require Honeybadger

data/gemfiles/delayed_job.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "delayed_job"
+gem "honeybadger", :path=>"../"
+
+gemspec :path=>"../"

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.15.3'
-  s.date              = '2014-06-21'
+  s.version           = '1.16.0'
+  s.date              = '2014-07-09'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
     features/support/test.thor
     features/thor.feature
     gemfiles/binding_of_caller.gemfile
+    gemfiles/delayed_job.gemfile
     gemfiles/rack.gemfile
     gemfiles/rails.gemfile
     gemfiles/rails2.3.gemfile
@@ -103,6 +104,7 @@ Gem::Specification.new do |s|
     lib/honeybadger/integrations/passenger.rb
     lib/honeybadger/integrations/sidekiq.rb
     lib/honeybadger/integrations/thor.rb
+    lib/honeybadger/integrations/unicorn.rb
     lib/honeybadger/monitor.rb
     lib/honeybadger/monitor/railtie.rb
     lib/honeybadger/monitor/sender.rb
@@ -144,6 +146,7 @@ Gem::Specification.new do |s|
     spec/honeybadger/integrations/passenger_spec.rb
     spec/honeybadger/integrations/sidekiq_spec.rb
     spec/honeybadger/integrations/thor_spec.rb
+    spec/honeybadger/integrations/unicorn_spec.rb
     spec/honeybadger/logger_spec.rb
     spec/honeybadger/monitor/trace_spec.rb
     spec/honeybadger/monitor/worker_spec.rb

data/lib/honeybadger.rb

@@ -20,11 +20,12 @@ require 'honeybadger/railtie' if defined?(Rails::Railtie)
 require 'honeybadger/monitor'
 
 module Honeybadger
-  VERSION = '1.15.3'.freeze
+  VERSION = '1.16.0'.freeze
   LOG_PREFIX = "** [Honeybadger] ".freeze
 
   HEADERS = {
     'Content-type' => 'application/json',
+    'Content-Encoding' => 'deflate',
     'Accept'       => 'text/json, application/json',
     'User-Agent'   => "HB-Ruby #{VERSION}; #{RUBY_VERSION}; #{RUBY_PLATFORM}"
   }.freeze

data/lib/honeybadger/configuration.rb

@@ -285,7 +285,7 @@ module Honeybadger
     #
     # Returns true if allowed to talk to API, false otherwise.
     def public?
-      !development_environments.include?(environment_name)
+      api_key =~ /\S/ && !development_environments.include?(environment_name)
     end
 
     # Public: Determines whether to send metrics

data/lib/honeybadger/integrations.rb

@@ -5,3 +5,4 @@ require 'honeybadger/integrations/sidekiq'
 require 'honeybadger/integrations/thor'
 require 'honeybadger/integrations/net_http'
 require 'honeybadger/integrations/passenger'
+require 'honeybadger/integrations/unicorn'

data/lib/honeybadger/integrations/net_http.rb

@@ -26,7 +26,7 @@ module Honeybadger
   Dependency.register do
     requirement { defined?(::ActiveSupport::Notifications) }
     requirement { defined?(::Net::HTTP) }
-    requirement { Honeybadger.configuration.traces? }
+    requirement { defined?(::Honeybadger::Monitor) }
 
     injection { ::Net::HTTP.send(:include, Integrations::NetHttp::Instrumentation) }
   end

data/lib/honeybadger/integrations/unicorn.rb

@@ -0,0 +1,26 @@
+module Honeybadger
+  module Integrations
+    module Unicorn
+      module AfterForkExtension
+        def self.included(base)
+          base.send(:alias_method, :init_worker_process_without_honeybadger, :init_worker_process)
+          base.send(:alias_method, :init_worker_process, :init_worker_process_with_honeybadger)
+        end
+
+        def init_worker_process_with_honeybadger(*args, &block)
+          init_worker_process_without_honeybadger(*args, &block).tap do
+            Honeybadger::Monitor.worker.fork
+          end
+        end
+      end
+    end
+  end
+
+  Dependency.register do
+    requirement { defined?(::Honeybadger::Monitor) }
+    requirement { defined?(::Unicorn::HttpServer) }
+
+    injection { Honeybadger.write_verbose_log('Installing Unicorn integration') }
+    injection { ::Unicorn::HttpServer.send(:include, Integrations::Unicorn::AfterForkExtension) }
+  end
+end

data/lib/honeybadger/monitor/sender.rb

@@ -5,9 +5,7 @@ module Honeybadger
         return unless Honeybadger.configuration.metrics?
         return unless Honeybadger.configuration.features['metrics']
 
-        response = rescue_http_errors do
-          http_connection.post('/v1/metrics', data.to_json, http_headers)
-        end
+        response = send_request('/v1/metrics', data.to_json)
 
         if Net::HTTPSuccess === response
           log(:info, "Metrics Success: #{response.class}", response, data) if Honeybadger.configuration.debug
@@ -26,9 +24,7 @@ module Honeybadger
         return unless Honeybadger.configuration.traces?
         return unless Honeybadger.configuration.features['traces']
 
-        response = rescue_http_errors do
-          http_connection.post('/v1/traces', data.to_json, http_headers)
-        end
+        response = send_request('/v1/traces', data.to_json)
 
         if Net::HTTPSuccess === response
           log(:info, "Traces Success: #{response.class}", response, data) if Honeybadger.configuration.debug

data/lib/honeybadger/monitor/trace.rb

@@ -130,7 +130,7 @@ module Honeybadger
           return "Super long query" if event.payload[:sql].length > 1024
           sql = event.payload[:sql]
           sql = sql.gsub(EscapedQuotes, EmptyReplacement).gsub(SQuotedData, Replacement)
-          sql = sql.gsub(DQuotedData, Replacement) unless ::ActiveRecord::Base.connection_config[:adapter] =~ DoubleQuoters
+          sql = sql.gsub(DQuotedData, Replacement) unless ::ActiveRecord::Base.connection_pool.spec.config[:adapter] =~ DoubleQuoters
           sql.gsub(NumericData, Replacement).gsub(Newline, EmptyReplacement).squeeze(' ')
         end
       end

data/lib/honeybadger/monitor/worker.rb

@@ -14,6 +14,7 @@ module Honeybadger
         init_traces
         @delay = defined?(::Rails) && ::Rails.env.development? ? 10 : 60
         @per_request = 100
+        @traces_per_request = 20
         @sender = Monitor::Sender.new(Honeybadger.configuration)
         @lock = Mutex.new
         start
@@ -73,6 +74,8 @@ module Honeybadger
       end
 
       def queue_trace
+        return unless trace
+
         @lock.synchronize do
           if trace.duration > Honeybadger.configuration.trace_threshold && (!@traces[trace.key] || @traces[trace.key].duration < trace.duration)
             @traces[trace.key] = trace
@@ -142,7 +145,7 @@ module Honeybadger
 
           Honeybadger.write_verbose_log('Sending traces')
 
-          traces.each_slice(@per_request) do |t|
+          traces.each_slice(@traces_per_request) do |t|
             begin
               @sender.send_traces({ :traces => t.compact.map(&:to_h), :environment => Honeybadger.configuration.environment_name, :hostname => Honeybadger.configuration.hostname })
             rescue Exception => e

data/lib/honeybadger/notice.rb

@@ -137,9 +137,9 @@ module Honeybadger
       self.send_request_session = args[:send_request_session].nil? ? true : args[:send_request_session]
 
       find_session_data
-      clean_rack_request_data
       also_use_rack_params_filters
       set_context
+      clean_rack_request_data
     end
 
     # Deprecated. Remove in 2.0.
@@ -281,12 +281,7 @@ module Honeybadger
 
     def clean_rack_request_data
       if cgi_data
-        self.cgi_data = cgi_data.dup
-        cgi_data.delete("rack.request.form_vars")
-        cgi_data.delete("rack.request.query_string")
-        cgi_data.delete("rack.session")
-        cgi_data.delete("action_dispatch.request.parameters")
-        cgi_data.delete("action_dispatch.request.request_parameters")
+        self.cgi_data = cgi_data.reject {|k,_| k == 'QUERY_STRING' || !k.match(/\A[A-Z_]+\Z/) }
       end
     end
 

data/lib/honeybadger/rack/error_notifier.rb

@@ -44,8 +44,6 @@ module Honeybadger
         rescue Exception => raised
           env['honeybadger.error_id'] = notify_honeybadger(raised, env)
           raise
-        ensure
-          Honeybadger.context.clear!
         end
 
         framework_exception = env['rack.exception'] || env['sinatra.error']
@@ -54,6 +52,8 @@ module Honeybadger
         end
 
         response
+      ensure
+        Honeybadger.context.clear!
       end
     end
   end

data/lib/honeybadger/sender.rb

@@ -1,3 +1,6 @@
+require 'zlib'
+require 'stringio'
+
 module Honeybadger
   class Sender
     NOTICES_URI = '/v1/notices/'.freeze
@@ -45,9 +48,7 @@ module Honeybadger
 
       data = notice.is_a?(String) ? notice : notice.to_json
 
-      response = rescue_http_errors do
-        http_connection.post(url.path, data, http_headers({'X-API-Key' => api_key}))
-      end
+      response = send_request(url.path, data, {'X-API-Key' => api_key})
 
       if Net::HTTPSuccess === response
         log(Honeybadger.configuration.debug ? :info : :debug, "Success: #{response.class}", response, data)
@@ -67,9 +68,7 @@ module Honeybadger
     def ping(data = {})
       return nil unless api_key_ok?
 
-      response = rescue_http_errors do
-        http_connection.post('/v1/ping/', data.to_json, http_headers)
-      end
+      response = send_request('/v1/ping/', data.to_json)
 
       if Net::HTTPSuccess === response
         JSON.parse(response.body)
@@ -124,8 +123,8 @@ module Honeybadger
       Honeybadger.write_verbose_log("Notice: #{data}", :debug) if data && Honeybadger.configuration.debug
     end
 
-    def rescue_http_errors(&block)
-      yield
+    def send_request(path, data, headers = {})
+      http_connection.post(path, compress(data), http_headers(headers))
     rescue *HTTP_ERRORS => e
       log(:error, "Unable to contact the Honeybadger server. HTTP Error=#{e}")
       nil
@@ -176,5 +175,9 @@ module Honeybadger
         Honeybadger.write_verbose_log("Original Exception: #{message}", :error)
       end
     end
+
+    def compress(string, level = Zlib::DEFAULT_COMPRESSION)
+      Zlib::Deflate.deflate(string, level)
+    end
   end
 end

data/lib/honeybadger_tasks.rb

@@ -57,7 +57,7 @@ module HoneybadgerTasks
       response = http.request(post)
 
       if Net::HTTPSuccess === response
-        puts "Succesfully recorded deployment"
+        puts "Successfully recorded deployment"
         return true
       else
         $stderr.puts "Error recording deployment: #{response.class} -- #{response.body || 'no response'}"

data/spec/honeybadger/configuration_spec.rb

@@ -194,23 +194,46 @@ describe Honeybadger::Configuration do
     expect(config.development_environments).to eq %w(development test cucumber)
   end
 
-  it "is public in a public environment" do
-    config = Honeybadger::Configuration.new
-    config.development_environments = %w(development)
-    config.environment_name = 'production'
-    expect(config.public?).to be_true
-  end
+  describe "#public?" do
+    let(:config) { Honeybadger::Configuration.new }
 
-  it "is not public in a development environment" do
-    config = Honeybadger::Configuration.new
-    config.development_environments = %w(staging)
-    config.environment_name = 'staging'
-    expect(config.public?).to be_false
-  end
+    subject { config.public? }
 
-  it "is public without an environment name" do
-    config = Honeybadger::Configuration.new
-    expect(config.public?).to be_true
+    before do
+      config.api_key = 'asdf'
+    end
+
+    context "when api_key is not configured" do
+      before { config.api_key = nil }
+
+      it { should be_false }
+    end
+
+    context "when api_key is configured" do
+      it { should be_true }
+    end
+
+    context "without an environment name" do
+      it { should be_true }
+    end
+
+    context "when environment is public" do
+      before do
+        config.development_environments = %w(development)
+        config.environment_name = 'production'
+      end
+
+      it { should be_true }
+    end
+
+    context "when environment is development" do
+      before do
+        config.development_environments = %w(development)
+        config.environment_name = 'development'
+      end
+
+      it { should be_false }
+    end
   end
 
   describe "#metrics?" do

data/spec/honeybadger/integrations/delayed_job_spec.rb

@@ -1,47 +1,63 @@
 require 'spec_helper'
+require 'honeybadger/monitor'
 
-describe "DelayedJob Dependency" do
-  before do
-    Honeybadger::Dependency.reset!
-  end
+begin
+  require 'delayed_job'
+  DELAYED_JOB_INSTALLED = true
+rescue LoadError
+  DELAYED_JOB_INSTALLED = false
+  nil
+end
 
-  context "when delayed_job is not installed" do
-    it "fails quietly" do
-      expect { Honeybadger::Dependency.inject! }.not_to raise_error
-    end
-  end
+if DELAYED_JOB_INSTALLED
+  # Prepend the load path with delayed_job's spec directory so that we can take
+  # advantage of their test backend:
+  # https://github.com/collectiveidea/delayed_job/blob/master/spec/delayed/backend/test.rb
+  $:.unshift(File.join(Gem::Specification.find_by_name('delayed_job').full_gem_path, 'spec'))
+  Delayed::Worker.backend = :test
 
-  context "when delayed_job is installed" do
-    let(:plugins_array) { [] }
-    let(:plugin_class) do
-      Class.new do
-        def self.callbacks(&block)
-        end
-      end
+  class ExceptionTester
+    def null_method
     end
 
-    before do
-      Object.const_set(:Delayed, Module.new)
-      ::Delayed.const_set(:Plugin, plugin_class)
-      ::Delayed.const_set(:Worker, double(:plugins => plugins_array))
+    def will_raise
+      raise "raised from will_raise"
     end
+  end
 
-    after { Object.send(:remove_const, :Delayed) }
+  describe "DelayedJob integration" do
+    let(:worker) { Delayed::Worker.new }
 
-    it "adds the plugin to DelayedJob" do
-      Honeybadger::Dependency.inject!
-      expect(plugins_array).to include(Honeybadger::Integrations::DelayedJob::Plugin)
-    end
+    before { Honeybadger::Dependency.inject! }
+    after { Delayed::Job.delete_all }
 
-    context "and delayed_job_honeybadger is installed" do
-      before do
-        ::Delayed.const_set(:Plugins, Module.new)
-        ::Delayed::Plugins.const_set(:Honeybadger, Class.new(plugin_class))
+    context "when a method is delayed" do
+      let(:method_name) { :null_method }
+
+      before { ExceptionTester.new.delay.send(method_name) }
+
+      specify { expect(Delayed::Job.count).to eq 1 }
+
+      it "queues a new trace" do
+        trace_id = nil
+        Honeybadger::Monitor.worker.should_receive(:queue_trace).once.and_return do
+          # This ensures that Honeybadger::Monitor.worker.trace is not nil when
+          # it's queued from the worker. There may still be an edge case where
+          # that's possible. (see #84)
+          trace_id = Thread.current[:hb_trace_id]
+        end
+        worker.work_off
+        expect(trace_id).not_to be_nil
       end
 
-      it "warns the user of the conflict" do
-        Honeybadger.should_receive(:write_verbose_log).with(/Support for Delayed Job has been moved/, :warn).once
-        Honeybadger::Dependency.inject!
+      context "and an exception occurs" do
+        let(:method_name) { :will_raise }
+
+        after  { worker.work_off }
+
+        it "notifies Honeybadger" do
+          Honeybadger.should_receive(:notify_or_ignore).once
+        end
       end
     end
   end

data/spec/honeybadger/integrations/unicorn_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Unicorn integration" do
+  before do
+    Honeybadger::Dependency.reset!
+  end
+
+  context "when unicorn is not installed" do
+    it "fails quietly" do
+      expect { Honeybadger::Dependency.inject! }.not_to raise_error
+    end
+  end
+
+  context "when unicorn is installed" do
+    let(:shim) {
+      Class.new {
+        def init_worker_process(worker)
+          'foo'
+        end
+      }
+    }
+
+    before do
+      Object.const_set(:Unicorn, Module.new)
+      Unicorn.const_set(:HttpServer, shim)
+    end
+    after { Object.send(:remove_const, :Unicorn) }
+
+    it "logs installation" do
+      Honeybadger.should_receive(:write_verbose_log).with(/Unicorn/)
+      Honeybadger::Dependency.inject!
+    end
+
+    it "installs unicorn hooks" do
+      Honeybadger::Dependency.inject!
+      Honeybadger::Monitor.worker.should_receive(:fork)
+      expect(shim.new.init_worker_process(double('worker'))).to eq 'foo'
+    end
+  end
+end

data/spec/honeybadger/monitor/trace_spec.rb

@@ -3,9 +3,63 @@ require 'honeybadger/monitor'
 
 describe Honeybadger::Monitor::Trace do
   describe "::instrument" do
+    before do
+      Honeybadger::Monitor::Trace.stub(:generate_secure_id).and_return(:foo)
+    end
+
     it "creates a new trace" do
       Honeybadger::Monitor::Trace.should_receive(:new).and_call_original
       described_class.instrument('testing', {}){}
     end
+
+    it "temporarily stores trace id in thread local" do
+      described_class.instrument('testing', {}) do
+        expect(Thread.current[:hb_trace_id]).to eq :foo
+      end
+
+      expect(Thread.current[:hb_trace_id]).to be_nil
+    end
+
+    it "stores the trace on the worker's pending traces" do
+      described_class.instrument('testing', {}) do
+        expect(Honeybadger::Monitor.worker.pending_traces[:foo]).to be_a Honeybadger::Monitor::Trace
+      end
+
+      expect(Honeybadger::Monitor.worker.pending_traces[:foo]).to be_nil
+    end
+  end
+end
+
+begin
+  require 'active_support/notifications'
+  require 'active_record'
+
+  describe Honeybadger::Monitor::TraceCleaner::ActiveRecord do
+    let(:event) do
+      ::ActiveSupport::Notifications::Event.new(
+        'sql.active_record', # name
+        now = Time.now.to_f, # start
+        now+0.2,             # ending
+        '1',                 # transaction_id
+        {                    # payload
+          :name => nil,
+          :sql => '',
+          :binds => [],
+          :connection_id => 123
+        }
+      )
+    end
+
+    before do
+      ::ActiveRecord::Base.stub(:connection_pool).and_return(double(:spec => double(:config => {})))
+    end
+
+    # This will fail if the configuration is accessed through
+    # `ActiveRecord::Base.connection_config` in rails < 3.1.
+    it "safely accesses connection configuration" do
+      expect { described_class.new(event).to_s }.not_to raise_error
+    end
   end
+rescue LoadError
+  nil
 end

data/spec/honeybadger/monitor/worker_spec.rb

@@ -16,6 +16,44 @@ describe Honeybadger::Monitor::Worker do
     instance.stub(:lock) { instance.instance_variable_get(:@lock) }
   end
 
+  describe "#queue_trace" do
+    let(:trace) { Honeybadger::Monitor::Trace.new(:foo) }
+
+    context "when a trace exists" do
+      before do
+        trace.stub(:key).and_return(:bar)
+        subject.pending_traces[:foo] = trace
+        Thread.current[:hb_trace_id] = :foo
+      end
+
+      context "and the same trace key exists" do
+        let(:old_trace) { Honeybadger::Monitor::Trace.new(:foo) }
+
+        before do
+          old_trace.stub(:duration).and_return(2000)
+          old_trace.stub(:key).and_return(:bar)
+          subject.traces[:bar] = old_trace
+        end
+
+        context "and the new duration is not greater" do
+          before { trace.stub(:duration).and_return(2000) }
+
+          it "replaces the existing trace" do
+            expect { subject.queue_trace }.not_to change { subject.traces[:bar] }.from(old_trace)
+          end
+        end
+
+        context "and the new duration is greater" do
+          before { trace.stub(:duration).and_return(3000) }
+
+          it "replaces the existing trace" do
+            expect { subject.queue_trace }.to change { subject.traces[:bar] }.from(old_trace).to(trace)
+          end
+        end
+      end
+    end
+  end
+
   describe "#fork" do
     before { Thread.unstub(:new) }
     before { Honeybadger.stub(:write_verbose_log) }

data/spec/honeybadger/notice_spec.rb

@@ -264,7 +264,7 @@ describe Honeybadger::Notice do
   end
 
   it "accepts CGI data from a hash" do
-    data = { 'string' => 'value' }
+    data = { 'STRING' => 'value' }
     notice = build_notice(:cgi_data => data)
     expect(notice.cgi_data).to eq data
   end
@@ -297,14 +297,14 @@ describe Honeybadger::Notice do
     assert_array_starts_with backtrace.lines, notice.backtrace.lines
   end
 
-  it "removes rack.request.form_vars" do
+  it "removes non-uppercase keys" do
     original = {
-      "rack.request.form_vars" => "story%5Btitle%5D=The+TODO+label",
-      "abc" => "123"
+      'rack.request.form_vars' => 'story%5Btitle%5D=The+TODO+label',
+      'ABC' => "123"
     }
 
     notice = build_notice(:cgi_data => original)
-    expect(notice.cgi_data).to eq({"abc" => "123"})
+    expect(notice.cgi_data).to eq({'ABC' => '123'})
   end
 
   it "does not send empty request data" do

data/spec/honeybadger/rails/action_controller_spec.rb

@@ -65,7 +65,7 @@ begin
       assert_sent_element(params['controller']) { |h| h['request']['component'] }
       assert_sent_element(params['action']) { |h| h['request']['action'] }
       assert_sent_element(url_from_request(request)) { |h| h['request']['url'] }
-      assert_sent_hash(request.env) { |h| h['request']['cgi_data'] }
+      assert_sent_hash(request.env.reject {|k,_| k == 'QUERY_STRING' || !k.match(/\A[A-Z_]+\Z/) }) { |h| h['request']['cgi_data'] }
     end
 
     def url_from_request(request)

data/spec/honeybadger_tasks_spec.rb

@@ -92,7 +92,7 @@ describe HoneybadgerTasks do
           end
 
           it "puts the response body on success" do
-            HoneybadgerTasks.should_receive(:puts).with("Succesfully recorded deployment")
+            HoneybadgerTasks.should_receive(:puts).with("Successfully recorded deployment")
             @http_proxy.should_receive(:request).with(anything).and_return(successful_response('body'))
             HoneybadgerTasks.deploy(@options)
           end

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.16.0
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: guard-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: 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: sinatra
   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: aruba
   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: appraisal
   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: fuubar
   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: growl
   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: Make managing application errors a more pleasant experience.
@@ -229,6 +229,7 @@ files:
 - features/support/test.thor
 - features/thor.feature
 - gemfiles/binding_of_caller.gemfile
+- gemfiles/delayed_job.gemfile
 - gemfiles/rack.gemfile
 - gemfiles/rails.gemfile
 - gemfiles/rails2.3.gemfile
@@ -264,6 +265,7 @@ files:
 - lib/honeybadger/integrations/passenger.rb
 - lib/honeybadger/integrations/sidekiq.rb
 - lib/honeybadger/integrations/thor.rb
+- lib/honeybadger/integrations/unicorn.rb
 - lib/honeybadger/monitor.rb
 - lib/honeybadger/monitor/railtie.rb
 - lib/honeybadger/monitor/sender.rb
@@ -305,6 +307,7 @@ files:
 - spec/honeybadger/integrations/passenger_spec.rb
 - spec/honeybadger/integrations/sidekiq_spec.rb
 - spec/honeybadger/integrations/thor_spec.rb
+- spec/honeybadger/integrations/unicorn_spec.rb
 - spec/honeybadger/logger_spec.rb
 - spec/honeybadger/monitor/trace_spec.rb
 - spec/honeybadger/monitor/worker_spec.rb
@@ -330,23 +333,23 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
-- --markup tomdoc
+- "--charset=UTF-8"
+- "--markup tomdoc"
 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.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: Error reports you can be happy about.