rollbar 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88b1bd8659724cc0d0351d4efb1a458ec8af8e466ddaf6a453e6acaa6da6bd9
-  data.tar.gz: 7961e62c55a4f147644cd203ca279b188a7ec3061f15b7ce88943591ccf87e07
+  metadata.gz: 898aba48030cbc9188c24d90690293f5059d06d21ea0761554f48b9ceb807874
+  data.tar.gz: 37c571e1b393777a03d11079c443a01b561391652b6a7e5fb1ed6064f0a69754
 SHA512:
-  metadata.gz: fce360ce571930f495008f786bbc41ed649a7ee9d0e1e23e81a5e050b9310dbf4fc50952f62236d23d5a27f8057efc4c030a321207357423526cffa38d07355c
-  data.tar.gz: 759e0e90848534ea09cbfd6ffe866f2d75e314fc56e2bdd7dbd6a48a428691ae5c42d2ec5a158638ba74148456674b01d5450f5cea1198e3148bc6dd69ce545a
+  metadata.gz: 92de62decca92c82e7db0f1c0d4ef525141e0e9e64418fa465a671c5571206312dcd5ed675b7c1e6a9c40cf714c684eabdfdd5648efd30d39ea0f9c073206dbb
+  data.tar.gz: cd5d1bd81a5514686ad7ae72cc2c1aca30a09580fb57dbbb518ec37353ad94a8719594b6fd53d1620bd742fab6e96772a3cd8106d98510f3fed249de838f5c01

data/.github/pull_request_template.md

@@ -1,14 +1,23 @@
 ## Description of the change
 
-> Description here
+> Please include a summary of the change and which issues are fixed.
+> Please also include relevant motivation and context.
+
 ## Type of change
+
 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Maintenance
+- [ ] New release
 
 ## Related issues
 
-> Fix [#1]() 
+> Shortcut stories and GitHub issues (delete irrelevant)
+
+- Fix [SC-]
+- Fix #1
+
 ## Checklists
 
 ### Development
@@ -17,9 +26,9 @@
 - [ ] The code changed/added as part of this pull request has been covered with tests
 - [ ] All tests related to the changed code pass in development
 
-### Code review 
+### Code review
 
-- [ ]  This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
-- [ ] "Ready for review" label attached to the PR and reviewers mentioned in a comment
+- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
+- [ ] "Ready for review" label attached to the PR and reviewers assigned
+- [ ] Issue from task tracker has a link to this pull request
 - [ ] Changes have been reviewed by at least one other engineer
-- [ ] Issue from task tracker has a link to this pull request 

data/.github/workflows/ci.yml

@@ -11,42 +11,26 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        ruby-version: [2.2.10, 2.3.0, 2.3.8, 2.4.5, 2.5.3, 2.6.0, 2.6.6, 2.7.2]
+        ruby-version: [2.5.3, 2.6.0, 2.6.6, 2.7.2]
         gemfile:
-          - gemfiles/rails42.gemfile
           - gemfiles/rails50.gemfile
           - gemfiles/rails51.gemfile
           - gemfiles/rails52.gemfile
           - gemfiles/rails60.gemfile
           - gemfiles/rails61.gemfile
-        exclude:
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.6.0
+        include:
+          - 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.6.6
+            ruby-version: 2.4.5
           - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails52.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails60.gemfile
             ruby-version: 2.3.8
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.4.5
-          - gemfile: gemfiles/rails61.gemfile
+          - gemfile: gemfiles/rails42.gemfile
             ruby-version: 2.2.10
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.4.5
-        include:
           - gemfile: gemfiles/rails41.gemfile
             ruby-version: 2.3.0
           - gemfile: gemfiles/rails41.gemfile
@@ -67,8 +51,6 @@ jobs:
             ruby-version: 2.0.0
           - gemfile: gemfiles/rails30.gemfile
             ruby-version: 2.0.0
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 3.0.0
 
     steps:
       - uses: actions/checkout@v2
@@ -115,4 +97,8 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Rspec
-        run: bundle exec rspec
+        run: |
+          export BUNDLE_GEMFILE=${{ matrix.gemfile }}
+          bundle config path vendor/bundle
+          bundle config gemfile ${{ matrix.gemfile }}
+          bundle exec rspec

data/.rubocop.yml

@@ -46,6 +46,9 @@ Naming/MethodParameterName:
   # like `db` and `io`. So, short names really can be useful.
   Enabled: false
 
+Style/BracesAroundHashParameters:
+  EnforcedStyle: braces
+
 Style/CaseEquality:
   # The code uses `===` a lot to compare a regex to a string, but it's not clear that
   # switching to `=~` is always safe, because in some cases the value could be a regex

data/Gemfile

@@ -1,4 +1,6 @@
-# This file was generated by Appraisal
+# 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'
 
 source 'https://rubygems.org'
 
@@ -11,7 +13,7 @@ ENV['CURRENT_GEMFILE'] ||= __FILE__
 
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
 
-GEMFILE_RAILS_VERSION = '~> 6.1.3'.freeze
+GEMFILE_RAILS_VERSION = '~> 6.1.5'.freeze
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'appraisal'
 gem 'jruby-openssl', :platform => :jruby
@@ -29,11 +31,7 @@ else
   gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 end
 
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -43,7 +41,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'shoryuken'
 gem 'simplecov'
 gem 'sucker_punch', '~> 2.0'
@@ -69,7 +66,6 @@ else
   gem 'delayed_job', '~> 4.1', :require => false
 end
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque', '< 2.0.0'
 gem 'rubocop', '1.15.0', :require => false # pin specific version, update manually

data/gemfiles/rails30.gemfile

@@ -28,7 +28,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'rexml', '<= 3.2.4'
 gem 'shoryuken'
 gem 'simplecov', '<= 0.17.1'

data/gemfiles/rails31.gemfile

@@ -27,7 +27,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'rexml', '<= 3.2.4'
 gem 'shoryuken'
 gem 'simplecov', '<= 0.17.1'

data/gemfiles/rails32.gemfile

@@ -29,7 +29,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'rexml', '<= 3.2.4'
 gem 'shoryuken'
 gem 'simplecov', '<= 0.17.1'

data/gemfiles/rails40.gemfile

@@ -29,7 +29,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'json', '~> 2.0'
 gem 'shoryuken'
 gem 'simplecov', '<= 0.17.1'

data/gemfiles/rails41.gemfile

@@ -26,7 +26,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'shoryuken'
 gem 'simplecov', '<= 0.17.1'
 gem 'sucker_punch', '~> 2.0'

data/gemfiles/rails42.gemfile

@@ -40,7 +40,6 @@ 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

data/gemfiles/rails50.gemfile

@@ -29,7 +29,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
 gem 'sucker_punch', '~> 2.0'
 
@@ -39,7 +38,6 @@ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
 gem 'database_cleaner', '~> 1.8.4'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis', '<= 3.3.5'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false

data/gemfiles/rails51.gemfile

@@ -29,7 +29,6 @@ platforms :rbx do
 end
 
 gem 'capistrano', :require => false
-gem 'codacy-coverage'
 gem 'simplecov', '<= 0.17.1'
 gem 'sucker_punch', '~> 2.0'
 
@@ -41,7 +40,6 @@ gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 gem 'database_cleaner', '~> 1.8.4'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis', '<= 3.3.5'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false

data/gemfiles/rails52.gemfile

@@ -17,7 +17,7 @@ gem 'rspec-support', '~> 3.8.0'
 
 gem 'rake'
 
-gem 'sidekiq', '>= 2.13.0'
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -28,14 +28,12 @@ end
 
 gem 'sucker_punch', '~> 2.0'
 
-# We need last sinatra that uses rack 2.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+# 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 'codacy-coverage'
 gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false

data/gemfiles/rails60.gemfile

@@ -13,7 +13,7 @@ gem 'rspec-rails', '~> 4.0.2'
 
 gem 'rake'
 
-gem 'sidekiq', '>= 2.13.0'
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -24,14 +24,12 @@ end
 
 gem 'sucker_punch', '~> 2.0'
 
-# We need last sinatra that uses rack 2.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+# 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 'codacy-coverage'
 gem 'database_cleaner'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false

data/gemfiles/rails61.gemfile

@@ -6,14 +6,14 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == '
 
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '~> 6.1.3'
+gem 'rails', '~> 6.1.5'
 gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-rails', '~> 4.0.2'
 
 gem 'rake'
 
-gem 'sidekiq', '>= 2.13.0'
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -24,14 +24,12 @@ end
 
 gem 'sucker_punch', '~> 2.0'
 
-# We need last sinatra that uses rack 2.x
-gem 'sinatra', :git => 'https://github.com/sinatra/sinatra'
+# 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 'codacy-coverage'
 gem 'database_cleaner'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false

data/gemfiles/rails70.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.0.2.3'
+gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
+
+gem 'rspec-rails', '~> 4.0.2'
+
+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'
+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/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

@@ -141,7 +141,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 +166,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/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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
@@ -48,6 +48,7 @@ files:
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.erb
 - lib/rails/rollbar_runner.rb