exception_handling 2.7.0.pre.1 → 2.8.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3794611262e09346bab80e7a683f4ce1d78d6ba04b46fa15fa4bc84ac087e41e
-  data.tar.gz: 36f96bed7f2b3375df4730d35ee5ec96cdf70e7c07f4ba589e187c75275c1736
+  metadata.gz: be4fce66c798d0d7a85180e3cb569c297f6fe5a0b6f84390f0f3122781bc066e
+  data.tar.gz: f3987b0abb4d1af23c42e3d1799941b0fa438c7ac2cdf304cd5dd25e4c7d9b35
 SHA512:
-  metadata.gz: 2d1dad10749b867696c0f4dcacedcfb4af466ba792fa0c98ae307ee4bbeda10657f172fc95ff3c9b0162d1787d39c3c2a15a220fa6c6f4a7f7b10d857dad5eec
-  data.tar.gz: 8b28f2829a1e34787d7de51fdee4d0fe5a39356584d6d910c106edac2fe5d8ebcf0f3f5f1e9e1b7e4e7b0c36dd62035885214248072e47a7fdec7d1e4a854f94
+  metadata.gz: b5aee756b91d0a12b5d7d37cabeee83e4a95481c2968c1c3919a28899bfe82345dc8af3da9608df23863ce341d6313f06948005141bc3d3e86775c8d910afc94
+  data.tar.gz: 5c00b42b75288042226cde5f48e5d52d5e8c46381e1e114615f0fba64ff3c776c0e6b355976c79759a6ac6e48c87aee027abc743f610f5279ac9f533914b5361

data/.gitignore

@@ -1,6 +1,6 @@
 .idea
 .DS_Store
 .rubocop-http*
