honeybadger 1.12.0.beta3 → 1.13.0

data/gemfiles/sinatra.gemfile.lock

@@ -0,0 +1,124 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.13.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    appraisal (0.5.2)
+      bundler
+      rake
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.4.0)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    cucumber (1.3.10)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    fuubar (1.3.2)
+      rspec (>= 2.14.0, < 3.1.0)
+      ruby-progressbar (~> 1.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    growl (1.0.3)
+    guard (1.8.3)
+      formatador (>= 0.2.4)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (3.1.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    highline (1.6.20)
+    json (1.8.1)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    multi_json (1.8.4)
+    multi_test (0.0.3)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    ruby-progressbar (1.4.0)
+    safe_yaml (0.9.7)
+    sham_rack (1.3.6)
+      rack
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    webmock (1.17.1)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  capistrano (~> 2.0)
+  cucumber (~> 1.3.10)
+  fuubar
+  growl
+  guard (~> 1.8.3)
+  guard-rspec
+  honeybadger!
+  rake
+  rspec (~> 2.14.0)
+  sham_rack (~> 1.3.0)
+  sinatra
+  webmock

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.12.0.beta3'
-  s.date              = '2014-04-08'
+  s.version           = '1.13.0'
+  s.date              = '2014-04-23'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -53,33 +53,33 @@ Gem::Specification.new do |s|
     features/rails.feature
     features/rake.feature
     features/sinatra.feature
-    features/standalone.feature
     features/step_definitions/metal_steps.rb
     features/step_definitions/rack_steps.rb
     features/step_definitions/rails_steps.rb
     features/step_definitions/rake_steps.rb
-    features/step_definitions/standalone_steps.rb
-    features/step_definitions/thor_steps.rb
     features/support/env.rb
     features/support/honeybadger_failure_shim.rb.template
     features/support/honeybadger_shim.rb.template
     features/support/rails.rb
     features/support/rake/Rakefile
-    features/support/test.thor
-    features/thor.feature
-    gemfiles/binding_of_caller.gemfile
     gemfiles/rack.gemfile
-    gemfiles/rails.gemfile
+    gemfiles/rack.gemfile.lock
     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
     gemfiles/rails4.0.gemfile
+    gemfiles/rails4.0.gemfile.lock
     gemfiles/rails4.1.gemfile
+    gemfiles/rails4.1.gemfile.lock
     gemfiles/rake.gemfile
+    gemfiles/rake.gemfile.lock
     gemfiles/sinatra.gemfile
-    gemfiles/standalone.gemfile
-    gemfiles/thor.gemfile
+    gemfiles/sinatra.gemfile.lock
     generators/honeybadger/honeybadger_generator.rb
     generators/honeybadger/lib/insert_commands.rb
     generators/honeybadger/lib/rake_commands.rb
@@ -94,23 +94,13 @@ Gem::Specification.new do |s|
     lib/honeybadger/capistrano/legacy.rb
     lib/honeybadger/capistrano/tasks.rake
     lib/honeybadger/configuration.rb
-    lib/honeybadger/dependency.rb
-    lib/honeybadger/exception_extensions.rb
-    lib/honeybadger/integrations.rb
-    lib/honeybadger/integrations/delayed_job.rb
-    lib/honeybadger/integrations/delayed_job/plugin.rb
     lib/honeybadger/integrations/sidekiq.rb
-    lib/honeybadger/integrations/thor.rb
     lib/honeybadger/monitor.rb
     lib/honeybadger/monitor/railtie.rb
     lib/honeybadger/monitor/sender.rb
     lib/honeybadger/monitor/worker.rb
     lib/honeybadger/notice.rb
-    lib/honeybadger/payload.rb
     lib/honeybadger/rack.rb
-    lib/honeybadger/rack/error_notifier.rb
-    lib/honeybadger/rack/user_feedback.rb
-    lib/honeybadger/rack/user_informer.rb
     lib/honeybadger/rails.rb
     lib/honeybadger/rails/action_controller_catcher.rb
     lib/honeybadger/rails/controller_methods.rb
@@ -134,16 +124,10 @@ Gem::Specification.new do |s|
     spec/honeybadger/backtrace_spec.rb
     spec/honeybadger/capistrano_spec.rb
     spec/honeybadger/configuration_spec.rb
-    spec/honeybadger/dependency_spec.rb
-    spec/honeybadger/exception_extensions_spec.rb
-    spec/honeybadger/integrations/delayed_job_spec.rb
-    spec/honeybadger/integrations/sidekiq_spec.rb
-    spec/honeybadger/integrations/thor_spec.rb
     spec/honeybadger/logger_spec.rb
     spec/honeybadger/monitor/worker_spec.rb
     spec/honeybadger/notice_spec.rb
     spec/honeybadger/notifier_spec.rb
-    spec/honeybadger/payload_spec.rb
     spec/honeybadger/rack_spec.rb
     spec/honeybadger/rails/action_controller_spec.rb
     spec/honeybadger/rails_spec.rb

data/lib/honeybadger.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'digest'
 require 'logger'
 
-require 'honeybadger/dependency'
 require 'honeybadger/configuration'
 require 'honeybadger/backtrace'
 require 'honeybadger/notice'
@@ -13,13 +12,12 @@ require 'honeybadger/sender'
 require 'honeybadger/stats'
 require 'honeybadger/user_informer'
 require 'honeybadger/user_feedback'
-require 'honeybadger/integrations'
-require 'honeybadger/exception_extensions'
 
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
+require 'honeybadger/integrations/sidekiq'
 
 module Honeybadger
-  VERSION = '1.12.0.beta3'
+  VERSION = '1.13.0'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {
@@ -164,13 +162,11 @@ module Honeybadger
     private
 
     def send_notice(notice)
-      return false unless sender
-
       if configuration.public?
         if configuration.async?
           configuration.async.call(notice)
         else
-          Honeybadger.sender.send_to_honeybadger(notice)
+          notice.deliver
         end
       end
     end
@@ -183,14 +179,13 @@ module Honeybadger
     end
 
     def unwrap_exception(exception)
-      exception.respond_to?(:original_exception) && exception.original_exception ||
-      exception.respond_to?(:continued_exception) && exception.continued_exception ||
-      exception.respond_to?(:cause) && exception.cause ||
-      exception
+      if exception.respond_to?(:original_exception)
+        exception.original_exception
+      elsif exception.respond_to?(:continued_exception)
+        exception.continued_exception
+      else
+        exception
+      end
     end
   end
 end
-
-unless defined?(Rails)
-  Honeybadger::Dependency.inject!
-end

data/lib/honeybadger/configuration.rb

@@ -8,8 +8,7 @@ module Honeybadger
                :params_filters, :project_root, :port, :protocol, :proxy_host, :proxy_pass,
                :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain, :framework,
                :user_information, :feedback, :rescue_rake_exceptions, :source_extract_radius,
-               :send_request_session, :debug, :fingerprint, :hostname, :features, :metrics,
-               :log_exception_on_send_failure, :send_local_variables].freeze
+               :send_request_session, :debug, :fingerprint, :hostname, :metrics, :log_exception_on_send_failure].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -101,9 +100,6 @@ module Honeybadger
     # +true+ to send session data, +false+ to exclude
     attr_accessor :send_request_session
 
-    # +true+ to send local variables, +false+ to exclude
-    attr_accessor :send_local_variables
-
     # +true+ to log extra debug info, +false+ to suppress
     attr_accessor :debug
 
@@ -179,12 +175,11 @@ module Honeybadger
       @rescue_rake_exceptions        = nil
       @source_extract_radius         = 2
       @send_request_session          = true
-      @send_local_variables          = false
       @debug                         = false
       @log_exception_on_send_failure = false
       @hostname                      = Socket.gethostname
       @metrics                       = true
-      @features                      = {'notices' => true, 'local_variables' => true}
+      @features                      = { 'notices' => true }
       @limit                         = nil
       @feedback                      = true
     end
@@ -288,10 +283,10 @@ module Honeybadger
     #
     # Examples
     #
-    #   config.async = Proc.new { |notice| Thread.new { Honeybadger.sender.send_to_honeybadger(notice) } }
+    #   config.async = Proc.new { |notice| Thread.new { notice.deliver } }
     #
     #   config.async do |notice|
-    #     Thread.new { Honeybadger.sender.send_to_honeybadger(notice) }
+    #     Thread.new { notice.deliver }
     #   end
     #
     # Returns configured async handler (should respond to #call(notice))

data/lib/honeybadger/integrations/sidekiq.rb

@@ -9,26 +9,18 @@ module Honeybadger
       end
     end
   end
+end
 
-  Dependency.register do
-    requirement { defined?(::Sidekiq) }
-
-    injection do
-      ::Sidekiq.configure_server do |config|
-        config.server_middleware do |chain|
-          chain.add Integrations::Sidekiq::Middleware
-        end
-      end
+if defined?(::Sidekiq)
+  ::Sidekiq.configure_server do |config|
+    config.server_middleware do |chain|
+      chain.add Honeybadger::Integrations::Sidekiq::Middleware
     end
   end
+end
 
-  Dependency.register do
-    requirement { defined?(::Sidekiq::VERSION) && ::Sidekiq::VERSION > '3' }
-
-    injection do
-      ::Sidekiq.configure_server do |config|
-        config.error_handlers << Proc.new {|ex,context| Honeybadger.notify_or_ignore(ex, :parameters => context) }
-      end
-    end
+if defined?(::Sidekiq::VERSION) && ::Sidekiq::VERSION > '3'
+  ::Sidekiq.configure_server do |config|
+    config.error_handlers << Proc.new {|ex,context| Honeybadger.notify_or_ignore(ex, :parameters => context) }
   end
 end

data/lib/honeybadger/notice.rb

@@ -1,4 +1,3 @@
-require 'honeybadger/payload'
 require 'socket'
 
 module Honeybadger
@@ -86,15 +85,8 @@ module Honeybadger
     # The api_key to use when sending notice (optional)
     attr_reader :api_key
 
-    # Local variables are extracted from first frame of backtrace
-    attr_reader :local_variables
-
-    # Additional features to enable/disable
-    attr_reader :features
-
     def initialize(args)
       self.args         = args
-      self.features     = args[:features] || {}
       self.exception    = args[:exception]
       self.project_root = args[:project_root]
 
@@ -132,9 +124,7 @@ module Honeybadger
       self.source_extract_radius = args[:source_extract_radius] || 2
       self.source_extract        = extract_source_from_backtrace
 
-      self.local_variables = send_local_variables? ? local_variables_from_exception(exception) : {}
-
-      self.send_request_session = args[:send_request_session].nil? ? true : args[:send_request_session]
+      self.send_request_session     = args[:send_request_session].nil? ? true : args[:send_request_session]
 
       also_use_rack_params_filters
       find_session_data
@@ -143,7 +133,10 @@ module Honeybadger
       set_context
     end
 
-    # Deprecated. Remove in 2.0.
+    # Public: Send the notice to Honeybadger using the configured sender
+    #
+    # Returns a reference to the error in Honeybadger, false if sender isn't
+    # configured
     def deliver
       return false unless Honeybadger.sender
       Honeybadger.sender.send_to_honeybadger(self)
@@ -153,7 +146,7 @@ module Honeybadger
     #
     # Returns JSON representation of notice
     def as_json(options = {})
-      Payload.new({
+      {
         :api_key => api_key,
         :notifier => {
           :name => notifier_name,
@@ -175,8 +168,7 @@ module Honeybadger
           :params => parameters,
           :session => session_data,
           :cgi_data => cgi_data,
-          :context => context,
-          :local_variables => local_variables
+          :context => context
         },
         :server => {
           :project_root => project_root,
@@ -184,7 +176,7 @@ module Honeybadger
           :hostname => hostname,
           :stats => stats
         }
-      })
+      }
     end
 
     # Public: Creates JSON
@@ -243,9 +235,8 @@ module Honeybadger
       :error_message, :backtrace_filters, :parameters, :params_filters,
       :environment_filters, :session_data, :project_root, :url, :ignore,
       :ignore_by_filters, :notifier_name, :notifier_url, :notifier_version,
-      :component, :action, :cgi_data, :environment_name, :hostname, :stats,
-      :context, :source_extract, :source_extract_radius, :send_request_session,
-      :api_key, :features, :local_variables
+      :component, :action, :cgi_data, :environment_name, :hostname, :stats, :context,
+      :source_extract, :source_extract_radius, :send_request_session, :api_key
 
     # Private: Arguments given in the initializer
     attr_accessor :args
@@ -479,31 +470,5 @@ module Honeybadger
       input = input[0...bytes] if input.respond_to?(:size) && input.size > bytes
       input
     end
-
-    # Internal: Fetch local variables from first frame of backtrace.
-    #
-    # exception - The Exception containing the bindings stack.
-    #
-    # Returns a Hash of local variables
-    def local_variables_from_exception(exception)
-      return {} unless Exception === exception
-      return {} if exception.__honeybadger_bindings_stack.empty?
-
-      if project_root
-        binding = exception.__honeybadger_bindings_stack.find { |b| b.eval('__FILE__') =~ /^#{Regexp.escape(project_root.to_s)}/ }
-      end
-
-      binding ||= exception.__honeybadger_bindings_stack[0]
-
-      vars = binding.eval('local_variables')
-      Hash[vars.map {|arg| [arg, binding.eval(arg.to_s)]}]
-    end
-
-    # Internal: Should local variables be sent?
-    #
-    # Returns true to send local_variables
-    def send_local_variables?
-      args[:send_local_variables] && features['local_variables']
-    end
   end
 end