exception_handling 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a517039da6b4d97a8f0715dbb7a3c989c7c63099a744c1bfe5e55d77b119948
-  data.tar.gz: 72818ae79a8b5bad38af3e0f49e076158322a990210c4b416e57d55c33839c44
+  metadata.gz: 9706778bbece312eb7aa676434e2b540161c0d855990d6cb76dc0eb29f584b69
+  data.tar.gz: 559115f2f7ce37041563104d0addcb4d5c10d35e02f6d506f28f21c1695a2ed1
 SHA512:
-  metadata.gz: 60015e9f53ad1a460fc735a7a78c1293cd165bebb0c7a9d6eba68c73fb6ab33dc84edf5d5e663bab6d553a9adc44ddf9f989a01352f102cd44a7eddb10a41e57
-  data.tar.gz: 3acf7c9c0abce4c87288ddc6f6a1766c6cc98a1ee5965b467888a4838d98e5f9d0b40e92f45255279d42b4e56a5687e6af08bd1dd356a7fd21ec1aba28bf16e6
+  metadata.gz: a1cdbd8aa1c88bf4d3eed2f5b5aeb41c6508849b8edf370c008436d5bfa667638a0e89c239d2621fb8e3454a10b47a7cea4a96fb0ed879a51b862f2aa96c663f
+  data.tar.gz: b67f31bd291331e34227b4a103b1acd6bea70b757bbf75c0194cc4cb7bbc9c266bb300afc8650e135145f27eedd7d7113cb268f58a7a162966dfba52d73387ab

data/.github/workflows/pipeline.yml

@@ -8,12 +8,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6]
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1]
         gemfile:
         - Gemfile
-        - gemfiles/rails_4.gemfile
         - gemfiles/rails_5.gemfile
         - gemfiles/rails_6.gemfile
+        exclude:
+        - gemfile: Gemfile
+          ruby: 2.5
+        - gemfile: gemfiles/rails_5.gemfile
+          ruby: '3.0'
+        - gemfile: gemfiles/rails_5.gemfile
+          ruby: 3.1
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
@@ -21,7 +27,7 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 1.17.3
+        bundler: 2.2.29
         bundler-cache: true
     - name: Unit tests
       run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.5

data/Appraisals

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-appraise "rails-4" do
-  gem 'actionmailer',  '~> 4.2'
-  gem 'actionpack',    '~> 4.2'
-  gem 'activesupport', '~> 4.2'
-end
-
 appraise "rails-5" do
   gem 'actionmailer',  '~> 5.2'
   gem 'actionpack',    '~> 5.2'

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.11.0] - 2022-03-29
+### Added
+- Added support for rails 2.7 and 3+
+
+### Removed
+- Removed support for Rails 4
+
 ## [2.10.0] - 2022-03-09
 ### Removed
 - Remove custom object inspection
@@ -57,7 +64,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 - In `ExceptionHandling.logger=`, implicit `logger.extend ContextualLogger::LoggerMixin` is now deprecated.
   This will be removed in version 3.0 and an `ArgumentError` will be raised if the logger
   doesn't have that mixin. Instead of this implicit behavior, you should explicitly either `extend`
-  your logger instance or `include` that mixin into your `Logger` class. 
+  your logger instance or `include` that mixin into your `Logger` class.
 
 ## [2.4.2] - 2020-05-11
 ### Added

data/Gemfile.lock

@@ -1,41 +1,43 @@
 PATH
   remote: .
   specs:
-    exception_handling (2.10.0)
-      actionmailer (>= 4.2, < 7.0)
-      actionpack (>= 4.2, < 7.0)
-      activesupport (>= 4.2, < 7.0)
+    exception_handling (2.11.0)
+      actionmailer (>= 5.2, < 7.0)
+      actionpack (>= 5.2, < 7.0)
+      activesupport (>= 5.2, < 7.0)
       contextual_logger (~> 0.7)
       escalate (~> 0.3)
       eventmachine (~> 1.0)
       invoca-utils (~> 0.3)
+      net-smtp
+      psych (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      actionview (= 6.0.3.5)
-      activejob (= 6.0.3.5)
+    actionmailer (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.5)
-      actionview (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionpack (6.0.4.7)
+      actionview (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       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.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.0.4.7)
+      activesupport (= 6.0.4.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    activejob (6.0.4.7)
+      activesupport (= 6.0.4.7)
       globalid (>= 0.3.6)
-    activesupport (6.0.3.5)
+    activesupport (6.0.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -49,34 +51,43 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     contextual_logger (0.11.0)
       activesupport
       json
     crass (1.0.6)
     diff-lcs (1.4.4)
+    digest (3.1.0)
     erubi (1.10.0)
     escalate (0.3.0)
     eventmachine (1.2.7)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     honeybadger (4.11.0)
-    i18n (1.8.9)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     invoca-utils (0.4.1)
+    io-wait (0.2.1)
     jaro_winkler (1.5.3)
     json (2.6.1)
-    loofah (2.9.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.4)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.17.0)
     parser (2.6.3.0)
@@ -88,14 +99,15 @@ GEM
     pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    racc (1.5.2)
+    psych (3.3.2)
+    racc (1.6.0)
     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)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rainbow (3.0.0)
     rake (13.0.1)
@@ -126,10 +138,11 @@ GEM
       power_assert
     thor (1.0.1)
     thread_safe (0.3.6)
+    timeout (0.2.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -149,4 +162,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.17.3
+   2.2.29

data/exception_handling.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
     "allowed_push_host" => "https://rubygems.org"
   }
 
-  spec.add_dependency 'actionmailer',      '>= 4.2', '< 7.0'
-  spec.add_dependency 'actionpack',        '>= 4.2', '< 7.0'
-  spec.add_dependency 'activesupport',     '>= 4.2', '< 7.0'
+  spec.add_dependency 'actionmailer',      '>= 5.2', '< 7.0'
+  spec.add_dependency 'actionpack',        '>= 5.2', '< 7.0'
+  spec.add_dependency 'activesupport',     '>= 5.2', '< 7.0'
   spec.add_dependency 'contextual_logger', '~> 0.7'
   spec.add_dependency 'escalate',          '~> 0.3'
   spec.add_dependency 'eventmachine',      '~> 1.0'
   spec.add_dependency 'invoca-utils',      '~> 0.3'
+  spec.add_dependency 'psych',             '~> 3.0'
+  spec.add_dependency 'net-smtp'
 end

data/gemfiles/rails_5.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "actionmailer", "~> 5.2"
 gem "activesupport", "~> 5.2"
 gem "appraisal", "~> 2.2"
-gem "honeybadger"
+gem "honeybadger", "~> 4.11"
 gem "pry"
 gem "pry-byebug"
 gem "rake"

data/gemfiles/rails_6.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "actionmailer", "~> 6.0"
 gem "activesupport", "~> 6.0"
 gem "appraisal", "~> 2.2"
-gem "honeybadger"
+gem "honeybadger", "~> 4.11"
 gem "pry"
 gem "pry-byebug"
 gem "rake"

data/lib/exception_handling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExceptionHandling
-  VERSION = '2.10.0'
+  VERSION = '2.11.0'
 end

data/lib/exception_handling.rb

@@ -288,7 +288,7 @@ module ExceptionHandling # never included
     #
     # Expects passed in hash to only include keys which be directly set on the Honeybadger config
     #
-    def enable_honeybadger(config = {})
+    def enable_honeybadger(**config)
       Bundler.require(:honeybadger)
       Honeybadger.configure do |config_klass|
         config.each do |k, v|
@@ -297,28 +297,28 @@ module ExceptionHandling # never included
       end
     end
 
-    def log_warning(message, log_context = {})
+    def log_warning(message, **log_context)
       warning = Warning.new(message)
       warning.set_backtrace([])
       log_error(warning, **log_context)
     end
 
-    def log_info(message, log_context = {})
+    def log_info(message, **log_context)
       ExceptionHandling.logger.info(message, log_context)
     end
 
-    def log_debug(message, log_context = {})
+    def log_debug(message, **log_context)
       ExceptionHandling.logger.debug(message, log_context)
     end
 
-    def ensure_safe(exception_context = "", log_context = {})
+    def ensure_safe(exception_context = "", **log_context)
       yield
     rescue => ex
       log_error(ex, exception_context, **log_context)
       nil
     end
 
-    def ensure_completely_safe(exception_context = "", log_context = {})
+    def ensure_completely_safe(exception_context = "", **log_context)
       yield
     rescue SystemExit, SystemStackError, NoMemoryError, SecurityError, SignalException
       raise
@@ -333,29 +333,29 @@ module ExceptionHandling # never included
       escalate(email_subject, ex, last_exception_timestamp, production_support_recipients)
     end
 
-    def escalate_error(exception_or_string, email_subject, custom_recipients = nil, log_context = {})
+    def escalate_error(exception_or_string, email_subject, custom_recipients = nil, **log_context)
       ex = make_exception(exception_or_string)
       log_error(ex, **log_context)
       escalate(email_subject, ex, last_exception_timestamp, custom_recipients)
     end
 
-    def escalate_warning(message, email_subject, custom_recipients = nil, log_context = {})
+    def escalate_warning(message, email_subject, custom_recipients = nil, **log_context)
       ex = Warning.new(message)
       log_error(ex, **log_context)
       escalate(email_subject, ex, last_exception_timestamp, custom_recipients)
     end
 
-    def ensure_escalation(email_subject, custom_recipients = nil, log_context = {})
+    def ensure_escalation(email_subject, custom_recipients = nil, **log_context)
       yield
     rescue => ex
-      escalate_error(ex, email_subject, custom_recipients, log_context)
+      escalate_error(ex, email_subject, custom_recipients, **log_context)
       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)
+    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)
       begin
@@ -365,10 +365,10 @@ module ExceptionHandling # never included
       end
     end
 
-    def ensure_alert(alert_name, exception_context, log_context = {})
+    def ensure_alert(alert_name, exception_context, **log_context)
       yield
     rescue => ex
-      alert_warning(ex, alert_name, exception_context, log_context)
+      alert_warning(ex, alert_name, exception_context, **log_context)
       nil
     end
 
@@ -385,7 +385,7 @@ module ExceptionHandling # never included
       result
     end
 
-    def log_periodically(exception_key, interval, message, log_context = {})
+    def log_periodically(exception_key, interval, message, **log_context)
       self.periodic_exception_intervals ||= {}
       last_logged = self.periodic_exception_intervals[exception_key]
       if !last_logged || ((last_logged + interval) < Time.now)

data/spec/unit/exception_handling_spec.rb

@@ -158,7 +158,12 @@ describe ExceptionHandling do
 
     context "#log_warning" do
       it "have empty array as a backtrace" do
-        expect(ExceptionHandling).to receive(:log_error).with((ExceptionHandling::Warning), anything) do |error|
+        expected_args = if RUBY_VERSION < '2.7'
+                          [ExceptionHandling::Warning, anything]
+                        else
+                          [ExceptionHandling::Warning]
+                        end
+        expect(ExceptionHandling).to receive(:log_error).with(*expected_args) do |error|
           expect(error.backtrace).to eq([])
         end
         ExceptionHandling.log_warning('Now with empty array as a backtrace!')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exception_handling
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Invoca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -126,6 +126,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Exception handling logger/emailer
 email:
 - development@invoca.com
@@ -147,7 +175,6 @@ files:
 - Rakefile
 - config/exception_filters.yml
 - exception_handling.gemspec
-- gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
 - lib/exception_handling.rb
@@ -199,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Invoca's exception handling logger/emailer layer, based on exception_notifier.

data/gemfiles/rails_4.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionmailer", "~> 4.2"
-gem "activesupport", "~> 4.2"
-gem "appraisal", "~> 2.2"
-gem "honeybadger"
-gem "pry"
-gem "pry-byebug"
-gem "rake"
-gem "rspec"
-gem "rspec_junit_formatter"
-gem "rubocop"
-gem "test-unit"
-gem "actionpack", "~> 4.2"
-
-gemspec path: "../"