-test/reports/*
+spec/reports/*
 gemfiles/*.lock
 pkg/

data/.jenkins/Jenkinsfile

@@ -36,42 +36,58 @@ pipeline {
     stage('Appraisals') {
       parallel {
         stage('Current') {
+          environment {
+            JUNIT_OUTPUT = 'spec/reports/current'
+          }
+
           steps {
-            sh 'JUNIT_OUTPUT_DIR=test/reports/current bundle exec rake'
+            sh "bundle exec rspec --format RspecJunitFormatter --out ${JUNIT_OUTPUT}/rspec.xml"
           }
 
           post {
-            always { junit '*/reports/current/*.xml' }
+            always { junit "${JUNIT_OUTPUT}/*.xml" }
           }
         }
 
         stage('Rails 4') {
+          environment {
+            JUNIT_OUTPUT = 'spec/reports/rails-4'
+          }
+
           steps {
-            sh 'JUNIT_OUTPUT_DIR=test/reports/rails-4 bundle exec appraisal rails-4 rake'
+            sh "bundle exec appraisal rails-4 rspec --format RspecJunitFormatter --out ${JUNIT_OUTPUT}/rspec.xml"
           }
 
           post {
-            always { junit '*/reports/rails-4/*.xml' }
+            always { junit "${JUNIT_OUTPUT}/*.xml" }
           }
         }
 
         stage('Rails 5') {
+          environment {
+            JUNIT_OUTPUT = 'spec/reports/rails-5'
+          }
+
           steps {
-            sh 'JUNIT_OUTPUT_DIR=test/reports/rails-5 bundle exec appraisal rails-5 rake'
+            sh "bundle exec appraisal rails-5 rspec --format RspecJunitFormatter --out ${JUNIT_OUTPUT}/rspec.xml"
           }
 
           post {
-            always { junit '*/reports/rails-5/*.xml' }
+            always { junit "${JUNIT_OUTPUT}/*.xml" }
           }
         }
 
         stage('Rails 6') {
+          environment {
+            JUNIT_OUTPUT = 'spec/reports/rails-6'
+          }
+
           steps {
-            sh 'JUNIT_OUTPUT_DIR=test/reports/rails-6 bundle exec appraisal rails-6 rake'
+            sh "bundle exec appraisal rails-6 rspec --format RspecJunitFormatter --out ${JUNIT_OUTPUT}/rspec.xml"
           }
 
           post {
-            always { junit '*/reports/rails-6/*.xml' }
+            always { junit "${JUNIT_OUTPUT}/*.xml" }
           }
         }
       }

data/.rspec

@@ -0,0 +1,3 @@
+--require spec_helper
+--format progress
+--color

data/CHANGELOG.md

@@ -4,13 +4,17 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.7.0] - Unreleased
+## [2.8.0] - Unreleased
+### Deprecated
+- Deprecated Email Escalation Methods: `escalate_to_production_support`, `escalate_error`, `escalate_warning`, `ensure_escalation`
+
+## [2.7.0] - 2020-10-14
 ### Added
 - Added `LoggingMethods` as a replacement for `Methods` without setting controller or checking for long controller action.
 ### Deprecated
 - Deprecated `Methods` in favor of `LoggingMethods`.
 
-## [2.6.1] - Unreleased
+## [2.6.1] - 2020-10-14
 ### Fixed
 - Fixed honeybadger_context_data to always merge `current_context_for_thread`, even if `log_context:` is passed as `nil`.
 
@@ -52,6 +56,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 ### Changed
 - No longer depends on hobo_support. Uses invoca-utils 0.3 instead.
 
+[2.8.0]: https://github.com/Invoca/exception_handling/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/Invoca/exception_handling/compare/v2.6.1...v2.7.0
 [2.6.1]: https://github.com/Invoca/exception_handling/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/Invoca/exception_handling/compare/v2.5.0...v2.6.0

data/Gemfile

@@ -6,10 +6,10 @@ gemspec
 
 gem 'appraisal', '~> 2.2'
 gem 'honeybadger', '3.3.1-1', git: 'git@github.com:Invoca/honeybadger-ruby', ref: 'bb5f2b8a86e4147c38a6270d39ad610fab4dd5e6'
-gem "minitest"
-gem "minitest-reporters"
 gem 'pry'
+gem 'pry-byebug'
 gem 'rake'
-gem 'rr'
+gem 'rspec'
+gem 'rspec_junit_formatter'
 gem 'rubocop'
-gem 'shoulda'
+gem 'test-unit'

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    exception_handling (2.7.0.pre.1)
+    exception_handling (2.8.1.pre.1)
       actionmailer (>= 4.2, < 7.0)
       actionpack (>= 4.2, < 7.0)
       activesupport (>= 4.2, < 7.0)
@@ -19,56 +19,58 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      globalid (>= 0.3.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
+      globalid (>= 0.3.6)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.5.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.0)
-    builder (3.2.3)
+    builder (3.2.4)
+    byebug (11.1.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     contextual_logger (0.11.0)
       activesupport
       json
     crass (1.0.6)
-    erubis (2.7.0)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     eventmachine (1.2.7)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     invoca-utils (0.4.1)
     jaro_winkler (1.5.3)
     json (2.3.1)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -76,34 +78,44 @@ GEM
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    minitest-reporters (1.0.20)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
+    minitest (5.14.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
+    power_assert (1.2.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (1.6.13)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    pry-byebug (3.8.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rainbow (3.0.0)
     rake (13.0.1)
-    rr (1.2.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -112,17 +124,14 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    shoulda (3.6.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 3.0)
-    shoulda-context (1.2.2)
-    shoulda-matchers (3.1.3)
-      activesupport (>= 4.0.0)
+    test-unit (3.3.6)
+      power_assert
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -131,13 +140,13 @@ DEPENDENCIES
   appraisal (~> 2.2)
   exception_handling!
   honeybadger (= 3.3.1.pre.1)!
-  minitest
-  minitest-reporters
   pry
+  pry-byebug
   rake
-  rr
+  rspec
+  rspec_junit_formatter
   rubocop
-  shoulda
+  test-unit
 
 BUNDLED WITH
    1.17.3

data/Rakefile

@@ -1,14 +1,15 @@
 #!/usr/bin/env rake
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
 require 'rake/testtask'
+require "bundler/gem_tasks"
 
-require_relative 'test/rake_test_warning_false'
-
-task default: :test
+require_relative 'spec/rake_test_warning_false'
 
-Rake::TestTask.new do |t|
-  t.pattern = "test/**/*_test.rb"
+desc "run rspec unit tests"
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec)
 end
 
+task default: :rspec

data/gemfiles/rails_4.gemfile

@@ -4,13 +4,13 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "honeybadger", "3.3.1-1", git: "git@github.com:Invoca/honeybadger-ruby", ref: "bb5f2b8a86e4147c38a6270d39ad610fab4dd5e6"
-gem "minitest"
-gem "minitest-reporters"
 gem "pry"
+gem "pry-byebug"
 gem "rake"
-gem "rr"
+gem "rspec"
+gem "rspec_junit_formatter"
 gem "rubocop"
-gem "shoulda"
+gem "test-unit"
 gem "actionmailer", "~> 4.2"
 gem "actionpack", "~> 4.2"
 gem "activesupport", "~> 4.2"

data/gemfiles/rails_5.gemfile

@@ -4,13 +4,13 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "honeybadger", "3.3.1-1", git: "git@github.com:Invoca/honeybadger-ruby", ref: "bb5f2b8a86e4147c38a6270d39ad610fab4dd5e6"
-gem "minitest"
-gem "minitest-reporters"
 gem "pry"
+gem "pry-byebug"
 gem "rake"
-gem "rr"
+gem "rspec"
+gem "rspec_junit_formatter"
 gem "rubocop"
-gem "shoulda"
+gem "test-unit"
 gem "actionmailer", "~> 5.2"
 gem "actionpack", "~> 5.2"
 gem "activesupport", "~> 5.2"

data/gemfiles/rails_6.gemfile

@@ -4,13 +4,13 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "honeybadger", "3.3.1-1", git: "git@github.com:Invoca/honeybadger-ruby", ref: "bb5f2b8a86e4147c38a6270d39ad610fab4dd5e6"
-gem "minitest"
-gem "minitest-reporters"
 gem "pry"
+gem "pry-byebug"
 gem "rake"
-gem "rr"
+gem "rspec"
+gem "rspec_junit_formatter"
 gem "rubocop"
-gem "shoulda"
+gem "test-unit"
 gem "actionmailer", "~> 6.0"
 gem "actionpack", "~> 6.0"
 gem "activesupport", "~> 6.0"

data/lib/exception_handling.rb

@@ -348,6 +348,9 @@ module ExceptionHandling # never included
       nil
     end
 
+    deprecate :escalate_to_production_support, :escalate_error, :escalate_warning, :ensure_escalation,
+      deprecator: ActiveSupport::Deprecation.new('3.0', 'ExceptionHandling')
+
     def alert_warning(exception_or_string, alert_name, exception_context, log_context)
       ex = make_exception(exception_or_string)
       log_error(ex, exception_context, **log_context)

data/lib/exception_handling/exception_info.rb

@@ -82,9 +82,10 @@ module ExceptionHandling
     end
 
     def controller_name
-      @controller_name ||= if @controller
-                             @controller.request.parameters.with_indifferent_access[:controller]
-                           end.to_s
+      @controller_name ||= (
+        @merged_log_context[:honeybadger_grouping] ||
+          (@controller && @controller.request.parameters.with_indifferent_access[:controller])
+      ).to_s
     end
 
     private

data/lib/exception_handling/log_stub_error.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 #
-# Used by functional tests to track exceptions.
+# Test Helper that supports Minitest::Test and Test::Unit
+# Used by tests in the consumers of this gem to track exceptions.
 #
 
 module LogErrorStub