rollbar 2.15.5 → 2.15.6

data/lib/rollbar/middleware/js.rb

@@ -25,7 +25,7 @@ module Rollbar
         app_result = app.call(env)
 
         begin
-          return app_result unless add_js?(env, app_result[0], app_result[1])
+          return app_result unless add_js?(env, app_result[1])
 
           response_string = add_js(env, app_result[2])
           build_response(env, app_result, response_string)
@@ -40,8 +40,8 @@ module Rollbar
         !!config[:enabled]
       end
 
-      def add_js?(env, status, headers)
-        enabled? && status == 200 && !env[JS_IS_INJECTED_KEY] &&
+      def add_js?(env, headers)
+        enabled? && !env[JS_IS_INJECTED_KEY] &&
           html?(headers) && !attachment?(headers) && !streaming?(env)
       end
 
@@ -65,10 +65,10 @@ module Rollbar
 
         return nil unless body
 
-        head_open_end = find_end_of_head_open(body)
-        return nil unless head_open_end
+        insert_after_idx = find_insertion_point(body)
+        return nil unless insert_after_idx
 
-        build_body_with_js(env, body, head_open_end)
+        build_body_with_js(env, body, insert_after_idx)
       rescue => e
         Rollbar.log_error("[Rollbar] Rollbar.js could not be added because #{e} exception")
         nil
@@ -91,9 +91,15 @@ module Rollbar
           body[head_open_end + 1..-1]
       end
 
-      def find_end_of_head_open(body)
-        head_open = body.index(/<head\W/)
-        body.index('>', head_open) if head_open
+      def find_insertion_point(body)
+        find_end_after_regex(body, /<meta\s*charset=/i) ||
+          find_end_after_regex(body, /<meta\s*http-equiv="Content-Type"/i) ||
+          find_end_after_regex(body, /<head\W/i)
+      end
+
+      def find_end_after_regex(body, regex)
+        open_idx = body.index(regex)
+        body.index('>', open_idx) if open_idx
       end
 
       def join_body(response)

data/lib/rollbar/notifier.rb

@@ -107,6 +107,11 @@ module Rollbar
     # will become the associated exception for the report. The last hash
     # argument will be used as the extra data for the report.
     #
+    # If the extra hash contains a symbol key :custom_data_method_context
+    # the value of the key will be used as the context for
+    # configuration.custom_data_method and will be removed from the extra
+    # hash.
+    #
     # @example
     #   begin
     #     foo = bar
@@ -123,7 +128,7 @@ module Rollbar
     def log(level, *args)
       return 'disabled' unless configuration.enabled
 
-      message, exception, extra = extract_arguments(args)
+      message, exception, extra, context = extract_arguments(args)
       use_exception_level_filters = use_exception_level_filters?(extra)
 
       return 'ignored' if ignored?(exception, use_exception_level_filters)
@@ -141,7 +146,7 @@ module Rollbar
                                      use_exception_level_filters)
 
       begin
-        report(level, message, exception, extra)
+        report(level, message, exception, extra, context)
       rescue StandardError, SystemStackError => e
         report_internal_error(e)
 
@@ -327,18 +332,26 @@ module Rollbar
       message = nil
       exception = nil
       extra = nil
+      context = nil
 
       args.each do |arg|
         if arg.is_a?(String)
           message = arg
         elsif arg.is_a?(Exception)
           exception = arg
+        elsif RUBY_PLATFORM == 'java' && arg.is_a?(java.lang.Exception)
+          exception = arg
         elsif arg.is_a?(Hash)
           extra = arg
+          
+          context = extra[:custom_data_method_context]
+          extra.delete :custom_data_method_context
+          
+          extra = nil if extra.empty?
         end
       end
 
-      [message, exception, extra]
+      [message, exception, extra, context]
     end
 
     def lookup_exception_level(orig_level, exception, use_exception_level_filters)
@@ -369,14 +382,14 @@ module Rollbar
       end
     end
 
-    def report(level, message, exception, extra)
+    def report(level, message, exception, extra, context)
       unless message || exception || extra
         log_error '[Rollbar] Tried to send a report with no message, exception or extra data.'
 
         return 'error'
       end
 
-      item = build_item(level, message, exception, extra)
+      item = build_item(level, message, exception, extra, context)
 
       return 'ignored' if item.ignored?
 
@@ -396,7 +409,7 @@ module Rollbar
       log_error '[Rollbar] Reporting internal error encountered while sending data to Rollbar.'
 
       begin
-        item = build_item('error', nil, exception, :internal => true)
+        item = build_item('error', nil, exception, { :internal => true }, nil)
       rescue => e
         send_failsafe('build_item in exception_data', e)
         return
@@ -419,7 +432,7 @@ module Rollbar
 
     ## Payload building functions
 
-    def build_item(level, message, exception, extra)
+    def build_item(level, message, exception, extra, context)
       options = {
         :level => level,
         :message => message,
@@ -428,7 +441,8 @@ module Rollbar
         :configuration => configuration,
         :logger => logger,
         :scope => scope_object,
-        :notifier => self
+        :notifier => self,
+        :context => context
       }
 
       item = Item.new(options)

data/lib/rollbar/plugins/delayed_job/plugin.rb

@@ -11,7 +11,8 @@ module Rollbar
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job, &Delayed::invoke_job_callback)
         lifecycle.after(:failure) do |_, job, _, _|
-          Delayed.report(job.last_error, job)
+          data = Rollbar::Delayed.build_job_data(job)
+          ::Rollbar.scope(:request => data).error(job.last_error, :use_exception_level_filters => true) if job.last_error
         end
       end
     end

data/lib/rollbar/request_data_extractor.rb

@@ -176,7 +176,12 @@ module Rollbar
       return {} unless correct_method
       return {} unless json_request?(rack_req)
 
-      Rollbar::JSON.load(rack_req.body.read)
+      raw_body = rack_req.body.read
+      begin
+        Rollbar::JSON.load(raw_body)
+      rescue
+        raw_body
+      end
     rescue
       {}
     ensure

data/lib/rollbar/tasks/rollbar.cap

@@ -28,9 +28,34 @@ namespace :rollbar do
       info 'Rollbar notification complete.'
     end
   end
+
+  desc 'Upload sourcemaps to Rollbar.'
+  task :sourcemap do
+    on primary fetch(:rollbar_role) do
+      info "Uploading source maps from #{fetch(:rollbar_sourcemaps_target_dir)}"
+      warn("You need to upgrade capistrano to '>= 3.1' version in order to correctly upload sourcemaps to Rollbar. (On 3.0, the reported revision will be incorrect.)") if Capistrano::VERSION =~ /^3\.0/
+      url_base = fetch(:rollbar_sourcemaps_minified_url_base)
+      unless url_base
+        warn "No #{rollbar_sourcemaps_minified_url_base} was specified. Sourcemaps won't be uploaded."
+        return
+      end
+      url_base = "http://#{url_base}" unless url_base.index(/https?:\/\//)
+      within release_path do
+        within 'public' do
+          source_maps = capture(:find, '-name', "'*.js.map'").split("\n")
+          source_maps = source_maps.map { |file| file.gsub(/^\.\//, '') }
+          source_maps.each do |source_map|
+            minified_url = File.join(url_base, source_map)
+            execute(:curl, *%W(https://api.rollbar.com/api/1/sourcemap -F access_token=#{fetch(:rollbar_token)} -F version=#{fetch(:rollbar_revision)} -F minified_url=#{minified_url} -F source_map=@./#{source_map}))
+          end
+        end
+      end
+    end
+  end
 end
 
 namespace :deploy do
+  after 'deploy:compile_assets', 'rollbar:sourcemap'
   after 'deploy:finished', 'rollbar:deploy'
 end
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.15.5'
+  VERSION = '2.15.6'
 end

data/spec/controllers/home_controller_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 
+def wrap_process_args(*args)
+  if ::Gem::Version.new(::Rails.version) >= ::Gem::Version.new('5.0')
+    [{ :params => args[0], :headers => args[1] }]
+  else
+    args
+  end
+end
+
 describe HomeController do
   let(:logger_mock) { double("Rails.logger").as_null_object }
   let(:notifier) { Rollbar.notifier }
@@ -20,7 +28,7 @@ describe HomeController do
 
   context "rollbar base_data" do
     it 'should have the Rails environment' do
-      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil)
+      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil, nil)
       data['data'][:environment].should == ::Rails.env
     end
 
@@ -29,7 +37,7 @@ describe HomeController do
         config.environment = 'dev'
       end
 
-      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil)
+      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil, nil)
       data['data'][:environment].should == 'dev'
     end
 
@@ -37,7 +45,7 @@ describe HomeController do
       old_env, ::Rails.env = ::Rails.env, ''
       preconfigure_rails_notifier
 
-      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil)
+      data = Rollbar.notifier.send(:build_item, 'error', 'message', nil, nil, nil)
       data['data'][:environment].should == 'unspecified'
 
       ::Rails.env = old_env
@@ -193,7 +201,7 @@ describe HomeController do
         :secret_token => "f6805fea1cae0fb79c5e63bbdcd12bc6",
       }
 
-      post '/report_exception', params
+      post '/report_exception', *wrap_process_args(params)
 
       filtered = Rollbar.last_report[:request][:POST]
 
@@ -216,7 +224,7 @@ describe HomeController do
         :notpass => "hidden"
       }
 
-      post '/report_exception', params
+      post '/report_exception', *wrap_process_args(params)
 
       filtered = Rollbar.last_report[:request][:POST]
 
@@ -248,7 +256,7 @@ describe HomeController do
     it "should raise a NameError and have PUT params in the reported exception" do
       logger_mock.should_receive(:info).with('[Rollbar] Success')
 
-      put '/report_exception', { :putparam => "putval" }
+      put '/report_exception', *wrap_process_args({ :putparam => "putval" })
 
       Rollbar.last_report.should_not be_nil
       Rollbar.last_report[:request][:POST]["putparam"].should == "putval"
@@ -258,7 +266,7 @@ describe HomeController do
       it 'reports the errors successfully' do
         logger_mock.should_receive(:info).with('[Rollbar] Success')
 
-        put '/deprecated_report_exception', { :putparam => "putval" }
+        put '/deprecated_report_exception', *wrap_process_args({ :putparam => "putval" })
 
         Rollbar.last_report.should_not be_nil
         Rollbar.last_report[:request][:POST]["putparam"].should == "putval"
@@ -270,7 +278,7 @@ describe HomeController do
       @request.env["HTTP_ACCEPT"] = "application/json"
 
       params = { :jsonparam => 'jsonval' }.to_json
-      post '/report_exception', params, { 'CONTENT_TYPE' => 'application/json' }
+      post '/report_exception', *wrap_process_args(params, { 'CONTENT_TYPE' => 'application/json' })
 
       Rollbar.last_report.should_not be_nil
       expect(Rollbar.last_report[:request][:body]).to be_eql(params)
@@ -328,7 +336,7 @@ describe HomeController do
         before { cookies[:session_id] = user.id }
 
         it 'sends the current user data' do
-          put '/report_exception', { 'foo' => 'bar' }
+          put '/report_exception', *wrap_process_args({ 'foo' => 'bar' })
 
           person_data = Rollbar.last_report[:person]
 
@@ -342,7 +350,7 @@ describe HomeController do
 
   context 'with routing errors', :type => :request do
     it 'raises a RoutingError exception' do
-      expect { get '/foo/bar', { :foo => :bar } }.to raise_exception(ActionController::RoutingError)
+      expect { get '/foo/bar', *wrap_process_args({ :foo => :bar }) }.to raise_exception(ActionController::RoutingError)
 
       report = Rollbar.last_report
       expect(report[:request][:GET]['foo']).to be_eql('bar')
@@ -365,7 +373,7 @@ describe HomeController do
 
     context 'with a single upload' do
       it "saves attachment data" do
-        expect { post '/file_upload', { :upload => file1 } }.to raise_exception(NameError)
+        expect { post '/file_upload', *wrap_process_args({ :upload => file1 }) }.to raise_exception(NameError)
 
         upload_param = Rollbar.last_report[:request][:POST]['upload']
 
@@ -380,7 +388,7 @@ describe HomeController do
 
     context 'with multiple uploads', :type => :request do
       it "saves attachment data for all uploads" do
-        expect { post '/file_upload', { :upload => [file1, file2] } }.to raise_exception(NameError)
+        expect { post '/file_upload', *wrap_process_args({ :upload => [file1, file2] }) }.to raise_exception(NameError)
         sent_params = Rollbar.last_report[:request][:POST]['upload']
 
         expect(sent_params).to be_kind_of(Array)
@@ -406,7 +414,7 @@ describe HomeController do
 
     it 'parses the correct headers' do
       expect do
-        post '/cause_exception', params, { 'ACCEPT' => 'application/vnd.github.v3+json' }
+        post '/cause_exception', *wrap_process_args(params, { 'ACCEPT' => 'application/vnd.github.v3+json' })
       end.to raise_exception(NameError)
 
       expect(Rollbar.last_report[:request][:POST]['foo']).to be_eql('bar')
@@ -429,7 +437,7 @@ describe HomeController do
     end
 
     it 'scrubs sensible data from URL' do
-      expect { get '/cause_exception', { :password => 'my-secret-password' }, headers }.to raise_exception(NameError)
+      expect { get '/cause_exception', *wrap_process_args({ :password => 'my-secret-password' }, headers) }.to raise_exception(NameError)
 
       request_data = Rollbar.last_report[:request]
 

data/spec/dummyapp/app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_filter :authenticate_user!
+  respond_to?(:before_action) ? (before_action :authenticate_user!) : (before_filter :authenticate_user!)
 
   def index
     @users = User.all

data/spec/rollbar/item_spec.rb

@@ -20,6 +20,7 @@ describe Rollbar::Item do
   let(:exception) {}
   let(:extra) {}
   let(:scope) {}
+  let(:context) {}
 
   let(:options) do
     {
@@ -30,7 +31,8 @@ describe Rollbar::Item do
       :configuration => configuration,
       :logger => logger,
       :scope => scope,
-      :notifier => notifier
+      :notifier => notifier,
+      :context => context
     }
   end
 
@@ -120,6 +122,47 @@ describe Rollbar::Item do
       payload['data'][:body][:message][:extra][:a].should == 1
       payload['data'][:body][:message][:extra][:b][2].should == 4
     end
+    
+    context do
+      let(:context) { { :controller => "ExampleController" } }
+    
+      it 'should have access to the context in custom_data_method' do
+        configuration.custom_data_method = lambda do |message, exception, context|
+          { :result => "MyApp#" + context[:controller] }
+        end
+  
+        payload['data'][:body][:message][:extra].should_not be_nil
+        payload['data'][:body][:message][:extra][:result].should == "MyApp#"+context[:controller]
+      end
+      
+      it 'should not include data passed in :context if there is no custom_data_method configured' do
+        configuration.custom_data_method = nil
+  
+        payload['data'][:body][:message][:extra].should be_nil
+      end
+      
+      it 'should have access to the message in custom_data_method' do
+        configuration.custom_data_method = lambda do |message, exception, context|
+          { :result => "Transformed in custom_data_method: " + message }
+        end
+        
+        payload['data'][:body][:message][:extra].should_not be_nil
+        payload['data'][:body][:message][:extra][:result].should == "Transformed in custom_data_method: " + message
+      end
+      
+      context do
+        let(:exception) { Exception.new "Exception to test custom_data_method" }
+        
+        it 'should have access to the current exception in custom_data_method' do
+          configuration.custom_data_method = lambda do |message, exception, context|
+            { :result => "Transformed in custom_data_method: " + exception.message }
+          end
+          
+          payload['data'][:body][:trace][:extra].should_not be_nil
+          payload['data'][:body][:trace][:extra][:result].should == "Transformed in custom_data_method: " + exception.message
+        end
+      end
+    end
 
     context do
       let(:extra) do

data/spec/rollbar/logger_spec.rb

@@ -58,6 +58,16 @@ describe Rollbar::Logger do
         subject.add(10, message)
       end
     end
+
+    context 'without active_support/core_ext/object/blank' do
+      let(:message) { 'foo'.tap { |message| message.instance_eval('undef :blank?') } }
+
+      it 'calls Rollbar to send the message' do
+        expect_any_instance_of(Rollbar::Notifier).to receive(:log).with(:error, message)
+
+        subject.add(Logger::ERROR, message)
+      end
+    end
   end
 
   describe '#<<' do

data/spec/rollbar/middleware/js_spec.rb

@@ -27,6 +27,35 @@ END
   let(:minified_html) do
     <<-END
 <html><head><link rel="stylesheet" href="url" type="text/css" media="screen" /><script type="text/javascript" src="foo"></script></head><body><h1>Testing the middleware</h1></body></html>
+END
+  end
+  let(:meta_charset_html) do
+    <<-END
+<html>
+  <head>
+    <meta charset="UTF-8"/>
+    <link rel="stylesheet" href="url" type="text/css" media="screen" />
+    <script type="text/javascript" src="foo"></script>
+  </head>
+  <body>
+    <h1>Testing the middleware</h1>
+  </body>
+</html>
+END
+  end
+  let(:meta_content_html) do
+    <<-END
+<html>
+  <head>
+    <meta content="origin" id="mref" name="referrer">
+    <link rel="stylesheet" href="url" type="text/css" media="screen" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <script type="text/javascript" src="foo"></script>
+  </head>
+  <body>
+    <h1>Testing the middleware</h1>
+  </body>
+</html>
 END
   end
   let(:snippet) { 'THIS IS THE SNIPPET' }
@@ -97,6 +126,46 @@ END
         end
       end
 
+      context 'having a html 200 resposne with meta charset tag' do
+        let(:body) { [meta_charset_html] }
+        let(:status) { 200 }
+        let(:headers) do
+          { 'Content-Type' => content_type }
+        end
+        it 'adds the config and the snippet to the response' do
+          res_status, res_headers, response = subject.call(env)
+          new_body = response.body.join
+
+          expect(new_body).to_not include('>>')
+          expect(new_body).to include(snippet)
+          expect(new_body).to include(config[:options].to_json)
+          expect(res_status).to be_eql(status)
+          expect(res_headers['Content-Type']).to be_eql(content_type)
+          meta_tag = '<meta charset="UTF-8"/>'
+          expect(new_body.index(snippet)).to be > new_body.index(meta_tag)
+        end
+      end
+
+      context 'having a html 200 resposne with meta content-type tag' do
+        let(:body) { [meta_content_html] }
+        let(:status) { 200 }
+        let(:headers) do
+          { 'Content-Type' => content_type }
+        end
+        it 'adds the config and the snippet to the response' do
+          res_status, res_headers, response = subject.call(env)
+          new_body = response.body.join
+
+          expect(new_body).to_not include('>>')
+          expect(new_body).to include(snippet)
+          expect(new_body).to include(config[:options].to_json)
+          expect(res_status).to be_eql(status)
+          expect(res_headers['Content-Type']).to be_eql(content_type)
+          meta_tag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>'
+          expect(new_body.index(snippet)).to be > new_body.index(meta_tag)
+        end
+      end
+
       context 'having a html 200 response and SecureHeaders >= 3.0.0 defined' do
         let(:body) { [html] }
         let(:status) { 200 }