exception_notification 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6bae1cf5ca412dcb05dfa6204df8a2479b622cc
-  data.tar.gz: 51ecaf322c4f5ef0f46f2f243a793d0085051f49
+  metadata.gz: c6cd08f159f882bcc6c9edc00674e06c33b4f6e8
+  data.tar.gz: 063db2017a4336e3b3471431ebd3c5d6cb1bd80a
 SHA512:
-  metadata.gz: 5cc6bce0dfaa2aafc646297998eea3c0b576036907b61bde5e75e9e0aaad4668060941b382291fd7e96b4f69ebd1c54cca0b806c58ff30a40dd5375c56f1f83f
-  data.tar.gz: 949faef594436deb0a25e7c68131ba33ef1bc05b05e33c93dd773ad172139764a6a9be95dabcc2174558a9f81704fc164477d3da3846df915d27e787ef49349c
+  metadata.gz: 131d835c2f0375c1683d8eff1507bebf3b09cb9770ec3749ff18114789dd5152fbb75f50a7c511422ca174d55efb03ded293207f00ceb597287d8432fb2c0666
+  data.tar.gz: ee3de090b851c0b2e04a3a69e8841068040390ec729b60398776913b2eb26e6283e6769046cbab4cb2339baa00b3484738c8a61ba9f942870ddef0a60f2311c8

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 4.1.1
+
+* bug fixes
+  * Alternate way to monkeypatch (by @joshco)
+  * Fix BacktraceCleaner namespacing (by @esdlocomb)
+
 == 4.1.0
 
 * enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exception_notification (4.1.0)
+    exception_notification (4.1.1)
       actionmailer (>= 3.0.4)
       activesupport (>= 3.0.4)
 

data/README.md

@@ -39,9 +39,9 @@ gem 'exception_notification'
 As of Rails 3 ExceptionNotification is used as a rack middleware, or in the environment you want it to run. In most cases you would want ExceptionNotification to run on production. Thus, you can make it work by putting the following lines in your `config/environments/production.rb`:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   }
@@ -58,8 +58,8 @@ In order to use ExceptionNotification with Sinatra, please take a look in the [e
 As of 4.x version the configuration syntax has changed. All email related options MUST BE nested under the `:email` key. Thus, previous configuration like:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotifier,
-  :email_prefix => "[Whatever] ",
+Rails.application.config.middleware.use ExceptionNotifier,
+  :email_prefix => "[PREFIX] ",
   :sender_address => %{"notifier" <notifier@example.com>},
   :exception_recipients => %w{exceptions@example.com}
 ```
@@ -67,9 +67,9 @@ Whatever::Application.config.middleware.use ExceptionNotifier,
 becomes:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   }
@@ -145,9 +145,9 @@ You can reorder the sections, or exclude sections completely, by using `sections
 describe application-specific data--just add the section's name to the list (wherever you'd like), and define the corresponding partial. Like the following example with two new added sections:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
     :sections => %w{my_section1 my_section2}
@@ -183,9 +183,9 @@ In the above case, `@document` and `@person` would be made available to the emai
 When using [background notifications](#background-notifications) some variables are not available in the views, like `@kontroller` and `@request`. Thus, you may want to include different sections for background notifications:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
     :background_sections => %w{my_section1 my_section2 backtrace data}
@@ -200,9 +200,9 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 Additionally, you may want to set customized headers on the outcoming emails. To do so, simply use the `:email_headers` option:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
     :email_headers        => { "X-Custom-Header" => "foobar" }
@@ -238,9 +238,9 @@ By default, ExceptionNotification sends emails in plain text, in order to sends
 By default, ExceptionNotification sends emails using the ActionMailer configuration of the application. In order to send emails by another delivery method, use the `delivery_method` option:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
     :delivery_method => :postmark,
@@ -253,9 +253,9 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 Besides the `delivery_method` option, you also can customize the mailer settings by passing a hash under an option named `DELIVERY_METHOD_settings`. Thus, you can use override specific SMTP settings for notifications using:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
     :delivery_method => :smtp,
@@ -291,9 +291,9 @@ gem 'tinder'
 To configure it, you need to set the `subdomain`, `token` and `room_name` options, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -343,9 +343,9 @@ gem 'hipchat'
 To configure it, you need to set the `token` and `room_name` options, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -404,9 +404,9 @@ gem 'httparty'
 To configure it, you need to set the `url` option, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -418,9 +418,9 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 By default, the WebhookNotifier will call the URLs using the POST method. But, you can change this using the `http_method` option.
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -433,9 +433,9 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 Besides the `url` and `http_method` options, all the other options are passed directly to HTTParty. Thus, if the HTTP server requires authentication, you can include the following options:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -465,9 +465,9 @@ gem 'carrier-pigeon'
 To configure it, you need to set at least the 'domain' option, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -479,7 +479,7 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 There are several other options, which are described below. For example, to use ssl and a password, add a prefix, post to the '#log' channel, and include recipients in the message (so that they will be notified), your configuration might look like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :irc => {
     :domain => 'irc.example.com',
     :nick => 'BadNewsBot',
@@ -564,9 +564,9 @@ gem 'slack-notifier'
 To configure it, you need to set at least the 'webhook_url' option, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -583,7 +583,7 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 The slack notification will include any data saved under `env["exception_notifier.exception_data"]`. If you find this too verbose, you can determine to exclude certain information by doing the following:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :slack => {
     :webhook_url => "[Your webhook url]",
     :channel => "#exceptions",
@@ -664,9 +664,9 @@ end
 Using it:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :email => {
-    :email_prefix => "[Whatever] ",
+    :email_prefix => "[PREFIX] ",
     :sender_address => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   },
@@ -694,10 +694,10 @@ You can choose to ignore certain exceptions, which will make ExceptionNotificati
 Ignore specified exception types. To achieve that, you should use the `:ignore_exceptions` option, like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :ignore_exceptions => ['ActionView::TemplateError'] + ExceptionNotifier.ignored_exceptions,
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   }
@@ -712,10 +712,10 @@ The above will make ExceptionNotifier ignore a *TemplateError* exception, plus t
 In some cases you may want to avoid getting notifications from exceptions made by crawlers. To prevent sending those unwanted notifications, use the `:ignore_crawlers` option like this:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :ignore_crawlers => %w{Googlebot bingbot},
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com}
   }
@@ -728,10 +728,10 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
 Last but not least, you can ignore exceptions based on a condition. Take a look:
 
 ```ruby
-Whatever::Application.config.middleware.use ExceptionNotification::Rack,
+Rails.application.config.middleware.use ExceptionNotification::Rack,
   :ignore_if => ->(env, exception) { exception.message =~ /^Couldn't find Page with ID=/ },
   :email => {
-    :email_prefix         => "[Whatever] ",
+    :email_prefix         => "[PREFIX] ",
     :sender_address       => %{"notifier" <notifier@example.com>},
     :exception_recipients => %w{exceptions@example.com},
   }

data/exception_notification.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'exception_notification'
-  s.version = '4.1.0'
+  s.version = '4.1.1'
   s.authors = ["Jamis Buck", "Josh Peek"]
-  s.date = %q{2015-04-05}
+  s.date = %q{2015-06-09}
   s.summary = "Exception notification for Rails apps"
   s.homepage = "http://smartinez87.github.com/exception_notification"
   s.email = "smartinez87@gmail.com"

data/lib/exception_notifier/email_notifier.rb

@@ -17,7 +17,7 @@ module ExceptionNotifier
 
       def self.extended(base)
         base.class_eval do
-          base.include BacktraceCleaner
+          self.send(:include, ExceptionNotifier::BacktraceCleaner)
 
           # Append application view path to the ExceptionNotifier lookup context.
           self.append_view_path "#{File.dirname(__FILE__)}/views"

data/lib/exception_notifier/modules/backtrace_cleaner.rb

@@ -1,11 +1,13 @@
-module BacktraceCleaner
+module ExceptionNotifier
+  module BacktraceCleaner
 
-  def clean_backtrace(exception)
-    if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
-      Rails.backtrace_cleaner.send(:filter, exception.backtrace)
-    else
-      exception.backtrace
+    def clean_backtrace(exception)
+      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+        Rails.backtrace_cleaner.send(:filter, exception.backtrace)
+      else
+        exception.backtrace
+      end
     end
-  end
 
+  end
 end

data/lib/exception_notifier/slack_notifier.rb

@@ -1,6 +1,6 @@
 module ExceptionNotifier
   class SlackNotifier
-    include BacktraceCleaner
+    include ExceptionNotifier::BacktraceCleaner
 
     attr_accessor :notifier
 

data/test/dummy/test/functional/posts_controller_test.rb

@@ -14,59 +14,59 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   test "should have raised an exception" do
-    assert_not_nil @exception
+    refute_nil @exception
   end
 
   test "should have generated a notification email" do
-    assert_not_nil @mail
+    refute_nil @mail
   end
 
   test "mail should be plain text and UTF-8 enconded by default" do
-    assert @mail.content_type == "text/plain; charset=UTF-8"
+    assert_equal @mail.content_type, "text/plain; charset=UTF-8"
   end
 
   test "mail should have a from address set" do
-    assert @mail.from == ["dummynotifier@example.com"]
+    assert_equal @mail.from, ["dummynotifier@example.com"]
   end
 
   test "mail should have a to address set" do
-    assert @mail.to == ["dummyexceptions@example.com"]
+    assert_equal @mail.to, ["dummyexceptions@example.com"]
   end
 
   test "mail subject should have the proper prefix" do
-    assert @mail.subject.include? "[Dummy ERROR]"
+    assert_includes @mail.subject, "[Dummy ERROR]"
   end
 
   test "mail subject should include descriptive error message" do
-    assert @mail.subject.include? "(NoMethodError) \"undefined method `nw'"
+    assert_includes @mail.subject, "(NoMethodError) \"undefined method `nw'"
   end
 
   test "mail should contain backtrace in body" do
