rollbar 2.23.1 → 2.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d9d3035d6e146b45e596ce67d71b5a1ff21c56a61dd9783eaf89309207a74d
-  data.tar.gz: c4165be529fcd66a89b78bf30451f5c9ff8ac200d8a3b4cd9afc109ae1188b4c
+  metadata.gz: 9073beef837ad644c6679c6f95599b7eb6e387d089c9f8d88448cbf39960ea22
+  data.tar.gz: 148751730bba10444641bd319314b7af7ee69a51e2c15cc686a909f797eec379
 SHA512:
-  metadata.gz: 5bd909dd41462a78b7861e9147c42916436337710171e1984203c8ccc75544a92a13a476d11efa73dbe08be5a3056759fb3f902861132c208b2fcaff1271ff35
-  data.tar.gz: 12c880143d6a3b98d7d70ceb48429db392ecf50fbfc8207f933aa222ef05ab54f31a39304615787dea9f6a9ec219ec90a15828fe3adb555d3cda2e4496eeb12e
+  metadata.gz: c8b0529b951944385beba61f53f43c3ea4270fe38c94fb85639a55a833d2e67c92ae61e88325ba3e3c4a0b64492aab3c95bc6faa6f458df1e9ad792c1e38e77d
+  data.tar.gz: 6d12a2415ac6ba94b7e5b00b944a4de7afe5a4fa6e43c9d86618c944d0968e0aeb8d601a34363fd97b89bc4ff5316b7dfa2cff6a54aee1a7f198b5690391da23

data/.travis.yml

@@ -3,12 +3,6 @@ dist: trusty
 services:
   - redis-server
 language: ruby
-# Broken bundler on travis CI - https://github.com/bundler/bundler/issues/2784
-before_install:
-  - gem update --system 2.7.7
-  - gem --version
-  - gem install bundler -v 1.6.1
-  - bundle --version
 
 rvm:
   - 1.9.3
@@ -18,8 +12,8 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.0
-  - 2.6.3
+  - 2.6.5
+  - 2.7.0
   - rbx
   # Travis's own rvm installer is failing on JRuby builds, TODO: reenable when fixed.
   # - jruby-9.1.9.0
@@ -73,9 +67,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    # Ruby 2.6.x is still being eveluated and may have test failures
-    - rvm: 2.6.0
-    - rvm: 2.6.3
     # oraclejdk9 has a dependency issue that needs to be investigated
     - jdk: oraclejdk9
 
@@ -124,17 +115,17 @@ matrix:
       jdk: oraclejdk8
     - rvm: 2.5.3
       jdk: oraclejdk9
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: openjdk8
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: oraclejdk8
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: oraclejdk9
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: openjdk8
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: oraclejdk8
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: oraclejdk9
 
     - rvm: ruby-head
@@ -225,30 +216,39 @@ matrix:
       gemfile: gemfiles/rails40.gemfile
     - rvm: 2.5.3
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.6.3
+    # Rails 6.x tries to be compatible with Ruby 2.7, though
+    # it still throws a lot of warnings. No point testing earlier
+    # Rails with Ruby 2.7.
+    - rvm: 2.7.0
       gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails52.gemfile
     # JRuby JDBC Adapter is only compatible with Rails >= 5.x
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails30.gemfile

data/gemfiles/rails60.gemfile

@@ -15,7 +15,7 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '6.0.0.rc1'
+gem 'rails', '6.0.2.1'
 gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.8.0'

data/lib/rollbar/encoding/encoder.rb

@@ -3,7 +3,6 @@ module Rollbar
     class Encoder
       ALL_ENCODINGS = [::Encoding::UTF_8, ::Encoding::ISO_8859_1, ::Encoding::ASCII_8BIT, ::Encoding::US_ASCII].freeze
       ASCII_ENCODINGS = [::Encoding::US_ASCII, ::Encoding::ASCII_8BIT, ::Encoding::ISO_8859_1].freeze
-      ENCODING_OPTIONS = { :invalid => :replace, :undef => :replace, :replace => '' }.freeze
       UTF8 = 'UTF-8'.freeze
       BINARY = 'binary'.freeze
 
@@ -21,7 +20,13 @@ module Rollbar
         encoded_value = if encoding == ::Encoding::UTF_8 && value.valid_encoding?
                           value
                         else
-                          force_encoding(value).encode(*encoding_args(value))
+                          force_encoding(value).encode(
+                            *encoding_args(value),
+                            # Ruby 2.7 requires this to look like keyword args,
+                            # and Ruby 1.9.3 doesn't understand keyword args, so
+                            # don't use hash rockets here and both will be happy.
+                            invalid: :replace, undef: :replace, replace: '' # rubocop:disable Style/HashSyntax
+                          )
                         end
 
         object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
@@ -54,7 +59,6 @@ module Rollbar
       def encoding_args(value)
         args = [UTF8]
         args << BINARY if ASCII_ENCODINGS.include?(value.encoding)
-        args << ENCODING_OPTIONS
 
         args
       end

data/lib/rollbar/middleware/js.rb

@@ -83,7 +83,12 @@ module Rollbar
         response = ::Rack::Response.new(response_string, app_result[0],
                                         app_result[1])
 
-        response.finish
+        finished = response.finish
+
+        # Rack < 2.x Response#finish returns self in array[2]. Rack >= 2.x returns self.body.
+        # Always return with the response object here regardless of rack version.
+        finished[2] = response
+        finished
       end
 
       def build_body_with_js(env, body, head_open_end)

data/lib/rollbar/plugins/active_job.rb

@@ -14,7 +14,7 @@ module Rollbar
   end
 end
 
-if defined?(ActiveSupport)
+if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
   ActiveSupport.on_load(:action_mailer) do
     # Automatically add to ActionMailer::DeliveryJob
     ActionMailer::DeliveryJob.send(:include, Rollbar::ActiveJob) if defined?(ActionMailer::DeliveryJob)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.23.1'.freeze
+  VERSION = '2.23.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.23.1
+  version: 2.23.2
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
@@ -158,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar