rollbar 2.19.2 → 2.19.3

data/lib/rollbar/delay/resque.rb

@@ -23,12 +23,10 @@ module Rollbar
         end
 
         def perform(payload)
-          begin
-            Rollbar.process_from_async_handler(payload)
-          rescue
-            # Raise the exception so Resque can track the errored job
-            raise
-          end
+          Rollbar.process_from_async_handler(payload)
+        rescue StandardError
+          # Raise the exception so Resque can track the errored job
+          raise
         end
       end
     end

data/lib/rollbar/delay/sidekiq.rb

@@ -10,21 +10,17 @@ module Rollbar
       end
 
       def call(payload)
-        if ::Sidekiq::Client.push(@options.merge('args' => [payload])) == nil
-          raise StandardError.new "Unable to push the job to Sidekiq"
-        end
+        raise StandardError, 'Unable to push the job to Sidekiq' if ::Sidekiq::Client.push(@options.merge('args' => [payload])).nil?
       end
 
       include ::Sidekiq::Worker
 
       def perform(*args)
-        begin
-          Rollbar.process_from_async_handler(*args)
-        rescue
-          # Raise the exception so Sidekiq can track the errored job
-          # and retry it
-          raise
-        end
+        Rollbar.process_from_async_handler(*args)
+      rescue StandardError
+        # Raise the exception so Sidekiq can track the errored job
+        # and retry it
+        raise
       end
     end
   end

data/lib/rollbar/delay/sucker_punch.rb

@@ -16,11 +16,11 @@ module Rollbar
       def self.setup
         major_version = ::SuckerPunch::VERSION.split.first.to_i
 
-        if major_version > 1
-          self.perform_proc = proc { |payload| perform_async(payload) }
-        else
-          self.perform_proc = proc { |payload| new.async.perform(payload) }
-        end
+        self.perform_proc = if major_version > 1
+                              proc { |payload| perform_async(payload) }
+                            else
+                              proc { |payload| new.async.perform(payload) }
+                            end
 
         self.ready = true
       end
@@ -32,20 +32,18 @@ module Rollbar
       end
 
       def perform(*args)
-        begin
-          Rollbar.process_from_async_handler(*args)
-        rescue
-          # SuckerPunch can configure an exception handler with:
-          #
-          # SuckerPunch.exception_handler { # do something here }
-          #
-          # This is just passed to Celluloid.exception_handler which will
-          # push the reiceved block to an array of handlers, by default empty, [].
-          #
-          # We reraise the exception here casue it's safe and users could have defined
-          # their own exception handler for SuckerPunch
-          raise
-        end
+        Rollbar.process_from_async_handler(*args)
+      rescue StandardError
+        # SuckerPunch can configure an exception handler with:
+        #
+        # SuckerPunch.exception_handler { # do something here }
+        #
+        # This is just passed to Celluloid.exception_handler which will
+        # push the reiceved block to an array of handlers, by default empty, [].
+        #
+        # We reraise the exception here casue it's safe and users could have defined
+        # their own exception handler for SuckerPunch
+        raise
       end
     end
   end

data/lib/rollbar/delay/thread.rb

@@ -1,4 +1,3 @@
-require 'thread'
 require 'timeout'
 
 module Rollbar
@@ -29,6 +28,7 @@ module Rollbar
 
         def spawn_threads_reaper
           return if @spawned
+
           @spawned = true
 
           @reaper ||= build_reaper_thread
@@ -65,7 +65,7 @@ module Rollbar
         ::Thread.new do
           begin
             Rollbar.process_from_async_handler(payload)
-          rescue
+          rescue StandardError
             # Here we swallow the exception:
             # 1. The original report wasn't sent.
             # 2. An internal error was sent and logged

data/lib/rollbar/deploy.rb

@@ -1,72 +1,89 @@
-require 'capistrano'
-
 module Rollbar
   # Deploy Tracking API wrapper module
   module Deploy
     ENDPOINT = 'https://api.rollbar.com/api/1/deploy/'.freeze
 
-    def self.report(opts = {}, access_token:, environment:, revision:)
+    def self.report(opts, access_token, environment, revision)
       return {} unless access_token && !access_token.empty?
 
       opts[:status] ||= :started
 
-      uri = URI.parse(::Rollbar::Deploy::ENDPOINT)
+      uri = ::URI.parse(::Rollbar::Deploy::ENDPOINT)
 
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.body = ::JSON.dump({
+      request_data = {
         :access_token => access_token,
         :environment => environment,
         :revision => revision
-      }.merge(opts))
+      }.merge(opts)
+      request_data.delete(:proxy)
+      request_data.delete(:dry_run)
+
+      request = ::Net::HTTP::Post.new(uri.request_uri)
+      request.body = ::JSON.dump(request_data)
 
-      send_request(opts, :uri => uri, :request => request)
+      send_request(opts, uri, request)
     end
 
-    def self.update(opts = {}, deploy_id:, access_token:, status:)
+    def self.update(opts, access_token, deploy_id, status)
       return {} unless access_token && !access_token.empty?
 
-      uri = URI.parse(
+      uri = ::URI.parse(
         ::Rollbar::Deploy::ENDPOINT +
         deploy_id.to_s +
         '?access_token=' + access_token
       )
 
-      request = Net::HTTP::Patch.new(uri.request_uri)
+      request = ::Net::HTTP::Patch.new(uri.request_uri)
       request.body = ::JSON.dump(:status => status.to_s, :comment => opts[:comment])
 
-      send_request(opts, :uri => uri, :request => request)
+      send_request(opts, uri, request)
     end
 
     class << self
       private
 
-      def send_request(opts = {}, uri:, request:)
-        Net::HTTP.start(uri.host, uri.port, opts[:proxy], :use_ssl => true) do |http|
+      def send_request(opts, uri, request)
+        ::Net::HTTP.start(uri.host, uri.port, opts[:proxy], :use_ssl => true) do |http|
           build_result(
-            :uri => uri,
-            :request => request,
-            :response => opts[:dry_run] ? nil : http.request(request)
+            uri,
+            request,
+            opts[:dry_run] ? nil : http.request(request),
+            opts[:dry_run]
           )
         end
       end
 
-      def build_result(uri:, request:, response: nil)
-        result = {
-          :request_info => uri.inspect + ': ' + request.body,
-          :request => request,
-          :response => response
-        }
+      def build_result(uri, request, response = nil, dry_run = false)
+        result = {}
+        result.merge!(request_result(uri, request))
+        result.merge!(response_result(response)) unless response.nil?
+        result[:success] = success?(result, dry_run)
+        result
+      end
 
-        unless result[:response].nil?
-          result.merge!(JSON.parse(result[:response].body, :symbolize_names => true))
-          result[:response_info] = build_response_info(result[:response])
-        end
+      def success?(result, dry_run = false)
+        return true if dry_run
 
-        result
+        result[:response] &&
+          result[:response].is_a?(::Net::HTTPSuccess) &&
+          result[:response].code == '200' &&
+          (result.key?('err') ? result['err'].to_i.zero? : true)
+      end
+
+      def request_result(uri, request)
+        {
+          :request_info => uri.inspect + ': ' + request.body,
+          :request => request
+        }
       end
 
-      def build_response_info(response)
-        response.code + '; ' + response.message + '; ' + response.body.delete!("\n")
+      def response_result(response)
+        {
+          :response => response,
+          :response_info => response.code + '; ' +
+            response.message + '; ' +
+            response.body.delete("\n")
+        }.merge(::JSON.parse(response.body, :symbolize_names => true))
       end
     end
   end

data/lib/rollbar/encoding/encoder.rb

@@ -1,9 +1,9 @@
 module Rollbar
   module Encoding
     class Encoder
-      ALL_ENCODINGS = [::Encoding::UTF_8, ::Encoding::ISO_8859_1, ::Encoding::ASCII_8BIT, ::Encoding::US_ASCII]
-      ASCII_ENCODINGS = [::Encoding::US_ASCII, ::Encoding::ASCII_8BIT, ::Encoding::ISO_8859_1]
-      ENCODING_OPTIONS = { :invalid => :replace, :undef => :replace, :replace => '' }
+      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
 
@@ -18,11 +18,11 @@ module Rollbar
         encoding = value.encoding
 
         # This will be most of cases so avoid force anything for them
-        if encoding == ::Encoding::UTF_8 && value.valid_encoding?
-          encoded_value = value
-        else
-          encoded_value = force_encoding(value).encode(*encoding_args(value))
-        end
+        encoded_value = if encoding == ::Encoding::UTF_8 && value.valid_encoding?
+                          value
+                        else
+                          force_encoding(value).encode(*encoding_args(value))
+                        end
 
         object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
       end
@@ -45,7 +45,7 @@ module Rollbar
             # Seems #codepoints is faster than #valid_encoding?
             value.force_encoding(encoding).encode(::Encoding::UTF_8).codepoints
             true
-          rescue
+          rescue StandardError
             false
           end
         end

data/lib/rollbar/item.rb

@@ -180,14 +180,14 @@ module Rollbar
     end
 
     def custom_data
-      if configuration.custom_data_method.arity == 3
-        data = configuration.custom_data_method.call(message, exception, context)
-      else
-        data = configuration.custom_data_method.call
-      end
+      data = if configuration.custom_data_method.arity == 3
+               configuration.custom_data_method.call(message, exception, context)
+             else
+               configuration.custom_data_method.call
+             end
 
       Rollbar::Util.deep_copy(data)
-    rescue => e
+    rescue StandardError => e
       return {} if configuration.safely?
 
       report_custom_data_error(e)
@@ -232,7 +232,7 @@ module Rollbar
       handlers.each do |handler|
         begin
           handler.call(transform_options)
-        rescue => e
+        rescue StandardError => e
           logger.error("[Rollbar] Error calling the `transform` hook: #{e}")
 
           break

data/lib/rollbar/item/backtrace.rb

@@ -32,7 +32,7 @@ module Rollbar
         end
       end
 
-      alias_method :build, :to_h
+      alias build to_h
 
       def get_file_lines(filename)
         files[filename] ||= read_file(filename)
@@ -44,7 +44,7 @@ module Rollbar
         return unless File.exist?(filename)
 
         File.read(filename).split("\n")
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -74,10 +74,10 @@ module Rollbar
       end
 
       def map_frames(current_exception)
-        exception_backtrace(current_exception).reverse.map do |frame|
+        exception_backtrace(current_exception).map do |frame|
           Rollbar::Item::Frame.new(self, frame,
                                    :configuration => configuration).to_h
-        end
+        end.reverse
       end
 
       # Returns the backtrace to be sent to our API. There are 3 options:

data/lib/rollbar/item/frame.rb

@@ -1,5 +1,6 @@
 # We want to use Gem.path
 require 'rubygems'
+require 'rollbar/item/locals'
 
 module Rollbar
   class Item
@@ -47,7 +48,8 @@ module Rollbar
 
         {
           :code => code_data(file_lines, lineno),
-          :context => context_data(file_lines, lineno)
+          :context => context_data(file_lines, lineno),
+          :locals => locals_data(filename, lineno)
         }
       end
 
@@ -94,6 +96,10 @@ module Rollbar
         }
       end
 
+      def locals_data(filename, lineno)
+        ::Rollbar::Item::Locals.locals_for_location(filename, lineno)
+      end
+
       def post_data(file_lines, lineno)
         from_line = lineno
         number_of_lines = [from_line + MAX_CONTEXT_LENGTH, file_lines.size].min - from_line

data/lib/rollbar/item/locals.rb

@@ -0,0 +1,56 @@
+require 'rollbar/notifier'
+require 'rollbar/scrubbers/params'
+
+module Rollbar
+  class Item
+    class Locals # :nodoc:
+      class << self
+        def exception_frames
+          Rollbar.notifier.exception_bindings
+        end
+
+        def locals_for_location(filename, lineno)
+          if (frame = frame_for_location(filename, lineno))
+            scrub(locals_for(frame[:binding]))
+          else
+            {}
+          end
+        end
+
+        def frame_for_location(filename, lineno)
+          while (frame = exception_frames.pop)
+            return nil unless frame
+            return frame if matching_frame?(frame, filename, lineno)
+          end
+          nil
+        end
+
+        private
+
+        def matching_frame?(frame, filename, lineno)
+          frame[:path] == filename && frame[:lineno].to_i <= lineno.to_i
+        end
+
+        def locals_for(frame)
+          {}.tap do |hash|
+            frame.local_variables.map do |var|
+              hash[var] = prepare_value(frame.local_variable_get(var))
+            end
+          end
+        end
+
+        def prepare_value(value)
+          value.to_s
+        end
+
+        def scrub(hash)
+          Rollbar::Scrubbers::Params.call(
+            :params => hash,
+            :config => Rollbar.configuration.scrub_fields,
+            :whitelist => Rollbar.configuration.scrub_whitelist
+          )
+        end
+      end
+    end
+  end
+end

data/lib/rollbar/json.rb

@@ -9,13 +9,16 @@ rescue LoadError
 end
 
 module Rollbar
-  module JSON
+  module JSON # :nodoc:
     extend self
 
     attr_writer :options_module
 
     def dump(object)
-      with_adapter { MultiJson.dump(object, adapter_options) }
+      # `basic_socket` plugin addresses the following issue: https://github.com/rollbar/rollbar-gem/issues/845
+      Rollbar.plugins.get('basic_socket').load_scoped!(true) do
+        with_adapter { MultiJson.dump(object, adapter_options) }
+      end
     end
 
     def load(string)

data/lib/rollbar/json/default.rb

@@ -1,7 +1,7 @@
 module Rollbar
   module JSON
     module Default
-      extend self
+      module_function
 
       def options
         {}