Merge ff27f86 into 4d6adef

.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 install:
   - "gem install bundler"
   - "bundle install --jobs=3 --retry=3"
 gemfile:
   - gemfiles/rails4_0.gemfile
   - gemfiles/rails4_1.gemfile
   - gemfiles/rails4_2.gemfile
+  - gemfiles/rails5_0.gemfile
+matrix:
+  exclude:
+    - rvm: 2.1.9
+      gemfile: gemfiles/rails5_0.gemfile

Appraisals

@@ -1,7 +1,8 @@
-rails_versions = ['~> 4.0.5', '~> 4.1.1', '~> 4.2.0']
+rails_versions = ['~> 4.0.5', '~> 4.1.1', '~> 4.2.0', '~> 5.0.0']
 
 rails_versions.each do |rails_version|
   appraise "rails#{rails_version.slice(/\d+\.\d+/).gsub('.', '_')}" do
     gem 'rails', rails_version
+    gem "sqlite3"
   end
 end

CHANGELOG.rdoc

@@ -1,10 +1,11 @@
-== 5.0.0
+== 4.2.0
 
 * enhancements
   * update URL in gemspec (by @ktdreyer)
   * Add `hostname` to Slack notifier (by @juanazam)
   * Allow `exception_recipients` to be a proc (by @kellyjosephprice)
   * Add Mattermost integration (by @Aschen)
+  * Rails 5 compatible
 
 * bug fixes
   * Fix error when showing timestamp on non Rails apps

Rakefile

@@ -5,19 +5,11 @@ require 'appraisal'
 
 require 'rake/testtask'
 
-task 'setup_dummy_app' do
-  unless File.exists? "test/dummy/db/test.sqlite3"
-    Bundler.with_clean_env do
-      sh "cd test/dummy; bundle; bundle exec rake db:migrate; bundle exec rake db:test:prepare; cd ../../;"
-    end
-  end
-end
+task :default => [:test]
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-task :default => [:setup_dummy_app, :test]

exception_notification.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'exception_notification'
-  s.version = '4.1.4'
+  s.version = '4.2.0'
   s.authors = ["Jamis Buck", "Josh Peek"]
+  s.date = %q{2016-07-02}
   s.summary = "Exception notification for Rails apps"
   s.homepage = "https://smartinez87.github.io/exception_notification/"
   s.email = "smartinez87@gmail.com"
@@ -15,10 +16,10 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- test`.split("\n")
   s.require_path = 'lib'
 
-  s.add_dependency("actionmailer", "~> 4.0")
-  s.add_dependency("activesupport", "~> 4.0")
+  s.add_dependency("actionmailer", ">= 4.0", "< 6")
+  s.add_dependency("activesupport", ">= 4.0", "< 6")
 
-  s.add_development_dependency "rails", "~> 4.0"
+  s.add_development_dependency "rails", ">= 4.0", "< 6"
   s.add_development_dependency "resque", "~> 1.2.0"
   # Sidekiq 3.2.2 does not support Ruby 1.9.
   s.add_development_dependency "sidekiq", "~> 3.0.0", "< 3.2.2"

gemfiles/rails4_0.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.5"
+gem "sqlite3"
 
 gemspec :path => "../"

gemfiles/rails4_1.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1.1"
+gem "sqlite3"
 
 gemspec :path => "../"

gemfiles/rails4_2.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
+gem "sqlite3"
 
 gemspec :path => "../"

gemfiles/rails5_0.gemfile

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

lib/exception_notifier.rb

@@ -24,7 +24,7 @@ class UndefinedNotifierError < StandardError; end
 
   # Define a set of exceptions to be ignored, ie, dont send notifications when any of them are raised.
   mattr_accessor :ignored_exceptions
-  @@ignored_exceptions = %w{ActiveRecord::RecordNotFound AbstractController::ActionNotFound ActionController::RoutingError ActionController::UnknownFormat}
+  @@ignored_exceptions = %w{ActiveRecord::RecordNotFound AbstractController::ActionNotFound ActionController::RoutingError ActionController::UnknownFormat ActionController::UrlGenerationError}
 
   mattr_accessor :testing_mode
   @@testing_mode = false

lib/exception_notifier/email_notifier.rb

@@ -51,6 +51,7 @@ def background_exception_notification(exception, options={}, default_options={})
             @timestamp = Time.current
             @sections  = @options[:background_sections]
             @data      = options[:data] || {}
+            @env = @kontroller = nil
 
             compose_email
           end

lib/exception_notifier/mattermost_notifier.rb

@@ -44,7 +44,8 @@ def call(exception, options = {})
           current_user = User.find(request.session["warden.user.user.key"][0][0])
           @request_items.merge!({ current_user: { id: current_user.id, email: current_user.email  } })
         end
-
+      else
+        @controller = @request_items = nil
       end
 
       payload = message_text.merge(user_info).merge(channel_info)