rollbar 2.18.2 → 2.19.0

data/lib/rollbar/scrubbers/params.rb

@@ -21,6 +21,8 @@ module Rollbar
         params = options[:params]
         return {} unless params
 
+        @scrubbed_object_ids = {}
+
         config = options[:config]
         extra_fields = options[:extra_fields]
         whitelist = options[:whitelist] || []
@@ -56,6 +58,10 @@ module Rollbar
       end
 
       def scrub(params, options)
+        return params if @scrubbed_object_ids[params.object_id]
+
+        @scrubbed_object_ids[params.object_id] = true
+
         fields_regex = options[:fields_regex]
         scrub_all = options[:scrub_all]
         whitelist_regex = options[:whitelist]

data/lib/rollbar/util.rb

@@ -1,83 +1,101 @@
 require 'rollbar/util/hash'
 
 module Rollbar
-  module Util
-    def self.iterate_and_update(obj, block)
-      return if obj.frozen?
+  module Util # :nodoc:
+    def self.iterate_and_update(obj, block, seen = {})
+      return if obj.frozen? || seen[obj.object_id]
+
+      seen[obj.object_id] = true
+
       if obj.is_a?(Array)
-        for i in 0 ... obj.size
-          value = obj[i]
-
-          if value.is_a?(::Hash) || value.is_a?(Array)
-            self.iterate_and_update(value, block)
-          else
-            obj[i] = block.call(value)
-          end
-        end
+        iterate_and_update_array(obj, block, seen)
       else
-        key_updates = []
+        iterate_and_update_hash(obj, block, seen)
+      end
+    end
 
-        obj.each do |k, v|
-          new_key = nil
+    def self.iterate_and_update_array(array, block, seen)
+      array.each_with_index do |value, i|
+        if value.is_a?(::Hash) || value.is_a?(Array)
+          iterate_and_update(value, block, seen)
+        else
+          array[i] = block.call(value)
+        end
+      end
+    end
 
-          if v.is_a?(::Hash) || v.is_a?(Array)
-            self.iterate_and_update(v, block)
-            new_key = block.call(k)
-          else
-            new_key = block.call(k)
-            obj[k] = block.call(v)
-          end
+    def self.iterate_and_update_hash(obj, block, seen)
+      obj.keys.each do |k|
+        v = obj[k]
+        new_key = block.call(k)
 
-          key_updates.push([k, new_key]) if new_key != k
+        if v.is_a?(::Hash) || v.is_a?(Array)
+          iterate_and_update(v, block, seen)
+        else
+          obj[k] = block.call(v)
         end
 
-        key_updates.each do |old_key, new_key|
-          obj[new_key] = obj[old_key]
-          obj.delete(old_key)
+        if new_key != k
+          obj[new_key] = obj[k]
+          obj.delete(k)
         end
       end
     end
 
-    def self.iterate_and_update_hash(hash, block)
-      hash.each do |k, v|
-        if v.is_a?(::Hash)
-          self.iterate_and_update_hash(v, block)
-        else
-          hash[k] = block.call(k, v)
-        end
+    def self.deep_copy(obj, copied = {})
+      # if we've already made a copy, return it.
+      return copied[obj.object_id] if copied[obj.object_id]
+
+      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
+
+      if obj.is_a?(::Hash)
+        obj.each { |k, v| result[k] = deep_copy(v, copied) }
+      elsif obj.is_a?(Array)
+        obj.each { |v| result << deep_copy(v, copied) }
       end
+
+      result
     end
 
-    def self.deep_copy(obj)
+    def self.clone_obj(obj)
       if obj.is_a?(::Hash)
-        result = obj.clone
-        obj.each { |k, v| result[k] = deep_copy(v)}
-        result
+        obj.clone
       elsif obj.is_a?(Array)
-        result = obj.clone
-        result.clear
-        obj.each { |v| result << deep_copy(v)}
-        result
+        obj.clone.clear
       else
         obj
       end
     end
 
-    def self.deep_merge(hash1, hash2)
+    def self.deep_merge(hash1, hash2, merged = {})
       hash1 ||= {}
       hash2 ||= {}
 
+      # 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)
+
+      merged[hash1.object_id] ||= []
+      merged[hash1.object_id] << hash2.object_id
+
+      perform_deep_merge(hash1, hash2, merged)
+
+      hash1
+    end
+
+    def self.perform_deep_merge(hash1, hash2, merged) # rubocop:disable Metrics/AbcSize
       hash2.each_key do |k|
         if hash1[k].is_a?(::Hash) && hash2[k].is_a?(::Hash)
-          hash1[k] = deep_merge(hash1[k], hash2[k])
+          hash1[k] = deep_merge(hash1[k], hash2[k], merged)
         elsif hash1[k].is_a?(Array) && hash2[k].is_a?(Array)
           hash1[k] += deep_copy(hash2[k])
         elsif hash2[k]
           hash1[k] = deep_copy(hash2[k])
         end
       end
-
-      hash1
     end
 
     def self.truncate(str, length)
@@ -97,5 +115,17 @@ module Rollbar
 
       Util.iterate_and_update(payload, normalizer)
     end
+
+    def self.count_method_in_stack(method_symbol, file_path = '')
+      caller.grep(/#{file_path}.*#{method_symbol.to_s}/).count
+    end
+
+    def self.method_in_stack(method_symbol, file_path = '')
+      count_method_in_stack(method_symbol, file_path) > 0
+    end
+
+    def self.method_in_stack_twice(method_symbol, file_path = '')
+      count_method_in_stack(method_symbol, file_path) > 1
+    end
   end
 end

data/lib/rollbar/util/hash.rb

@@ -1,20 +1,29 @@
 module Rollbar
   module Util
-    module Hash
-      def self.deep_stringify_keys(hash)
+    module Hash # :nodoc:
+      def self.deep_stringify_keys(hash, seen = {})
+        return if seen[hash.object_id]
+
+        seen[hash.object_id] = true
+
         hash.reduce({}) do |h, (key, value)|
-          h[key.to_s] = map_value(value, :deep_stringify_keys)
+          h[key.to_s] = map_value(value, :deep_stringify_keys, seen)
 
           h
         end
       end
 
-      def self.map_value(thing, m)
+      def self.map_value(thing, meth, seen)
         case thing
         when ::Hash
-          send(m, thing)
+          send(meth, thing, seen)
         when Array
-          thing.map { |v| map_value(v, m) }
+          if seen[thing.object_id]
+            thing
+          else
+            seen[thing.object_id] = true
+            thing.map { |v| map_value(v, meth, seen) }
+          end
         else
           thing
         end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.18.2'
+  VERSION = '2.19.0'
 end

data/rollbar.gemspec

@@ -11,11 +11,10 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Reports exceptions to Rollbar}
   gem.homepage      = 'https://rollbar.com'
   gem.license       = 'MIT'
-
-  gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(%r{^(spec)/})
+  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   gem.name          = 'rollbar'
   gem.require_paths = ['lib']
+  gem.required_ruby_version = '>= 1.9.3'
   gem.version       = Rollbar::VERSION
 
   gem.add_runtime_dependency 'multi_json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.18.2
+  version: 2.19.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -58,6 +58,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - gemfiles/ruby_1_8_and_1_9_2.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.rb
@@ -65,7 +66,9 @@ files:
 - lib/rollbar.rb
 - lib/rollbar/capistrano.rb
 - lib/rollbar/capistrano3.rb
+- lib/rollbar/capistrano_tasks.rb
 - lib/rollbar/configuration.rb
+- lib/rollbar/delay/active_job.rb
 - lib/rollbar/delay/delayed_job.rb
 - lib/rollbar/delay/girl_friday.rb
 - lib/rollbar/delay/resque.rb
@@ -73,6 +76,7 @@ files:
 - lib/rollbar/delay/sidekiq.rb
 - lib/rollbar/delay/sucker_punch.rb
 - lib/rollbar/delay/thread.rb
+- lib/rollbar/deploy.rb
 - lib/rollbar/encoding.rb
 - lib/rollbar/encoding/encoder.rb
 - lib/rollbar/encoding/legacy_encoder.rb
@@ -90,6 +94,7 @@ files:
 - lib/rollbar/logger.rb
 - lib/rollbar/logger_proxy.rb
 - lib/rollbar/middleware/js.rb
+- lib/rollbar/middleware/js/json_value.rb
 - lib/rollbar/middleware/rack.rb
 - lib/rollbar/middleware/rack/builder.rb
 - lib/rollbar/middleware/rack/test_session.rb
@@ -124,7 +129,6 @@ files:
 - lib/rollbar/scrubbers.rb
 - lib/rollbar/scrubbers/params.rb
 - lib/rollbar/scrubbers/url.rb
-- lib/rollbar/tasks/rollbar.cap
 - lib/rollbar/truncation.rb
 - lib/rollbar/truncation/frames_strategy.rb
 - lib/rollbar/truncation/min_body_strategy.rb
@@ -138,134 +142,6 @@ files:
 - lib/rollbar/version.rb
 - lib/tasks/tasks.rake
 - rollbar.gemspec
-- spec/cacert.pem
-- spec/controllers/home_controller_spec.rb
-- spec/delay/sidekiq_spec.rb
-- spec/delay/sucker_punch_spec.rb
-- spec/delayed/backend/test.rb
-- spec/delayed/serialization/test.rb
-- spec/dummyapp/.gitignore
-- spec/dummyapp/Rakefile
-- spec/dummyapp/app/assets/javascripts/application.js
-- spec/dummyapp/app/assets/stylesheets/application.css.scss
-- spec/dummyapp/app/controllers/application_controller.rb
-- spec/dummyapp/app/controllers/home_controller.rb
-- spec/dummyapp/app/controllers/users_controller.rb
-- spec/dummyapp/app/helpers/.gitkeep
-- spec/dummyapp/app/mailers/.gitkeep
-- spec/dummyapp/app/models/.gitkeep
-- spec/dummyapp/app/models/book.rb
-- spec/dummyapp/app/models/post.rb
-- spec/dummyapp/app/models/user.rb
-- spec/dummyapp/app/views/devise/registrations/edit.html.erb
-- spec/dummyapp/app/views/devise/registrations/new.html.erb
-- spec/dummyapp/app/views/devise/shared/_links.html.erb
-- spec/dummyapp/app/views/home/cause_exception.html.erb
-- spec/dummyapp/app/views/home/index.html.erb
-- spec/dummyapp/app/views/home/report_exception.html.erb
-- spec/dummyapp/app/views/js/test.html.erb
-- spec/dummyapp/app/views/layouts/_messages.html.erb
-- spec/dummyapp/app/views/layouts/_navigation.html.erb
-- spec/dummyapp/app/views/layouts/application.html.erb
-- spec/dummyapp/app/views/layouts/simple.html.erb
-- spec/dummyapp/app/views/users/index.html.erb
-- spec/dummyapp/app/views/users/show.html.erb
-- spec/dummyapp/config.ru
-- spec/dummyapp/config/application.rb
-- spec/dummyapp/config/boot.rb
-- spec/dummyapp/config/database.yml
-- spec/dummyapp/config/environment.rb
-- spec/dummyapp/config/environments/development.rb
-- spec/dummyapp/config/environments/production.rb
-- spec/dummyapp/config/environments/test.rb
-- spec/dummyapp/config/initializers/backtrace_silencers.rb
-- spec/dummyapp/config/initializers/inflections.rb
-- spec/dummyapp/config/initializers/mime_types.rb
-- spec/dummyapp/config/initializers/rollbar.rb
-- spec/dummyapp/config/initializers/secret_token.rb
-- spec/dummyapp/config/initializers/session_store.rb
-- spec/dummyapp/config/initializers/wrap_parameters.rb
-- spec/dummyapp/config/locales/devise.en.yml
-- spec/dummyapp/config/locales/en.yml
-- spec/dummyapp/config/routes.rb
-- spec/dummyapp/config/secrets.yml
-- spec/dummyapp/db/migrate/20121121184652_devise_create_users.rb
-- spec/dummyapp/db/migrate/20121121184654_add_name_to_users.rb
-- spec/dummyapp/db/migrate/20161219184410_create_books.rb
-- spec/dummyapp/db/migrate/20161219185529_add_username_to_users.rb
-- spec/dummyapp/db/schema.rb
-- spec/dummyapp/db/seeds.rb
-- spec/dummyapp/lib/assets/.gitkeep
-- spec/dummyapp/public/404.html
-- spec/dummyapp/public/422.html
-- spec/dummyapp/public/500.html
-- spec/dummyapp/public/favicon.ico
-- spec/dummyapp/script/rails
-- spec/fixtures/file1
-- spec/fixtures/file2
-- spec/fixtures/payloads/message.json
-- spec/fixtures/payloads/sample.trace.json
-- spec/fixtures/payloads/sample.trace_chain.json
-- spec/fixtures/plugins/dummy1.rb
-- spec/fixtures/plugins/dummy2.rb
-- spec/generators/rollbar/rollbar_generator_rails30_spec.rb
-- spec/generators/rollbar/rollbar_generator_spec.rb
-- spec/requests/home_spec.rb
-- spec/rollbar/configuration_spec.rb
-- spec/rollbar/delay/delayed_job_spec.rb
-- spec/rollbar/delay/girl_friday_spec.rb
-- spec/rollbar/delay/resque_spec.rb
-- spec/rollbar/delay/shoryuken_spec.rb
-- spec/rollbar/delay/thread_spec.rb
-- spec/rollbar/encoding/encoder_spec.rb
-- spec/rollbar/item/backtrace_spec.rb
-- spec/rollbar/item/frame_spec.rb
-- spec/rollbar/item_spec.rb
-- spec/rollbar/json/oj_spec.rb
-- spec/rollbar/json_spec.rb
-- spec/rollbar/lazy_store_spec.rb
-- spec/rollbar/logger_proxy_spec.rb
-- spec/rollbar/logger_spec.rb
-- spec/rollbar/middleware/js_spec.rb
-- spec/rollbar/middleware/sinatra_spec.rb
-- spec/rollbar/notifier_spec.rb
-- spec/rollbar/plugin_spec.rb
-- spec/rollbar/plugins/active_job_spec.rb
-- spec/rollbar/plugins/delayed_job/job_data_spec.rb
-- spec/rollbar/plugins/delayed_job_spec.rb
-- spec/rollbar/plugins/rack_spec.rb
-- spec/rollbar/plugins/rails_js_spec.rb
-- spec/rollbar/plugins/rake_spec.rb
-- spec/rollbar/plugins/resque/failure_spec.rb
-- spec/rollbar/plugins/sidekiq_spec.rb
-- spec/rollbar/plugins/validations_spec.rb
-- spec/rollbar/plugins_spec.rb
-- spec/rollbar/request_data_extractor_spec.rb
-- spec/rollbar/scrubbers/params_spec.rb
-- spec/rollbar/scrubbers/url_spec.rb
-- spec/rollbar/scrubbers_spec.rb
-- spec/rollbar/sidekig/clear_scope_spec.rb
-- spec/rollbar/truncation/frames_strategy_spec.rb
-- spec/rollbar/truncation/min_body_strategy_spec.rb
-- spec/rollbar/truncation/strings_strategy_spec.rb
-- spec/rollbar/truncation_spec.rb
-- spec/rollbar/util/hash_spec.rb
-- spec/rollbar/util/ip_anonymizer_spec.rb
-- spec/rollbar/util_spec.rb
-- spec/rollbar_bc_spec.rb
-- spec/rollbar_spec.rb
-- spec/spec_helper.rb
-- spec/support/cause_exception.rb
-- spec/support/encoding_helpers.rb
-- spec/support/encodings/iso_8859_9
-- spec/support/fixture_helpers.rb
-- spec/support/get_ip_raising.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
-- spec/support/notifier_helpers.rb
-- spec/support/rollbar_api.rb
-- spec/support/secure_headers_mocks.rb
-- spec/support/shared_contexts.rb
 homepage: https://rollbar.com
 licenses:
 - MIT
@@ -278,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -290,132 +166,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar
-test_files:
-- spec/cacert.pem
-- spec/controllers/home_controller_spec.rb
-- spec/delay/sidekiq_spec.rb
-- spec/delay/sucker_punch_spec.rb
-- spec/delayed/backend/test.rb
-- spec/delayed/serialization/test.rb
-- spec/dummyapp/.gitignore
-- spec/dummyapp/Rakefile
-- spec/dummyapp/app/assets/javascripts/application.js
-- spec/dummyapp/app/assets/stylesheets/application.css.scss
-- spec/dummyapp/app/controllers/application_controller.rb
-- spec/dummyapp/app/controllers/home_controller.rb
-- spec/dummyapp/app/controllers/users_controller.rb
-- spec/dummyapp/app/helpers/.gitkeep
-- spec/dummyapp/app/mailers/.gitkeep
-- spec/dummyapp/app/models/.gitkeep
-- spec/dummyapp/app/models/book.rb
-- spec/dummyapp/app/models/post.rb
-- spec/dummyapp/app/models/user.rb
-- spec/dummyapp/app/views/devise/registrations/edit.html.erb
-- spec/dummyapp/app/views/devise/registrations/new.html.erb
-- spec/dummyapp/app/views/devise/shared/_links.html.erb
-- spec/dummyapp/app/views/home/cause_exception.html.erb
-- spec/dummyapp/app/views/home/index.html.erb
-- spec/dummyapp/app/views/home/report_exception.html.erb
-- spec/dummyapp/app/views/js/test.html.erb
-- spec/dummyapp/app/views/layouts/_messages.html.erb
-- spec/dummyapp/app/views/layouts/_navigation.html.erb
-- spec/dummyapp/app/views/layouts/application.html.erb
-- spec/dummyapp/app/views/layouts/simple.html.erb
-- spec/dummyapp/app/views/users/index.html.erb
-- spec/dummyapp/app/views/users/show.html.erb
-- spec/dummyapp/config.ru
-- spec/dummyapp/config/application.rb
-- spec/dummyapp/config/boot.rb
-- spec/dummyapp/config/database.yml
-- spec/dummyapp/config/environment.rb
-- spec/dummyapp/config/environments/development.rb
-- spec/dummyapp/config/environments/production.rb
-- spec/dummyapp/config/environments/test.rb
-- spec/dummyapp/config/initializers/backtrace_silencers.rb
-- spec/dummyapp/config/initializers/inflections.rb
-- spec/dummyapp/config/initializers/mime_types.rb
-- spec/dummyapp/config/initializers/rollbar.rb
-- spec/dummyapp/config/initializers/secret_token.rb
-- spec/dummyapp/config/initializers/session_store.rb
-- spec/dummyapp/config/initializers/wrap_parameters.rb
-- spec/dummyapp/config/locales/devise.en.yml
-- spec/dummyapp/config/locales/en.yml
-- spec/dummyapp/config/routes.rb
-- spec/dummyapp/config/secrets.yml
-- spec/dummyapp/db/migrate/20121121184652_devise_create_users.rb
-- spec/dummyapp/db/migrate/20121121184654_add_name_to_users.rb
-- spec/dummyapp/db/migrate/20161219184410_create_books.rb
-- spec/dummyapp/db/migrate/20161219185529_add_username_to_users.rb
-- spec/dummyapp/db/schema.rb
-- spec/dummyapp/db/seeds.rb
-- spec/dummyapp/lib/assets/.gitkeep
-- spec/dummyapp/public/404.html
-- spec/dummyapp/public/422.html
-- spec/dummyapp/public/500.html
-- spec/dummyapp/public/favicon.ico
-- spec/dummyapp/script/rails
-- spec/fixtures/file1
-- spec/fixtures/file2
-- spec/fixtures/payloads/message.json
-- spec/fixtures/payloads/sample.trace.json
-- spec/fixtures/payloads/sample.trace_chain.json
-- spec/fixtures/plugins/dummy1.rb
-- spec/fixtures/plugins/dummy2.rb
-- spec/generators/rollbar/rollbar_generator_rails30_spec.rb
-- spec/generators/rollbar/rollbar_generator_spec.rb
-- spec/requests/home_spec.rb
-- spec/rollbar/configuration_spec.rb
-- spec/rollbar/delay/delayed_job_spec.rb
-- spec/rollbar/delay/girl_friday_spec.rb
-- spec/rollbar/delay/resque_spec.rb
-- spec/rollbar/delay/shoryuken_spec.rb
-- spec/rollbar/delay/thread_spec.rb
-- spec/rollbar/encoding/encoder_spec.rb
-- spec/rollbar/item/backtrace_spec.rb
-- spec/rollbar/item/frame_spec.rb
-- spec/rollbar/item_spec.rb
-- spec/rollbar/json/oj_spec.rb
-- spec/rollbar/json_spec.rb
-- spec/rollbar/lazy_store_spec.rb
-- spec/rollbar/logger_proxy_spec.rb
-- spec/rollbar/logger_spec.rb
-- spec/rollbar/middleware/js_spec.rb
-- spec/rollbar/middleware/sinatra_spec.rb
-- spec/rollbar/notifier_spec.rb
-- spec/rollbar/plugin_spec.rb
-- spec/rollbar/plugins/active_job_spec.rb
-- spec/rollbar/plugins/delayed_job/job_data_spec.rb
-- spec/rollbar/plugins/delayed_job_spec.rb
-- spec/rollbar/plugins/rack_spec.rb
-- spec/rollbar/plugins/rails_js_spec.rb
-- spec/rollbar/plugins/rake_spec.rb
-- spec/rollbar/plugins/resque/failure_spec.rb
-- spec/rollbar/plugins/sidekiq_spec.rb
-- spec/rollbar/plugins/validations_spec.rb
-- spec/rollbar/plugins_spec.rb
-- spec/rollbar/request_data_extractor_spec.rb
-- spec/rollbar/scrubbers/params_spec.rb
-- spec/rollbar/scrubbers/url_spec.rb
-- spec/rollbar/scrubbers_spec.rb
-- spec/rollbar/sidekig/clear_scope_spec.rb
-- spec/rollbar/truncation/frames_strategy_spec.rb
-- spec/rollbar/truncation/min_body_strategy_spec.rb
-- spec/rollbar/truncation/strings_strategy_spec.rb
-- spec/rollbar/truncation_spec.rb
-- spec/rollbar/util/hash_spec.rb
-- spec/rollbar/util/ip_anonymizer_spec.rb
-- spec/rollbar/util_spec.rb
-- spec/rollbar_bc_spec.rb
-- spec/rollbar_spec.rb
-- spec/spec_helper.rb
-- spec/support/cause_exception.rb
-- spec/support/encoding_helpers.rb
-- spec/support/encodings/iso_8859_9
-- spec/support/fixture_helpers.rb
-- spec/support/get_ip_raising.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
-- spec/support/notifier_helpers.rb
-- spec/support/rollbar_api.rb
-- spec/support/secure_headers_mocks.rb
-- spec/support/shared_contexts.rb
+test_files: []