honeybadger 1.5.0 → 1.6.0

data/gemfiles/rake.gemfile

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

data/gemfiles/rake.gemfile.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.5.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.1.4)
+    capistrano (2.14.1)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    ffi (1.3.1)
+    ffi (1.3.1-java)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
+    highline (1.6.15)
+    json (1.7.6)
+    json (1.7.6-java)
+    metaclass (0.0.1)
+    mocha (0.13.0)
+      metaclass (~> 0.0.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.3)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    rack (1.4.5)
+    rack-protection (1.3.2)
+      rack
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    sham_rack (1.3.4)
+      rack
+    shoulda (2.11.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  bourne (>= 1.0)
+  capistrano
+  cucumber (~> 1.2.1)
+  fakeweb (~> 1.3.0)
+  honeybadger!
+  rake
+  rspec (~> 2.12.0)
+  sham_rack (~> 1.3.0)
+  shoulda (~> 2.11.3)
+  sinatra

data/gemfiles/sinatra.gemfile

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

data/gemfiles/sinatra.gemfile.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: /Users/josh/code/honeybadger-ruby
+  specs:
+    honeybadger (1.5.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.1.4)
+    capistrano (2.14.1)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    ffi (1.3.1)
+    ffi (1.3.1-java)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
+    highline (1.6.15)
+    json (1.7.6)
+    json (1.7.6-java)
+    metaclass (0.0.1)
+    mocha (0.13.0)
+      metaclass (~> 0.0.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.6.3)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    rack (1.4.5)
+    rack-protection (1.3.2)
+      rack
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    sham_rack (1.3.4)
+      rack
+    shoulda (2.11.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  bourne (>= 1.0)
+  capistrano
+  cucumber (~> 1.2.1)
+  fakeweb (~> 1.3.0)
+  honeybadger!
+  rake
+  rspec (~> 2.12.0)
+  sham_rack (~> 1.3.0)
+  shoulda (~> 2.11.3)
+  sinatra

data/generators/honeybadger/honeybadger_generator.rb

@@ -49,15 +49,15 @@ class HoneybadgerGenerator < Rails::Generator::Base
   def determine_api_key
     puts "Attempting to determine your API Key from Heroku..."
     ENV['HONEYBADGER_API_KEY'] = heroku_api_key
-    if ENV['HONEYBADGER_API_KEY'].blank?
+    if ENV['HONEYBADGER_API_KEY'] =~ /\S/
+      puts "... Done."
+      puts "Heroku's Honeybadger API Key is '#{ENV['HONEYBADGER_API_KEY']}'"
+    else
       puts "... Failed."
       puts "WARNING: We were unable to detect the Honeybadger API Key from your Heroku environment."
       puts "Your Heroku application environment may not be configured correctly."
       puts "Have you configured multiple Heroku apps? Try using the '--app [app name]' flag." unless options[:app]
       exit 1
-    else
-      puts "... Done."
-      puts "Heroku's Honeybadger API Key is '#{ENV['HONEYBADGER_API_KEY']}'"
     end
   end
 
@@ -67,7 +67,7 @@ class HoneybadgerGenerator < Rails::Generator::Base
   end
 
   def heroku_api_key
-    heroku_var("HONEYBADGER_API_KEY",options[:app]).split.find {|x| x unless x.blank?}
+    heroku_var("HONEYBADGER_API_KEY",options[:app]).split.find {|x| x =~ /\S/ }
   end
 
   def heroku?

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.5.0'
-  s.date              = '2013-01-16'
+  s.version           = '1.6.0'
+  s.date              = '2013-03-12'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md MIT-LICENSE]
 
   s.add_dependency('json')
-  s.add_dependency('activesupport')
 
   s.add_development_dependency('cucumber',          '~> 1.2.1')
   s.add_development_dependency('rspec',             '~> 2.12.0')
@@ -40,6 +39,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Appraisals
+    CHANGELOG.md
     Gemfile
     Gemfile.lock
     Guardfile
@@ -56,9 +56,12 @@ Gem::Specification.new do |s|
     features/step_definitions/rails_steps.rb
     features/step_definitions/rake_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
+    gemfiles/rack.gemfile
+    gemfiles/rack.gemfile.lock
     gemfiles/rails2.3.gemfile
     gemfiles/rails2.3.gemfile.lock
     gemfiles/rails3.0.gemfile
@@ -67,6 +70,12 @@ Gem::Specification.new do |s|
     gemfiles/rails3.1.gemfile.lock
     gemfiles/rails3.2.gemfile
     gemfiles/rails3.2.gemfile.lock
+    gemfiles/rails4.gemfile
+    gemfiles/rails4.gemfile.lock
+    gemfiles/rake.gemfile
+    gemfiles/rake.gemfile.lock
+    gemfiles/sinatra.gemfile
+    gemfiles/sinatra.gemfile.lock
     generators/honeybadger/honeybadger_generator.rb
     generators/honeybadger/lib/insert_commands.rb
     generators/honeybadger/lib/rake_commands.rb

data/lib/honeybadger.rb

@@ -1,14 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'json'
-
-begin
-  require 'active_support'
-  require 'active_support/core_ext'
-rescue LoadError
-  require 'activesupport'
-  require 'activesupport/core_ext'
-end
+require 'logger'
 
 require 'honeybadger/configuration'
 require 'honeybadger/backtrace'
@@ -19,7 +12,7 @@ require 'honeybadger/sender'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {
@@ -38,7 +31,7 @@ module Honeybadger
 
     # Tell the log that the Notifier is good to go
     def report_ready
-      write_verbose_log("Notifier #{VERSION} ready to catch errors")
+      write_verbose_log("Notifier #{VERSION} ready to catch errors", :info)
     end
 
     # Prints out the environment info to the log for debugging help
@@ -59,8 +52,8 @@ module Honeybadger
     end
 
     # Writes out the given message to the #logger
-    def write_verbose_log(message)
-      logger.info LOG_PREFIX + message if logger
+    def write_verbose_log(message, level = Honeybadger.configuration.debug ? :info : :debug)
+      logger.send(level, LOG_PREFIX + message) if logger
     end
 
     # Look for the Rails logger currently defined
@@ -128,8 +121,8 @@ module Honeybadger
       result[:environment_name] = 'production'
 
       unless notice.backtrace.lines.empty?
-        result[:file]        = notice.backtrace.lines.first.file
-        result[:line_number] = notice.backtrace.lines.first.number
+        result[:file]        = notice.backtrace.lines[0].file
+        result[:line_number] = notice.backtrace.lines[0].number
       end
 
       result

data/lib/honeybadger/configuration.rb

@@ -5,7 +5,8 @@ module Honeybadger
                :ignore_user_agent, :notifier_name, :notifier_url, :notifier_version,
                :params_filters, :project_root, :port, :protocol, :proxy_host, :proxy_pass,
                :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain, :framework,
-               :user_information, :rescue_rake_exceptions, :source_extract_radius].freeze
+               :user_information, :rescue_rake_exceptions, :source_extract_radius,
+               :send_request_session, :debug].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -91,6 +92,12 @@ module Honeybadger
     # The radius around trace line to include in source excerpt
     attr_accessor :source_extract_radius
 
+    # +true+ to send session data, +false+ to exclude
+    attr_accessor :send_request_session
+
+    # +true+ to log extra debug info, +false+ to suppress
+    attr_accessor :debug
+
     # A Proc object used to send notices asynchronously
     attr_writer :async
 
@@ -145,6 +152,8 @@ module Honeybadger
       @user_information          = 'Honeybadger Error {{error_id}}'
       @rescue_rake_exceptions    = nil
       @source_extract_radius     = 2
+      @send_request_session      = true
+      @debug                     = false
     end
 
     # Public: Takes a block and adds it to the list of backtrace filters. When

data/lib/honeybadger/notice.rb

@@ -26,6 +26,9 @@ module Honeybadger
     # The message from the exception, or a general description of the error
     attr_reader :error_message
 
+    # See Configuration#send_request_session
+    attr_reader :send_request_session
+
     # See Configuration#backtrace_filters
     attr_reader :backtrace_filters
 
@@ -107,6 +110,8 @@ module Honeybadger
       self.source_extract_radius = args[:source_extract_radius] || 2
       self.source_extract        = extract_source_from_backtrace
 
+      self.send_request_session     = args[:send_request_session].nil? ? true : args[:send_request_session]
+
       also_use_rack_params_filters
       find_session_data
       clean_params
@@ -129,7 +134,8 @@ module Honeybadger
         :notifier => {
           :name => notifier_name,
           :url => notifier_url,
-          :version => notifier_version
+          :version => notifier_version,
+          :language => 'ruby'
         },
         :error => {
           :class => error_class,
@@ -161,9 +167,28 @@ module Honeybadger
       as_json.to_json(*a)
     end
 
-    # Determines if this notice should be ignored
+    # Public: Determines if error class should be ignored
+    #
+    # ignored_class_name - The name of the ignored class. May be a
+    # string or regexp (optional)
+    #
+    # Returns true/false with an argument, otherwise a Proc object
+    def ignore_by_class?(ignored_class = nil)
+      @ignore_by_class ||= Proc.new do |ignored_class|
+        case error_class
+        when (ignored_class.respond_to?(:name) ? ignored_class.name : ignored_class)
+          true
+        else
+          exception && ignored_class.is_a?(Class) && exception.class < ignored_class
+        end
+      end
+
+      ignored_class ? @ignore_by_class.call(ignored_class) : @ignore_by_class
+    end
+
+    # Public: Determines if this notice should be ignored
     def ignore?
-      ignored_class_names.include?(error_class) ||
+      ignore.any?(&ignore_by_class?) ||
         ignore_by_filters.any? {|filter| filter.call(self) }
     end
 
@@ -192,7 +217,7 @@ module Honeybadger
       :session_data, :project_root, :url, :ignore, :ignore_by_filters,
       :notifier_name, :notifier_url, :notifier_version, :component, :action,
       :cgi_data, :environment_name, :hostname, :context, :source_extract,
-      :source_extract_radius
+      :source_extract_radius, :send_request_session
 
     # Private: Arguments given in the initializer
     attr_accessor :args
@@ -308,8 +333,10 @@ module Honeybadger
     end
 
     def find_session_data
-      self.session_data = args[:session_data] || args[:session] || rack_session || {}
-      self.session_data = session_data[:data] if session_data[:data]
+      if send_request_session
+        self.session_data = args[:session_data] || args[:session] || rack_session || {}
+        self.session_data = session_data[:data] if session_data[:data]
+      end
     end
 
     def set_context
@@ -318,18 +345,6 @@ module Honeybadger
       self.context = nil if context.empty?
     end
 
-    # Private: Converts the mixed class instances and class names into just names
-    # TODO: move this into Configuration or another class
-    def ignored_class_names
-      ignore.collect do |string_or_class|
-        if string_or_class.respond_to?(:name)
-          string_or_class.name
-        else
-          string_or_class
-        end
-      end
-    end
-
     def rack_env(method)
       rack_request.send(method) if rack_request
     end
@@ -348,10 +363,13 @@ module Honeybadger
       args[:rack_env]['rack.session'] if args[:rack_env]
     end
 
+    # Private: (Rails 3+) Adds params filters to filter list
+    #
+    # Returns nothing
     def also_use_rack_params_filters
-      if args[:rack_env]
+      if cgi_data
         @params_filters ||= []
-        @params_filters += rack_request.env["action_dispatch.parameter_filter"] || []
+        @params_filters += cgi_data['action_dispatch.parameter_filter'] || []
       end
     end