honeybadger 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8bbd31ca8b2bb05fd05a421ff9b69885aad0536
-  data.tar.gz: ef355e0789e3c887532ac9ccb9b914b646bceb86
+  metadata.gz: 068b9e2194b424660cdbb40d19fa3c22c60d9968
+  data.tar.gz: 68181b2849fb96625616363debd565a8bb2f245f
 SHA512:
-  metadata.gz: d649051af4ed87b4d5f135d48ca48d1c7221406d60c1c33086254de1c2ed3990d8b4b71d5ee4a5711ba05725fd88e10108742ec1ba71dfdff4a645155be0a5f5
-  data.tar.gz: d036e303f4ca14735e20cd5631a988f26d706461598672b4d4128ac02b1573116b7ba3a39092502375de2bb4c8f9da1dfbdf7062b648d289edb75255d37be170
+  metadata.gz: 020b001e540dd1ed39ce283d073b6756dc1159759bdf0d49427995d07e2b6c3ce5033ef01e40ab3e2055066f21827b152c6d94a74738c17aa8b9eff8a970d4e3
+  data.tar.gz: ebd0b1d4b62e87696dda8a1b18d8d6f0c72f1702155bce273bad363d8d93ca25d33ce061d3f6e2dd22104f93c60a3a0eeeb708957a161fea7daafaf4f35a9b96

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+* Merge exceptions.ignore config values with default ignored exception class
+  names and add exceptions.ignore_only option to override.
+
+  *Joshua Wood*
+
 * Support for capistrano-rbenv gem in Capistrano task.
 
   *Chris Gunther*

data/lib/honeybadger/config.rb

@@ -33,16 +33,22 @@ module Honeybadger
 
     FEATURES = [:notices, :local_variables, :metrics, :traces].freeze
 
+    MERGE_DEFAULT = [:'exceptions.ignore'].freeze
+
+    OVERRIDE = {
+      :'exceptions.ignore' => :'exceptions.ignore_only'
+    }.freeze
+
     def initialize(opts = {})
       l = opts.delete(:logger)
 
       @values = opts
 
-      load_config_from_disk do |yml|
-        update(yml)
-      end
-
-      update(Env.new(ENV))
+      priority = {}
+      priority.update(opts)
+      load_config_from_disk {|yml| priority.update(yml) }
+      priority.update(Env.new(ENV))
+      update(merge_defaults!(priority))
 
       @logger = Logging::ConfigLogger.new(self, build_logger(l))
       Logging::BootLogger.instance.flush(@logger)
@@ -56,7 +62,9 @@ module Honeybadger
 
     def get(key)
       key = key.to_sym
-      if @values.include?(key)
+      if OVERRIDE.has_key?(key) && @values.has_key?(OVERRIDE[key])
+        @values[OVERRIDE[key]]
+      elsif @values.has_key?(key)
         @values[key]
       else
         DEFAULTS[key]
@@ -351,5 +359,20 @@ api_key: '#{self[:api_key]}'
     def symbolize_keys(hash)
       Hash[hash.map {|k,v| [k.to_sym, v] }]
     end
+
+    # Internal: Merges supplied config options with defaults.
+    #
+    # config - The Hash config options to merge.
+    #
+    # Returns the updated Hash config with merged values.
+    def merge_defaults!(config)
+      MERGE_DEFAULT.each do |option|
+        if config[option].kind_of?(Array)
+          config[option] = (DEFAULTS[option] | config[option])
+        end
+      end
+
+      config
+    end
   end
 end

data/lib/honeybadger/config/defaults.rb

@@ -12,6 +12,8 @@ module Honeybadger
                       'Mongoid::Errors::DocumentNotFound',
                       'Sinatra::NotFound'].map(&:freeze).freeze
 
+    DEVELOPMENT_ENVIRONMENTS = ['development', 'test', 'cucumber'].map(&:freeze).freeze
+
     OPTIONS = {
       api_key: {
         description: 'The API key for your Honeybadger project.',
@@ -47,7 +49,7 @@ module Honeybadger
       },
       development_environments: {
         description: 'Environments which will not report data by default (use report_data to enable/disable explicitly).',
-        default: ['development'.freeze, 'test'.freeze, 'cucumber'.freeze].freeze
+        default: DEVELOPMENT_ENVIRONMENTS
       },
       :'send_data_at_exit' => {
         description: 'Send remaining data when Ruby exits.',
@@ -158,9 +160,13 @@ module Honeybadger
         default: true
       },
       :'exceptions.ignore' => {
-        description: 'A list of exceptions to ignore.',
+        description: 'A list of additional exceptions to ignore (includes default ignored exceptions).',
         default: IGNORE_DEFAULT
       },
+      :'exceptions.ignore_only' => {
+        description: 'A list of exceptions to ignore (overrides the default ignored exceptions).',
+        default: [].freeze
+      },
       :'exceptions.ignored_user_agents' => {
         description: 'A list of user agents to ignore.',
         default: [].freeze

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # Public: The current String Honeybadger version.
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email: