rollbar 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b3c3bbbb1f542faf2c67fff212c6a4eb7f0c4986c827fa14b8a64f9c98046c
-  data.tar.gz: 101b72445564b0b8f656f9194ff9140d0551bc556b5444bf69ef4f8c8be67d61
+  metadata.gz: 8fccee4d8f496c152bca4e1bd0cd3c71831dedda32230fbd5815091d498bf60c
+  data.tar.gz: 7a46b0396b809d8837a0891821f3b0dfd348daad1b6d39a2691afd519901e380
 SHA512:
-  metadata.gz: 7f96379fee61b2b5dcef9f4f4c853c7602fba3ab51ec8e5ae8c95d1d034134e268cb2861842c68877b421c081979dec9b509d6b817e72bac26846d294f1b47f0
-  data.tar.gz: 7d0bd5d1c9ce8f0c0c1f49a1be17f99caa43bf8c15daab6b0674b423f5bdefe03cbc091b56657959a4575c0b1e64988e9f8155a1a8046e6724bb89c2e6fb8917
+  metadata.gz: dac247751b7b78289210aa82bc4508fe31483e758d47f345b9db01811553a745b6a508bbd93a11e10a5349dd8441c7b118d884b421ccb5985b99edd5f2814805
+  data.tar.gz: aa7197048fa8a4eae1080fa6ac794cb8ab301862893488636012113f119b59023c38bf395d1f2d45abacfee3d7ff81e96f7be2896614a8f4835340f60594a456

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ruby-version: [2.5.3, 2.6.0, 2.6.6, 2.7.2]
@@ -19,38 +19,16 @@ jobs:
           - gemfiles/rails60.gemfile
           - gemfiles/rails61.gemfile
         include:
+          - gemfile: gemfiles/rails71.gemfile
+            ruby-version: 3.2.2
+          - gemfile: gemfiles/rails71.gemfile
+            ruby-version: 3.1.1
           - gemfile: gemfiles/rails70.gemfile
             ruby-version: 3.1.1
           - gemfile: gemfiles/rails70.gemfile
             ruby-version: 3.0.3
           - gemfile: gemfiles/rails61.gemfile
             ruby-version: 3.0.3
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.4.5
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails31.gemfile
-            ruby-version: 2.0.0
-          - gemfile: gemfiles/rails30.gemfile
-            ruby-version: 2.0.0
 
     steps:
       - uses: actions/checkout@v2
@@ -68,21 +46,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
-      - name: Setup Ruby 2.0.0
-        if: ${{ matrix.ruby-version == '2.0.0' }}
-        timeout-minutes: 15
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libssl1.0-dev
-          wget http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p648.tar.gz
-          tar xvfz ruby-2.0.0-p648.tar.gz
-          cd ruby-2.0.0-p648
-          ./configure && make && sudo make install-nodoc
-
-      - name: Ruby 2.0.0, install bundler
-        if: ${{ matrix.ruby-version == '2.0.0' }}
-        run: sudo gem install bundler -v 1.17.3
-
       - name: Rails 4.2 ensure bundler version
         if: ${{ matrix.gemfile == 'gemfiles/rails42.gemfile' }}
         run: |

data/Gemfile

@@ -1,6 +1,6 @@
 # This Gemfile is compatible with Ruby 2.5.0 or greater. To test with
 # earlier Rubies, use the appropriate Gemfile from the ./gemfiles/ dir.
-ruby '>= 2.5.0'
+ruby '3.2.2'
 
 source 'https://rubygems.org'
 
@@ -13,7 +13,7 @@ ENV['CURRENT_GEMFILE'] ||= __FILE__
 
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
 
-GEMFILE_RAILS_VERSION = '~> 6.1.5'.freeze
+GEMFILE_RAILS_VERSION = '~> 7.1.0'.freeze
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'appraisal'
 gem 'jruby-openssl', :platform => :jruby
@@ -21,8 +21,10 @@ gem 'rails', GEMFILE_RAILS_VERSION
 gem 'rake'
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'rspec-rails', '~> 3.4'
-else
+elsif GEMFILE_RAILS_VERSION < '7.0'
   gem 'rspec-rails', '~> 4.0.2'
+else
+  gem 'rspec-rails', '~> 6.0.3'
 end
 
 if GEMFILE_RAILS_VERSION < '6.0'

data/docs/configuration.md

@@ -59,10 +59,10 @@ end
 
 ### default_logger
 
-**Default** `Logger.new(STDERR)`
+**Default** `lambda { Logger.new(STDERR) }`
 
 What logger to use for printing debugging and informational messages during
-operation.
+operation. Expects a callable object that returns a logger interface.
 
 ### logger_level
 

data/gemfiles/rails70.gemfile

@@ -6,10 +6,10 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == '
 
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '~> 7.0.2.3'
+gem 'rails', '~> 7.0.8'
 gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 
-gem 'rspec-rails', '~> 4.0.2'
+gem 'rspec-rails', '~> 6.0.3'
 
 gem 'rake'
 

data/gemfiles/rails71.gemfile

@@ -0,0 +1,52 @@
+require 'rubygems/version'
+
+source 'https://rubygems.org'
+
+is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
+
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gem 'jruby-openssl', :platform => :jruby
+gem 'rails', '~> 7.1.0'
+gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
+
+gem 'rspec-rails', '~> 6.0.3'
+
+gem 'rake'
+
+gem 'sidekiq', '>= 6.4.0'
+
+platforms :rbx do
+  gem 'minitest'
+  gem 'racc'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl', '~> 2.0' if RUBY_VERSION.start_with?('2')
+end
+
+gem 'sucker_punch', '~> 2.0'
+
+# We need last sinatra that uses rack 2.x and ruby 2.5.x
+gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
+
+gem 'database_cleaner'
+gem 'delayed_job', '4.1.10', :require => false
+gem 'generator_spec'
+gem 'redis', '<= 4.8.0'
+gem 'resque'
+gem 'secure_headers', '~> 6.3.2', :require => false
+gem 'simplecov'
+
+unless is_jruby
+  # JRuby doesn't support fork, which is required for this test helper.
+  gem 'rspec-command'
+end
+
+gem 'mime-types'
+
+gem 'webmock', :require => false
+
+gem 'aws-sdk-sqs'
+gem 'shoryuken'
+
+gem 'capistrano', :require => false
+
+gemspec :path => '../'

data/lib/rollbar/middleware/rails/show_exceptions.rb

@@ -4,7 +4,7 @@ module Rollbar
       module ShowExceptions
         include ExceptionReporter
 
-        def render_exception_with_rollbar(env, exception)
+        def render_exception_with_rollbar(env, exception, wrapper = nil)
           key = 'action_dispatch.show_detailed_exceptions'
 
           if exception.is_a?(ActionController::RoutingError) && env[key]
@@ -15,7 +15,12 @@ module Rollbar
             end
           end
 
-          render_exception_without_rollbar(env, exception)
+          # Rails 7.1 changes the method signature for render_exception.
+          if self.class.instance_method(:render_exception_without_rollbar).arity == 2
+            render_exception_without_rollbar(env, exception)
+          else
+            render_exception_without_rollbar(env, exception, wrapper)
+          end
         end
 
         def call_with_rollbar(env)

data/lib/rollbar/plugins/sidekiq.rb

@@ -12,7 +12,7 @@ Rollbar.plugins.define('sidekiq >= 3') do
         chain.add Rollbar::Sidekiq::ResetScope
       end
 
-      config.error_handlers << proc do |e, context|
+      config.error_handlers << proc do |e, context, _sidekiq_config = nil|
         Rollbar::Sidekiq.handle_exception(context, e)
       end
     end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '3.4.0'.freeze
+  VERSION = '3.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Track and debug errors in your Ruby applications with ease using Rollbar.
   With this gem, you can easily monitor and report on exceptions and other errors
@@ -41,18 +41,13 @@ files:
 - data/rollbar.snippet.js
 - docs/configuration.md
 - docs/plugins.md
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.erb
 - lib/rails/rollbar_runner.rb
@@ -165,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Reports exceptions to Rollbar

data/gemfiles/rails30.gemfile

@@ -1,50 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'hitimes', '< 1.2.2'
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.0.20'
-gem 'rake', '< 11'
-gem 'rspec-rails', '>= 2.14.0'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'delayed_job', :require => false
-gem 'genspec', '>= 0.2.8'
-gem 'girl_friday', '>= 0.11.1'
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails31.gemfile

@@ -1,50 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.1.12'
-gem 'rake', '< 11'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch'
-
-gem 'database_cleaner'
-gem 'delayed_job', :require => false
-gem 'generator_spec'
-gem 'girl_friday'
-gem 'rack-cache', '<= 1.9.0'
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails32.gemfile

@@ -1,52 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.2.22'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-# Please see https://github.com/rspec/rspec-rails/issues/1273
-gem 'test-unit'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -1,52 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.0.13'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-# Please see https://github.com/rspec/rspec-rails/issues/1273
-gem 'test-unit'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'json', '~> 2.0'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'resque'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'

data/gemfiles/rails41.gemfile

@@ -1,48 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.1.16'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-end
-
-gem 'capistrano', :require => false
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'resque'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'

data/gemfiles/rails42.gemfile

@@ -1,49 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.2.11'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-end
-
-gem 'json', '1.8.6' if RUBY_VERSION < '2.0.0'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-gem 'capistrano', :require => false
-gem 'shoryuken'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'delayed_job', :require => false
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'redis', '<= 3.3.5'
-gem 'resque'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
-
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'