@@ -8,16 +8,6 @@ require 'hoptoad_notifier/sender' # Plugin for applications to automatically post errors to the Hoptoad of their choice. module HoptoadNotifier - IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound', - 'ActionController::RoutingError', - 'ActionController::InvalidAuthenticityToken', - 'CGI::Session::CookieStore::TamperedWithCookie', - 'ActionController::UnknownAction'] - - # Some of these don't exist for Rails 1.2.*, so we have to consider that. - IGNORE_DEFAULT.map!{|e| eval(e) rescue nil }.compact! - IGNORE_DEFAULT.freeze - IGNORE_USER_AGENT_DEFAULT = [] VERSION = "1.2.4" @@ -42,19 +32,6 @@ module HoptoadNotifier # HoptoadNotifier::Configuration. attr_accessor :configuration - # Returns the list of errors that are being ignored. The array can be appended to. - def ignore - @ignore ||= (HoptoadNotifier::IGNORE_DEFAULT.dup) - @ignore.flatten! - @ignore - end - - # Sets the list of ignored errors to only what is passed in here. This method - # can be passed a single error or a list of errors. - def ignore_only=(names) - @ignore = [names].flatten - end - # Returns the list of user agents that are being ignored. The array can be appended to. def ignore_user_agent @ignore_user_agent ||= (HoptoadNotifier::IGNORE_USER_AGENT_DEFAULT.dup) @@ -196,7 +173,7 @@ module HoptoadNotifier end def ignore?(exception) #:nodoc: - ignore_these = HoptoadNotifier.ignore.flatten + ignore_these = HoptoadNotifier.configuration.ignore.flatten ignore_these.include?(exception.class) || ignore_these.include?(exception.class.name) || HoptoadNotifier.configuration.ignore_by_filters. lib/hoptoad_notifier.rb @@ -46,6 +46,9 @@ module HoptoadNotifier # A list of filters for ignoring exceptions. See #ignore_by_filter. attr_reader :ignore_by_filters + # Returns the list of errors that are being ignored. The array can be appended to. + attr_reader :ignore + DEFAULT_PARAMS_FILTERS = %w(password password_confirmation).freeze DEFAULT_BACKTRACE_FILTERS = [ @@ -61,6 +64,16 @@ module HoptoadNotifier lambda { |line| line if line !~ %r{lib/hoptoad_notifier} } ].freeze + IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound', + 'ActionController::RoutingError', + 'ActionController::InvalidAuthenticityToken', + 'CGI::Session::CookieStore::TamperedWithCookie', + 'ActionController::UnknownAction'] + + # Some of these don't exist for Rails 1.2.*, so we have to consider that. + IGNORE_DEFAULT.map!{|e| eval(e) rescue nil }.compact! + IGNORE_DEFAULT.freeze + alias_method :secure?, :secure def initialize @@ -72,6 +85,7 @@ module HoptoadNotifier @environment_filters = [] @backtrace_filters = DEFAULT_BACKTRACE_FILTERS.dup @ignore_by_filters = [] + @ignore = IGNORE_DEFAULT.dup end # Takes a block and adds it to the list of backtrace filters. When the filters @@ -90,6 +104,12 @@ module HoptoadNotifier self.ignore_by_filters << block end + # Sets the list of ignored errors to only what is passed in here. This method + # can be passed a single error or a list of errors. + def ignore_only=(names) + @ignore = [names].flatten + end + # Allows config options to be read like a hash def [](option) send(option) lib/hoptoad_notifier/configuration.rb @@ -16,6 +16,8 @@ class ConfigurationTest < Test::Unit::TestCase assert_config_default :environment_filters, [] assert_config_default :backtrace_filters, HoptoadNotifier::Configuration::DEFAULT_BACKTRACE_FILTERS + assert_config_default :ignore, + HoptoadNotifier::Configuration::IGNORE_DEFAULT end should "provide default values for secure connections" do @@ -86,6 +88,21 @@ class ConfigurationTest < Test::Unit::TestCase assert_same_elements original_filters + [new_filter], config.ignore_by_filters end + should "allow ignored exceptions to be appended" do + config = HoptoadNotifier::Configuration.new + original_filters = config.ignore.dup + new_filter = 'hello' + config.ignore << new_filter + assert_same_elements original_filters + [new_filter], config.ignore + end + + should "allow ignore exceptions to be replaced" do + config = HoptoadNotifier::Configuration.new + new_filter = 'hello' + config.ignore_only = new_filter + assert_equal [new_filter], config.ignore + end + def assert_config_default(option, default_value, config = nil) config ||= HoptoadNotifier::Configuration.new assert_equal default_value, config.send(option) test/configuration_test.rb @@ -144,7 +144,6 @@ class ControllerTest < Test::Unit::TestCase context "when auto-included" do setup do - HoptoadNotifier.ignore_only = HoptoadNotifier::IGNORE_DEFAULT HoptoadNotifier.configure do |config| config.api_key = "1234567890abcdef" end @@ -193,6 +192,7 @@ class ControllerTest < Test::Unit::TestCase super unless action_name == "do_raise" end end + reset_config ::ActionController::Base.logger = Logger.new(STDOUT) @controller = ::IgnoreActionController.new @controller.stubs(:public_environment?).returns(true) @@ -259,7 +259,7 @@ class ControllerTest < Test::Unit::TestCase rescue_action_in_public e end end - HoptoadNotifier.ignore_only = HoptoadNotifier::IGNORE_DEFAULT + reset_config @controller.stubs(:public_environment?).returns(true) stub_sender! end @@ -288,7 +288,7 @@ class ControllerTest < Test::Unit::TestCase context "and configured to ignore additional exceptions" do setup do - HoptoadNotifier.ignore << ActiveRecord::StatementInvalid + HoptoadNotifier.configuration.ignore << ActiveRecord::StatementInvalid end should "still ignore default exceptions" do @@ -318,7 +318,7 @@ class ControllerTest < Test::Unit::TestCase context "and configured to ignore only certain exceptions" do setup do - HoptoadNotifier.ignore_only = [ActiveRecord::StatementInvalid] + HoptoadNotifier.configuration.ignore_only = [ActiveRecord::StatementInvalid] end should "no longer ignore default exceptions" do test/controller_test.rb @@ -198,10 +198,6 @@ class NotifierTest < Test::Unit::TestCase :ghi => "789")) end - should "have at default ignored exceptions" do - assert HoptoadNotifier::IGNORE_DEFAULT.any? - end - should "configure the sender" do sender = stub_sender HoptoadNotifier::Sender.stubs(:new => sender) test/notifier_test.rb 96a3db77791c32f2696952eeff9d3c31668a4149 Joe Ferris jferris@metaphor.local http://github.com/thoughtbot/hoptoad_notifier/commit/aadaaa18946b1236d63e872327b2e91e387fae14 aadaaa18946b1236d63e872327b2e91e387fae14 2009-11-05T08:12:08-08:00 2009-07-28T14:49:00-07:00 Moved ignored exceptions into configuration 841386236968c4e30f3172afa63c912f20a057bc Joe Ferris jferris@metaphor.local