rollbar 3.3.0 → 3.4.2

data/lib/rollbar/encoding.rb

@@ -5,13 +5,8 @@ module Rollbar
     end
 
     def self.setup
-      if String.instance_methods.include?(:encode)
-        require 'rollbar/encoding/encoder'
-        self.encoding_class = Rollbar::Encoding::Encoder
-      else
-        require 'rollbar/encoding/legacy_encoder'
-        self.encoding_class = Rollbar::Encoding::LegacyEncoder
-      end
+      require 'rollbar/encoding/encoder'
+      self.encoding_class = Rollbar::Encoding::Encoder
     end
 
     def self.encode(object)

data/lib/rollbar/item/locals.rb

@@ -32,6 +32,8 @@ module Rollbar
         end
 
         def locals_for(frame)
+          return {} unless frame
+
           {}.tap do |hash|
             frame.local_variables.map do |var|
               hash[var] = prepare_value(frame.local_variable_get(var))

data/lib/rollbar/middleware/js/json_value.rb

@@ -1,8 +1,12 @@
-# Allows a Ruby String to be used to create native Javascript objects
-# when calling JSON#generate.
+# Allows a Ruby String to be used to pass native Javascript objects/functions
+# when calling JSON#generate with a Rollbar::JSON::JsOptionsState instance.
 #
 # Example:
-# JSON.generate({ foo: Rollbar::JSON::Value.new('function(){ alert("bar") }') })
+# JSON.generate(
+#   { foo: Rollbar::JSON::Value.new('function(){ alert("bar") }') },
+#   Rollbar::JSON::JsOptionsState.new
+# )
+#
 # => '{"foo":function(){ alert(\"bar\") }}'
 #
 # MUST use the Ruby JSON encoder, as in the example. The ActiveSupport encoder,
@@ -11,6 +15,8 @@
 #
 module Rollbar
   module JSON
+    class JsOptionsState < ::JSON::State; end
+
     class Value # :nodoc:
       attr_accessor :value
 
@@ -18,8 +24,12 @@ module Rollbar
         @value = value
       end
 
-      def to_json(*_args)
-        value
+      def to_json(opts = {})
+        # Return the raw value if this is from the js middleware
+        return value if opts.class == Rollbar::JSON::JsOptionsState
+
+        # Otherwise convert to a string
+        %Q["#{value}"]
       end
     end
   end

data/lib/rollbar/middleware/js.rb

@@ -134,6 +134,7 @@ module Rollbar
 
       def config_js_tag(env)
         require 'json'
+        require 'rollbar/middleware/js/json_value'
 
         js_config = Rollbar::Util.deep_copy(config[:options])
 
@@ -141,7 +142,7 @@ module Rollbar
 
         # MUST use the Ruby JSON encoder (JSON#generate).
         # See lib/rollbar/middleware/js/json_value
-        json = ::JSON.generate(js_config)
+        json = ::JSON.generate(js_config, Rollbar::JSON::JsOptionsState.new)
 
         script_tag("var _rollbarConfig = #{json};", env)
       end
@@ -166,10 +167,9 @@ module Rollbar
       def script_tag(content, env)
         nonce = rails5_nonce(env) || secure_headers_nonce(env)
         script_tag_content = if nonce
-                               "\n<script type=\"text/javascript\" " \
-                                 "nonce=\"#{nonce}\">#{content}</script>"
+                               "\n<script nonce=\"#{nonce}\">#{content}</script>"
                              else
-                               "\n<script type=\"text/javascript\">#{content}</script>"
+                               "\n<script>#{content}</script>"
                              end
 
         html_safe_if_needed(script_tag_content)

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/notifier/trace_with_bindings.rb

@@ -55,13 +55,21 @@ module Rollbar
 
       def frame(trace)
         {
-          :binding => trace.binding,
+          :binding => binding(trace),
           :defined_class => trace.defined_class,
           :method_id => trace.method_id,
           :path => trace.path,
           :lineno => trace.lineno
         }
       end
+
+      def binding(trace)
+        trace.binding
+      rescue StandardError
+        # Ruby internals will raise if we're on a Fiber,
+        # since bindings aren't valid on Fibers.
+        nil
+      end
     end
   end
 end

data/lib/rollbar/plugins/active_job.rb

@@ -27,5 +27,9 @@ if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
       ActionMailer::DeliveryJob.send(:include,
                                      Rollbar::ActiveJob)
     end
+    # Rails >= 6.0
+    if defined?(ActionMailer::MailDeliveryJob)
+      ActionMailer::MailDeliveryJob.send(:include, Rollbar::ActiveJob)
+    end
   end
 end

data/lib/rollbar/plugins/sidekiq/plugin.rb

@@ -50,7 +50,8 @@ module Rollbar
     def self.scrub_params(params)
       options = {
         :params => params,
-        :config => Rollbar.configuration.scrub_fields
+        :config => Rollbar.configuration.scrub_fields,
+        :whitelist => Rollbar.configuration.scrub_whitelist
       }
 
       Rollbar::Scrubbers::Params.call(options)

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/request_data_extractor.rb

@@ -214,7 +214,7 @@ module Rollbar
       return {} unless correct_method
       return {} unless json_request?(rack_req)
 
-      raw_body = rack_req.body.read
+      raw_body = read_raw_body(rack_req.body)
       begin
         Rollbar::JSON.load(raw_body)
       rescue StandardError
@@ -222,8 +222,15 @@ module Rollbar
       end
     rescue StandardError
       {}
-    ensure
-      rack_req.body.rewind
+    end
+
+    def read_raw_body(body)
+      return {} unless body.respond_to?(:rewind)
+
+      body.rewind
+      raw_body = body.read
+      body.rewind
+      raw_body
     end
 
     def json_request?(rack_req)

data/lib/rollbar/version.rb

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

data/rollbar.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
 
   gem.authors       = ['Rollbar, Inc.']
   gem.email         = ['support@rollbar.com']
-  gem.description   = 'Easy and powerful exception tracking for Ruby'
+  gem.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 in your code, helping you identify and fix issues more quickly. Rollbar's intuitive interface and advanced error tracking features make it the perfect tool for ensuring the stability and reliability of your Ruby applications."
   gem.executables   = ['rollbar-rails-runner']
   gem.summary       = 'Reports exceptions to Rollbar'
   gem.homepage      = 'https://rollbar.com'

metadata

@@ -1,16 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Rollbar, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies: []
-description: Easy and powerful exception tracking for Ruby
+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
+  in your code, helping you identify and fix issues more quickly. Rollbar's intuitive
+  interface and advanced error tracking features make it the perfect tool for ensuring
+  the stability and reliability of your Ruby applications.
 email:
 - support@rollbar.com
 executables:
@@ -37,17 +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
@@ -67,7 +67,6 @@ files:
 - lib/rollbar/deploy.rb
 - lib/rollbar/encoding.rb
 - lib/rollbar/encoding/encoder.rb
-- lib/rollbar/encoding/legacy_encoder.rb
 - lib/rollbar/exception_reporter.rb
 - lib/rollbar/exceptions.rb
 - lib/rollbar/item.rb
@@ -146,7 +145,7 @@ metadata:
   bug_tracker_uri: https://github.com/rollbar/rollbar-gem/issues
   homepage_uri: https://rollbar.com/
   documentation_uri: https://docs.rollbar.com/docs/ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Reports exceptions to Rollbar
 test_files: []

data/gemfiles/rails30.gemfile

@@ -1,51 +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 'codacy-coverage'
-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,51 +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 'codacy-coverage'
-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,53 +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 'codacy-coverage'
-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,53 +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 'codacy-coverage'
-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,49 +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 'codacy-coverage'
-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,50 +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 'codacy-coverage'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'

data/lib/rollbar/encoding/legacy_encoder.rb

@@ -1,20 +0,0 @@
-require 'iconv'
-
-module Rollbar
-  module Encoding
-    class LegacyEncoder
-      attr_accessor :object
-
-      def initialize(object)
-        @object = object
-      end
-
-      def encode
-        value = object.to_s
-        encoded_value = ::Iconv.conv('UTF-8//IGNORE', 'UTF-8', value)
-
-        object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
-      end
-    end
-  end
-end