-    assert @mail.encoded.include? "`method_missing'\r\n  app/controllers/posts_controller.rb:18:in `create'\r\n"
+    assert_includes @mail.encoded, "`method_missing'\r\n  app/controllers/posts_controller.rb:18:in `create'\r\n"
   end
 
   test "mail should contain timestamp of exception in body" do
-    assert @mail.encoded.include? "Timestamp  : #{Time.current}"
+    assert_includes @mail.encoded, "Timestamp  : #{Time.current}"
   end
 
   test "mail should contain the newly defined section" do
-    assert @mail.encoded.include? "* New text section for testing"
+    assert_includes @mail.encoded, "* New text section for testing"
   end
 
   test "mail should contain the custom message" do
-    assert @mail.encoded.include? "My Custom Message"
+    assert_includes @mail.encoded, "My Custom Message"
   end
 
   test "should filter sensible data" do
-    assert @mail.encoded.include? "secret\"=>\"[FILTERED]"
+    assert_includes @mail.encoded, "secret\"=>\"[FILTERED]"
   end
 
   test "mail should contain the custom header" do
-    assert @mail.encoded.include? 'X-Custom-Header: foobar'
+    assert_includes @mail.encoded, 'X-Custom-Header: foobar'
   end
 
   test "mail should not contain any attachments" do
-    assert @mail.attachments == []
+    assert_equal @mail.attachments, []
   end
 
   test "should not send notification if one of ignored exceptions" do
@@ -79,7 +79,7 @@ class PostsControllerTest < ActionController::TestCase
       end
     end
 
-    assert @ignored_exception.class.inspect == "ActiveRecord::RecordNotFound"
+    assert_equal @ignored_exception.class.inspect, "ActiveRecord::RecordNotFound"
     assert_nil @ignored_mail
   end
 
@@ -93,7 +93,7 @@ class PostsControllerTest < ActionController::TestCase
     end
 
     assert request.ssl?
-    assert @secured_mail.encoded.include? "* session id: [FILTERED]\r\n  *"
+    assert_includes @secured_mail.encoded, "* session id: [FILTERED]\r\n  *"
   end
 
   test "should ignore exception if from unwanted crawler" do
@@ -127,7 +127,7 @@ class PostsControllerTest < ActionController::TestCase
       @mail = @email_notifier.create_email(@exception, {:env => custom_env})
     end
 
-    assert @mail.content_type.include? "multipart/alternative"
+    assert_includes @mail.content_type, "multipart/alternative"
   end
 end
 
@@ -219,6 +219,6 @@ class PostsControllerTestBackgroundNotification < ActionController::TestCase
   end
 
   test "mail should contain the specified section" do
-    assert @mail.encoded.include? "* New background section for testing"
+    assert_includes @mail.encoded, "* New background section for testing"
   end
 end

data/test/exception_notifier/campfire_notifier_test.rb

@@ -11,9 +11,9 @@ class CampfireNotifierTest < ActiveSupport::TestCase
 
     assert !notif[:message].empty?
     assert_equal notif[:message][:type], 'PasteMessage'
-    assert notif[:message][:body].include? "A new exception occurred:"
-    assert notif[:message][:body].include? "divided by 0"
-    assert notif[:message][:body].include? "/exception_notification/test/campfire_test.rb:45"
+    assert_includes notif[:message][:body], "A new exception occurred:"
+    assert_includes notif[:message][:body], "divided by 0"
+    assert_includes notif[:message][:body], "/exception_notification/test/campfire_test.rb:45"
   end
 
   test "should not send campfire notification if badly configured" do

data/test/exception_notifier/email_notifier_test.rb

@@ -14,59 +14,59 @@ class EmailNotifierTest < ActiveSupport::TestCase
   end
 
   test "should have default sender address overridden" do
-    assert @email_notifier.sender_address == %("Dummy Notifier" <dummynotifier@example.com>)
+    assert_equal @email_notifier.sender_address, %("Dummy Notifier" <dummynotifier@example.com>)
   end
 
   test "should have default exception recipients overridden" do
-    assert @email_notifier.exception_recipients == %w(dummyexceptions@example.com)
+    assert_equal @email_notifier.exception_recipients, %w(dummyexceptions@example.com)
   end
 
   test "should have default email prefix overridden" do
-    assert @email_notifier.email_prefix == "[Dummy ERROR] "
+    assert_equal @email_notifier.email_prefix, "[Dummy ERROR] "
   end
 
   test "should have default email headers overridden" do
-    assert @email_notifier.email_headers == { "X-Custom-Header" => "foobar"}
+    assert_equal @email_notifier.email_headers, { "X-Custom-Header" => "foobar"}
   end
 
   test "should have default sections overridden" do
     for section in %w(new_section request session environment backtrace)
-      assert @email_notifier.sections.include? section
+      assert_includes @email_notifier.sections, section
     end
   end
 
   test "should have default background sections" do
     for section in %w(new_bkg_section backtrace data)
-      assert @email_notifier.background_sections.include? section
+      assert_includes @email_notifier.background_sections, section
     end
   end
 
   test "should have email format by default" do
-    assert @email_notifier.email_format == :text
+    assert_equal @email_notifier.email_format, :text
   end
 
   test "should have verbose subject by default" do
-    assert @email_notifier.verbose_subject == true
+    assert @email_notifier.verbose_subject
   end
 
   test "should have normalize_subject false by default" do
-    assert @email_notifier.normalize_subject == false
+    refute @email_notifier.normalize_subject
   end
 
   test "should have delivery_method nil by default" do
-    assert @email_notifier.delivery_method == nil
+    assert_nil @email_notifier.delivery_method
   end
 
   test "should have mailer_settings nil by default" do
-    assert @email_notifier.mailer_settings == nil
+    assert_nil @email_notifier.mailer_settings
   end
 
   test "should have mailer_parent by default" do
-    assert @email_notifier.mailer_parent == 'ActionMailer::Base'
+    assert_equal @email_notifier.mailer_parent, 'ActionMailer::Base'
   end
 
   test "should have template_path by default" do
-    assert @email_notifier.template_path == 'exception_notifier'
+    assert_equal @email_notifier.template_path, 'exception_notifier'
   end
 
   test "should normalize multiple digits into one N" do
@@ -75,31 +75,39 @@ class EmailNotifierTest < ActiveSupport::TestCase
   end
 
   test "mail should be plain text and UTF-8 enconded by default" do
-    assert @mail.content_type == "text/plain; charset=UTF-8"
+    assert_equal @mail.content_type, "text/plain; charset=UTF-8"
   end
 
   test "should have raised an exception" do
-    assert_not_nil @exception
+    refute_nil @exception
   end
 
   test "should have generated a notification email" do
-    assert_not_nil @mail
+    refute_nil @mail
   end
 
   test "mail should have a from address set" do
-    assert @mail.from == ["dummynotifier@example.com"]
+    assert_equal @mail.from, ["dummynotifier@example.com"]
   end
 
   test "mail should have a to address set" do
-    assert @mail.to == ["dummyexceptions@example.com"]
+    assert_equal @mail.to, ["dummyexceptions@example.com"]
   end
 
   test "mail should have a descriptive subject" do
-    assert @mail.subject == "[Dummy ERROR]  (ZeroDivisionError) \"divided by 0\""
+    # On Rails < 4.1 the subject prefix has two spaces before the rest of the
+    # subject content.
+    if Gem::Version.new(ActionMailer::VERSION::STRING) < Gem::Version.new('4.1')
+      prefix = '[Dummy ERROR]  '
+    else
+      # On Rails 4.1 the subject prefix has a single space.
+      prefix = '[Dummy ERROR] '
+    end
+    assert_equal @mail.subject, prefix + '(ZeroDivisionError) "divided by 0"'
   end
 
   test "mail should say exception was raised in background at show timestamp" do
-    assert @mail.encoded.include? "A ZeroDivisionError occurred in background at #{Time.current}"
+    assert_includes @mail.encoded, "A ZeroDivisionError occurred in background at #{Time.current}"
   end
 
   test "mail should prefix exception class with 'an' instead of 'a' when it starts with a vowel" do
@@ -110,7 +118,7 @@ class EmailNotifierTest < ActiveSupport::TestCase
       @vowel_mail = @email_notifier.create_email(@vowel_exception)
     end
 
-    assert @vowel_mail.encoded.include? "An ActiveRecord::RecordNotFound occurred in background at #{Time.current}"
+    assert_includes @vowel_mail.encoded, "An ActiveRecord::RecordNotFound occurred in background at #{Time.current}"
   end
 
   test "mail should contain backtrace in body" do
@@ -118,14 +126,14 @@ class EmailNotifierTest < ActiveSupport::TestCase
   end
 
   test "mail should contain data in body" do
-    assert @mail.encoded.include? '* data:'
-    assert @mail.encoded.include? ':payload=>"1/0"'
-    assert @mail.encoded.include? ':job=>"DivideWorkerJob"'
-    assert @mail.encoded.include? "My Custom Message"
+    assert_includes @mail.encoded, '* data:'
+    assert_includes @mail.encoded, ':payload=>"1/0"'
+    assert_includes @mail.encoded, ':job=>"DivideWorkerJob"'
+    assert_includes @mail.encoded, "My Custom Message"
   end
 
   test "mail should not contain any attachments" do
-    assert @mail.attachments == []
+    assert_equal @mail.attachments, []
   end
 
   test "should not send notification if one of ignored exceptions" do
@@ -138,7 +146,7 @@ class EmailNotifierTest < ActiveSupport::TestCase
       end
     end
 
-    assert @ignored_exception.class.inspect == "ActiveRecord::RecordNotFound"
+    assert_equal @ignored_exception.class.inspect, "ActiveRecord::RecordNotFound"
     assert_nil @ignored_mail
   end
 end

data/test/exception_notifier/webhook_notifier_test.rb

@@ -9,11 +9,11 @@ class WebhookNotifierTest < ActiveSupport::TestCase
     webhook.stubs(:call).returns(fake_response)
     response = webhook.call(fake_exception)
 
-    assert_not_nil response
+    refute_nil response
     assert_equal response[:status], 200
     assert_equal response[:body][:exception][:error_class], "ZeroDivisionError"
-    assert response[:body][:exception][:message].include? "divided by 0"
-    assert response[:body][:exception][:backtrace].include? "/exception_notification/test/webhook_notifier_test.rb:48"
+    assert_includes response[:body][:exception][:message], "divided by 0"
+    assert_includes response[:body][:exception][:backtrace], "/exception_notification/test/webhook_notifier_test.rb:48"
     
     assert response[:body][:request][:cookies].has_key?(:cookie_item1)
     assert_equal response[:body][:request][:url], "http://example.com/example"

data/test/exception_notifier_test.rb

@@ -2,18 +2,18 @@ require 'test_helper'
 
 class ExceptionNotifierTest < ActiveSupport::TestCase
   test "should have default ignored exceptions" do
-    assert ExceptionNotifier.ignored_exceptions == ['ActiveRecord::RecordNotFound', 'AbstractController::ActionNotFound', 'ActionController::RoutingError', 'ActionController::UnknownFormat']
+    assert_equal ExceptionNotifier.ignored_exceptions, ['ActiveRecord::RecordNotFound', 'AbstractController::ActionNotFound', 'ActionController::RoutingError', 'ActionController::UnknownFormat']
   end
 
   test "should have email notifier registered" do
-    assert ExceptionNotifier.notifiers == [:email]
+    assert_equal ExceptionNotifier.notifiers, [:email]
   end
 
   test "should have a valid email notifier" do
     @email_notifier = ExceptionNotifier.registered_exception_notifier(:email)
-    assert_not_nil @email_notifier
-    assert @email_notifier.class == ExceptionNotifier::EmailNotifier
-    assert @email_notifier.respond_to?(:call)
+    refute_nil @email_notifier
+    assert_equal @email_notifier.class, ExceptionNotifier::EmailNotifier
+    assert_respond_to @email_notifier, :call
   end
 
   test "should allow register/unregister another notifier" do
@@ -21,14 +21,14 @@ class ExceptionNotifierTest < ActiveSupport::TestCase
     proc_notifier = lambda { |exception, options| called = true }
     ExceptionNotifier.register_exception_notifier(:proc, proc_notifier)
 
-    assert ExceptionNotifier.notifiers.sort == [:email, :proc]
+    assert_equal ExceptionNotifier.notifiers.sort, [:email, :proc]
 
     exception = StandardError.new
     ExceptionNotifier.notify_exception(exception)
-    assert called == true
+    assert called
 
     ExceptionNotifier.unregister_exception_notifier(:proc)
-    assert ExceptionNotifier.notifiers == [:email]
+    assert_equal ExceptionNotifier.notifiers, [:email]
   end
 
   test "should allow select notifiers to send error to" do
@@ -40,24 +40,24 @@ class ExceptionNotifierTest < ActiveSupport::TestCase
     notifier2 = lambda { |exception, options| notifier2_calls += 1 }
     ExceptionNotifier.register_exception_notifier(:notifier2, notifier2)
 
-    assert ExceptionNotifier.notifiers.sort == [:email, :notifier1, :notifier2]
+    assert_equal ExceptionNotifier.notifiers.sort, [:email, :notifier1, :notifier2]
 
     exception = StandardError.new
     ExceptionNotifier.notify_exception(exception)
-    assert notifier1_calls == 1
-    assert notifier2_calls == 1
+    assert_equal notifier1_calls, 1
+    assert_equal notifier2_calls, 1
 
     ExceptionNotifier.notify_exception(exception, {:notifiers => :notifier1})
-    assert notifier1_calls == 2
-    assert notifier2_calls == 1
+    assert_equal notifier1_calls, 2
+    assert_equal notifier2_calls, 1
 
     ExceptionNotifier.notify_exception(exception, {:notifiers => :notifier2})
-    assert notifier1_calls == 2
-    assert notifier2_calls == 2
+    assert_equal notifier1_calls, 2
+    assert_equal notifier2_calls, 2
 
     ExceptionNotifier.unregister_exception_notifier(:notifier1)
     ExceptionNotifier.unregister_exception_notifier(:notifier2)
-    assert ExceptionNotifier.notifiers == [:email]
+    assert_equal ExceptionNotifier.notifiers, [:email]
   end
 
   test "should ignore exception if satisfies conditional ignore" do
@@ -73,11 +73,11 @@ class ExceptionNotifierTest < ActiveSupport::TestCase
     exception = StandardError.new
 
     ExceptionNotifier.notify_exception(exception, {:notifiers => :test})
-    assert notifier_calls == 1
+    assert_equal notifier_calls, 1
 
     env = "development"
     ExceptionNotifier.notify_exception(exception, {:notifiers => :test})
-    assert notifier_calls == 1
+    assert_equal notifier_calls, 1
 
     ExceptionNotifier.clear_ignore_conditions!
     ExceptionNotifier.unregister_exception_notifier(:test)
@@ -91,10 +91,10 @@ class ExceptionNotifierTest < ActiveSupport::TestCase
     exception = StandardError.new
 
     ExceptionNotifier.notify_exception(exception, {:notifiers => :test})
-    assert notifier_calls == 1
+    assert_equal notifier_calls, 1
 
     ExceptionNotifier.notify_exception(exception, {:notifiers => :test, :ignore_exceptions => 'StandardError' })
-    assert notifier_calls == 1
+    assert_equal notifier_calls, 1
 
     ExceptionNotifier.unregister_exception_notifier(:test)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exception_notification
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Jamis Buck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer