rollbar 3.1.0 → 3.3.0

data/lib/rollbar/truncation/remove_extra_strategy.rb

@@ -24,7 +24,9 @@ module Rollbar
       end
 
       def delete_trace_chain_extra(body)
-        body['trace_chain'][0].delete('extra') if body['trace_chain'] && body['trace_chain'][0]['extra']
+        return unless body['trace_chain'] && body['trace_chain'][0]['extra']
+
+        body['trace_chain'][0].delete('extra')
       end
 
       def delete_trace_extra(body)

data/lib/rollbar/util/hash.rb

@@ -2,9 +2,10 @@ module Rollbar
   module Util
     module Hash # :nodoc:
       def self.deep_stringify_keys(hash, seen = {})
-        return if seen[hash.object_id]
+        seen.compare_by_identity
+        return if seen[hash]
 
-        seen[hash.object_id] = true
+        seen[hash] = true
         replace_seen_children(hash, seen)
 
         hash.reduce({}) do |h, (key, value)|
@@ -19,10 +20,10 @@ module Rollbar
         when ::Hash
           send(meth, thing, seen)
         when Array
-          if seen[thing.object_id]
+          if seen[thing]
             thing
           else
-            seen[thing.object_id] = true
+            seen[thing] = true
             replace_seen_children(thing, seen)
             thing.map { |v| map_value(v, meth, seen) }
           end
@@ -34,12 +35,18 @@ module Rollbar
       def self.replace_seen_children(thing, seen)
         case thing
         when ::Hash
-          thing.keys.each do |key|
-            thing[key] = "removed circular reference: #{thing[key]}" if seen[thing[key].object_id]
+          thing.keys.each do |key| # rubocop:disable Style/HashEachMethods
+            if seen[thing[key]]
+              thing[key] =
+                "removed circular reference: #{thing[key]}"
+            end
           end
         when Array
           thing.each_with_index do |_, i|
-            thing[i] = "removed circular reference: #{thing[i]}" if seen[thing[i].object_id]
+            if seen[thing[i]]
+              thing[i] =
+                "removed circular reference: #{thing[i]}"
+            end
           end
         end
       end

data/lib/rollbar/util/ip_anonymizer.rb

@@ -24,7 +24,7 @@ module Rollbar
       def self.anonymize_ipv6(ip)
         ip_parts = ip.to_s.split ':'
 
-        ip_string = ip_parts[0..2].join(':') + ':0000:0000:0000:0000:0000'
+        ip_string = "#{ip_parts[0..2].join(':')}:0000:0000:0000:0000:0000"
 
         IPAddr.new(ip_string).to_s
       end

data/lib/rollbar/util.rb

@@ -7,9 +7,10 @@ module Rollbar
     end
 
     def self.iterate_and_update(obj, block, seen = {})
-      return if obj.frozen? || seen[obj.object_id]
+      seen.compare_by_identity
+      return if obj.frozen? || seen[obj]
 
-      seen[obj.object_id] = true
+      seen[obj] = true
 
       if obj.is_a?(Array)
         iterate_and_update_array(obj, block, seen)
@@ -29,7 +30,7 @@ module Rollbar
     end
 
     def self.iterate_and_update_hash(obj, block, seen)
-      obj.keys.each do |k|
+      obj.keys.each do |k| # rubocop:disable Style/HashEachMethods
         v = obj[k]
         new_key = block.call(k)
 
@@ -47,18 +48,21 @@ module Rollbar
     end
 
     def self.deep_copy(obj, copied = {})
+      copied.compare_by_identity
+
       # if we've already made a copy, return it.
-      return copied[obj.object_id] if copied[obj.object_id]
+      return copied[obj] if copied[obj]
 
       result = clone_obj(obj)
 
       # Memoize the cloned object before recursive calls to #deep_copy below.
       # This is the point of doing the work in two steps.
-      copied[obj.object_id] = result
+      copied[obj] = result
 
-      if obj.is_a?(::Hash)
+      case obj
+      when ::Hash
         obj.each { |k, v| result[k] = deep_copy(v, copied) }
-      elsif obj.is_a?(Array)
+      when Array
         obj.each { |v| result << deep_copy(v, copied) }
       end
 
@@ -66,9 +70,10 @@ module Rollbar
     end
 
     def self.clone_obj(obj)
-      if obj.is_a?(::Hash)
+      case obj
+      when ::Hash
         obj.dup
-      elsif obj.is_a?(Array)
+      when Array
         obj.dup.clear
       else
         obj
@@ -78,12 +83,13 @@ module Rollbar
     def self.deep_merge(hash1, hash2, merged = {})
       hash1 ||= {}
       hash2 ||= {}
+      merged.compare_by_identity
 
       # If we've already merged these two objects, return hash1 now.
-      return hash1 if merged[hash1.object_id] && merged[hash1.object_id].include?(hash2.object_id)
+      return hash1 if merged[hash1] && merged[hash1].include?(hash2.object_id)
 
-      merged[hash1.object_id] ||= []
-      merged[hash1.object_id] << hash2.object_id
+      merged[hash1] ||= []
+      merged[hash1] << hash2.object_id
 
       perform_deep_merge(hash1, hash2, merged)
 
@@ -121,7 +127,7 @@ module Rollbar
     end
 
     def self.count_method_in_stack(method_symbol, file_path = '')
-      caller.grep(/#{file_path}.*#{method_symbol.to_s}/).count
+      caller.grep(/#{file_path}.*#{method_symbol}/).count
     end
 
     def self.method_in_stack(method_symbol, file_path = '')

data/lib/rollbar/version.rb

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

data/lib/rollbar.rb

@@ -8,6 +8,7 @@ require 'forwardable'
 begin
   require 'securerandom'
 rescue LoadError
+  # Skip loading
 end
 
 require 'rollbar/version'
@@ -31,8 +32,7 @@ module Rollbar
 
     def_delegators :notifier, *PUBLIC_NOTIFIER_METHODS
 
-    attr_writer :plugins
-    attr_writer :root_notifier
+    attr_writer :plugins, :root_notifier
 
     def notifier
       # Use the global instance @root_notifier so we don't fall
@@ -160,8 +160,10 @@ module Rollbar
 
     # Backwards compatibility methods
 
-    def report_exception(exception, request_data = nil, person_data = nil, level = 'error')
-      Kernel.warn('[DEPRECATION] Rollbar.report_exception has been deprecated, please use log() or one of the level functions')
+    def report_exception(exception, request_data = nil, person_data = nil,
+                         level = 'error')
+      Kernel.warn('[DEPRECATION] Rollbar.report_exception has been deprecated, ' \
+        'please use log() or one of the level functions')
 
       scope = {}
       scope[:request] = request_data if request_data
@@ -173,13 +175,16 @@ module Rollbar
     end
 
     def report_message(message, level = 'info', extra_data = nil)
-      Kernel.warn('[DEPRECATION] Rollbar.report_message has been deprecated, please use log() or one of the level functions')
+      Kernel.warn('[DEPRECATION] Rollbar.report_message has been deprecated, ' \
+        'please use log() or one of the level functions')
 
       Rollbar.notifier.log(level, message, extra_data)
     end
 
-    def report_message_with_request(message, level = 'info', request_data = nil, person_data = nil, extra_data = nil)
-      Kernel.warn('[DEPRECATION] Rollbar.report_message_with_request has been deprecated, please use log() or one of the level functions')
+    def report_message_with_request(message, level = 'info', request_data = nil,
+                                    person_data = nil, extra_data = nil)
+      Kernel.warn('[DEPRECATION] Rollbar.report_message_with_request has been ' \
+        'deprecated, please use log() or one of the level functions')
 
       scope = {}
       scope[:request] = request_data if request_data

data/lib/tasks/benchmark.rake

@@ -77,7 +77,8 @@ class BenchmarkTraceWithBindings # :nodoc:
   def trace_point # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     return unless defined?(TracePoint)
 
-    @trace_point ||= TracePoint.new(:call, :return, :b_call, :b_return, :c_call, :c_return, :raise) do |tp|
+    @trace_point ||= TracePoint.new(:call, :return, :b_call, :b_return, :c_call,
+                                    :c_return, :raise) do |tp|
       next if options['hook_only']
 
       case tp.event

data/rollbar.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Reports exceptions to Rollbar'
   gem.homepage      = 'https://rollbar.com'
   gem.license       = 'MIT'
-  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  gem.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   gem.files        += ['spec/support/rollbar_api.rb'] # useful helper for app spec/tests.
   gem.name          = 'rollbar'
   gem.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
@@ -47,8 +47,9 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
-- lib/generators/rollbar/templates/initializer.rb
+- lib/generators/rollbar/templates/initializer.erb
 - lib/rails/rollbar_runner.rb
 - lib/rollbar.rb
 - lib/rollbar/capistrano.rb
@@ -160,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar