rollbar 2.10.0 → 2.11.0

data/spec/rollbar/logger_proxy_spec.rb

@@ -6,6 +6,10 @@ describe Rollbar::LoggerProxy do
 
   subject { described_class.new(logger) }
 
+  before do
+    allow(Rollbar.configuration).to receive(:enabled).and_return(true)
+  end
+
   shared_examples 'delegate to logger' do
     it 'logs with correct level' do
       expect(logger).to receive(level).with(message)

data/spec/rollbar/{js/middleware_spec.rb → middleware/js_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'rollbar/js/middleware'
+require 'rollbar/middleware/js'
 
-describe Rollbar::Js::Middleware do
+describe Rollbar::Middleware::Js do
   subject { described_class.new(app, config) }
 
   let(:env) { {} }
@@ -97,7 +97,7 @@ END
         end
       end
 
-      context 'having a html 200 response and SecureHeaders defined' do
+      context 'having a html 200 response and SecureHeaders >= 3.0.0 defined' do
         let(:body) { [html] }
         let(:status) { 200 }
         let(:headers) do
@@ -106,9 +106,14 @@ END
 
         before do
           Object.const_set('SecureHeaders', Module.new)
+          SecureHeaders.const_set('VERSION', '3.0.0')
           allow(SecureHeaders).to receive(:content_security_policy_script_nonce) { 'lorem-ipsum-nonce' }
         end
 
+        after do
+          Object.send(:remove_const, 'SecureHeaders')
+        end
+
         it 'renders the snippet and config in the response with nonce in script tag when SecureHeaders installed' do
           res_status, res_headers, response = subject.call(env)
           new_body = response.body.join
@@ -116,9 +121,33 @@ END
           expect(new_body).to include('<script type="text/javascript" nonce="lorem-ipsum-nonce">')
           expect(new_body).to include("var _rollbarConfig = #{config[:options].to_json};")
           expect(new_body).to include(snippet)
+        end
+      end
+
+      context 'having a html 200 response and SecureHeaders < 3.0.0 defined' do
+        let(:body) { [html] }
+        let(:status) { 200 }
+        let(:headers) do
+          { 'Content-Type' => content_type }
+        end
 
+        before do
+          Object.const_set('SecureHeaders', Module.new)
+          SecureHeaders.const_set('VERSION', '2.4.0')
+        end
+
+        after do
           Object.send(:remove_const, 'SecureHeaders')
         end
+
+        it 'renders the snippet and config in the response without nonce in script tag when too old SecureHeaders installed' do
+          res_status, res_headers, response = subject.call(env)
+          new_body = response.body.join
+
+          expect(new_body).to include('<script type="text/javascript">')
+          expect(new_body).to include("var _rollbarConfig = #{config[:options].to_json};")
+          expect(new_body).to include(snippet)
+        end
       end
 
       context 'having a html 200 response without head', :add_js => false do

data/spec/rollbar/plugin_spec.rb

@@ -0,0 +1,147 @@
+require 'spec_helper'
+require 'rollbar/plugin'
+
+describe Rollbar::Plugin do
+  describe '#load!' do
+    subject { described_class.new(:plugin) }
+
+    before { subject.instance_eval(&plugin_proc) }
+
+    context 'with true dependencies' do
+      let(:dummy_object) { '' }
+      let(:plugin_proc) do
+        dummy = dummy_object
+
+        proc do
+          dependency do
+            true
+          end
+
+          dependency do
+            1 == 1.0
+          end
+
+          execute do
+            dummy.upcase
+          end
+
+          execute do
+            dummy.downcase
+          end
+        end
+      end
+
+      it 'calls the callables' do
+        expect(dummy_object).to receive(:upcase).once
+        expect(dummy_object).to receive(:downcase).once
+
+        subject.load!
+
+        expect(subject.loaded).to be_eql(true)
+      end
+    end
+
+    context 'with dependencies failing' do
+      let(:dummy_object) { '' }
+      let(:plugin_proc) do
+        dummy = dummy_object
+
+        proc do
+          dependency do
+            true
+          end
+
+          dependency do
+            raise StandardError.new('the-error')
+          end
+
+          execute do
+            dummy.upcase
+          end
+
+          execute do
+            dummy.downcase
+          end
+        end
+      end
+
+      it 'doesnt finish loading the plugin' do
+        expect(dummy_object).not_to receive(:upcase)
+        expect(dummy_object).not_to receive(:downcase)
+        expect(Rollbar).to receive(:log_error).with("Error trying to load plugin 'plugin': StandardError, the-error")
+
+        subject.load!
+
+        expect(subject.loaded).to be_eql(false)
+      end
+    end
+
+    context 'with callables failing' do
+      let(:dummy_object) { '' }
+      let(:plugin_proc) do
+        dummy = dummy_object
+
+        proc do
+          dependency do
+            true
+          end
+
+          dependency do
+            1 == 1.0
+          end
+
+          execute do
+            raise StandardError.new('the-error')
+          end
+
+          execute do
+            dummy.downcase
+          end
+        end
+      end
+
+      it 'doesnt finish loading the plugin' do
+        expect(dummy_object).not_to receive(:downcase)
+        expect(Rollbar).to receive(:log_error).with("Error trying to load plugin 'plugin': StandardError, the-error")
+
+        subject.load!
+
+        expect(subject.loaded).to be_eql(true)
+      end
+    end
+
+    context 'with false dependencies' do
+      let(:dummy_object) { '' }
+      let(:plugin_proc) do
+        dummy = dummy_object
+
+        proc do
+          dependency do
+            true
+          end
+
+          dependency do
+            1 == 2.0
+          end
+
+          execute do
+            dummy.upcase
+          end
+
+          execute do
+            dummy.downcase
+          end
+        end
+      end
+
+      it 'calls the callables' do
+        expect(dummy_object).not_to receive(:upcase)
+        expect(dummy_object).not_to receive(:downcase)
+
+        subject.load!
+
+        expect(subject.loaded).to be_eql(false)
+      end
+    end
+  end
+end

data/spec/rollbar/{active_job_spec.rb → plugins/active_job_spec.rb}

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 require 'active_support/rescuable'
-require 'rollbar/active_job'
 
 describe Rollbar::ActiveJob do
   class TestJob

data/spec/rollbar/{delayed_job_spec.rb → plugins/delayed_job_spec.rb}

@@ -1,8 +1,10 @@
 require 'spec_helper'
+require 'rollbar'
 require 'delayed_job'
-require 'rollbar/delayed_job'
 require 'delayed/backend/test'
 
+Rollbar.plugins.load!
+
 describe Rollbar::Delayed, :reconfigure_notifier => true do
   class FailingJob
     class TestException < Exception; end
@@ -12,11 +14,6 @@ describe Rollbar::Delayed, :reconfigure_notifier => true do
     end
   end
 
-  before(:all) do
-    # technically, this is called once when rollbar hooks are required
-    Rollbar::Delayed.wrap_worker!
-  end
-
   before do
     Delayed::Backend::Test.prepare_worker
 

data/spec/rollbar/{middleware/rack/builder_spec.rb → plugins/rack_spec.rb}

@@ -2,8 +2,9 @@ require 'spec_helper'
 require 'rack'
 require 'rack/builder'
 require 'rack/mock'
-require 'rollbar/middleware/rack/builder'
+require 'rollbar'
 
+Rollbar.plugins.load!
 
 describe Rollbar::Middleware::Rack::Builder, :reconfigure_notifier => true do
   class RackMockError < Exception; end

data/spec/rollbar/{js/frameworks/rails_spec.rb → plugins/rails_js_spec.rb}

@@ -11,7 +11,7 @@ describe ApplicationController, :type => 'request' do
   it 'renders the snippet and config in the response', :type => 'request' do
     get '/test_rollbar_js'
 
-    snippet_from_submodule = File.read(File.expand_path('../../../../../rollbar.js/dist/rollbar.snippet.js', __FILE__))
+    snippet_from_submodule = File.read(File.expand_path('../../../../rollbar.js/dist/rollbar.snippet.js', __FILE__))
 
     expect(response.body).to include("var _rollbarConfig = #{Rollbar::configuration.js_options.to_json};")
     expect(response.body).to include(snippet_from_submodule)

data/spec/rollbar/{rake_spec.rb → plugins/rake_spec.rb}

@@ -1,5 +1,6 @@
 require 'spec_helper'
-require 'rollbar/rake'
+
+Rollbar.plugins.load!
 
 describe Rollbar::Rake do
   let(:application) { Rake::Application.new }

data/spec/rollbar/{sidekiq_spec.rb → plugins/sidekiq_spec.rb}

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 unless RUBY_VERSION == '1.8.7'
   require 'sidekiq'
-  require 'rollbar/sidekiq'
 end
 
+Rollbar.plugins.load!
+
 describe Rollbar::Sidekiq, :reconfigure_notifier => false do
   describe '.handle_exception' do
     let(:msg_or_context) { ['hello', 'error_backtrace', 'backtrace', 'goodbye'] }

data/spec/rollbar/plugins/validations_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'rollbar'
+
+Rollbar.plugins.load!
+
+describe Rollbar::ActiveRecordExtension do
+  it 'has the extensions loaded into ActiveRecord::Base' do
+    expect(ActiveModel::Validations.ancestors).to include(described_class)
+    expect(ActiveModel::Validations.instance_methods.map(&:to_sym)).to include(:report_validation_errors_to_rollbar)
+  end
+
+  context 'with an ActiveRecord::Base instance' do
+    let(:user) { User.new }
+
+    it 'calls report_validation_errors_to_rollbar' do
+      expect(user).to receive(:report_validation_errors_to_rollbar)
+
+      user.valid?
+    end
+  end
+
+  context 'with class using ActiveModel::Validations' do
+    let(:post) { Post.new }
+
+    it 'calls report_validation_errors_to_rollbar' do
+      expect(post).to receive(:report_validation_errors_to_rollbar)
+
+      post.valid?
+    end
+  end
+
+  describe '#report_validation_errors_to_rollbar', :reconfigure_notifier => true do
+    context 'having validation errors' do
+      let(:user) { User.new }
+
+      it 'send the errors to Rollbar' do
+        expect(Rollbar).to receive(:warning)
+
+        user.valid?
+      end
+    end
+  end
+end

data/spec/rollbar/plugins_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'rollbar/plugins'
+require 'rollbar/plugin'
+
+describe Rollbar::Plugins do
+  let(:plugin_files_path) do
+    File.expand_path('../../fixtures/plugins/**/*.rb', __FILE__)
+  end
+  let!(:current_plugins) do
+    Rollbar.plugins
+  end
+
+  let(:plugin1_proc) do
+    proc do
+      dependency { true }
+    end
+  end
+
+  before do
+    Rollbar.plugins = nil
+    allow_any_instance_of(described_class).to receive(:plugin_files).and_return(plugin_files_path)
+  end
+
+  after do
+    Rollbar.plugins = current_plugins
+  end
+
+  describe '#require_all' do
+    it 'loads the plugins' do
+      expect(Rollbar.plugins).to receive(:define).with(:dummy1)
+      expect(Rollbar.plugins).to receive(:define).with(:dummy2)
+
+      subject.require_all
+    end
+  end
+
+  describe '#define' do
+    it 'evals the plugin DSL and adds it to the collection' do
+      expect_any_instance_of(Rollbar::Plugin).to receive(:dependency)
+      expect do
+        subject.define(:name, &plugin1_proc)
+      end.to change(subject.collection, :size).by(1)
+    end
+
+    context 'with a plugin already defined' do
+      it 'doesnt load the plugin twice' do
+        subject.define(:name, &plugin1_proc)
+
+        expect_any_instance_of(Rollbar::Plugin).not_to receive(:instance_eval)
+        expect do
+          subject.define(:name, &plugin1_proc)
+        end.to change(subject.collection, :size).by(0)
+      end
+    end
+  end
+
+  describe '#load!' do
+    before do
+      subject.define(:plugin1, &plugin1_proc)
+    end
+
+    it 'calls load! in the plugins' do
+      expect_any_instance_of(Rollbar::Plugin).to receive(:load!).once
+
+      subject.load!
+    end
+  end
+end

data/spec/rollbar/request_data_extractor_spec.rb

@@ -14,18 +14,64 @@ describe Rollbar::RequestDataExtractor do
     Rack::MockRequest.env_for('/', 'HTTP_HOST' => 'localhost:81', 'HTTP_X_FORWARDED_HOST' => 'example.org:9292')
   end
 
-  describe '#extract_request_data_from_rack' do
-    let(:scrubber) { double }
+  describe '#scrub_url' do
+    let(:url) { 'http://this-is-the-url.com/foobar?param1=value1' }
+    let(:sensitive_params) { [:param1, :param2] }
+    let(:scrub_fields) { [:password, :secret] }
 
-    it 'returns a Hash object' do
-      scrubber_config = {
-        :scrub_fields => kind_of(Array),
-        :scrub_user => Rollbar.configuration.scrub_user,
-        :scrub_password => Rollbar.configuration.scrub_password,
-        :randomize_scrub_length => Rollbar.configuration.randomize_scrub_length
+    before do
+      allow(Rollbar.configuration).to receive(:scrub_fields).and_return(scrub_fields)
+      allow(Rollbar.configuration).to receive(:scrub_user).and_return(true)
+      allow(Rollbar.configuration).to receive(:scrub_password).and_return(true)
+      allow(Rollbar.configuration).to receive(:randomize_secret_length).and_return(true)
+    end
+
+    it 'calls the scrubber with the correct options' do
+      expected_options = {
+        :url => url,
+        :scrub_fields => [:password, :secret, :param1, :param2],
+        :scrub_user => true,
+        :scrub_password => true,
+        :randomize_scrub_length => true
+      }
+
+      expect(Rollbar::Scrubbers::URL).to receive(:call).with(expected_options)
+
+      subject.scrub_url(url, sensitive_params)
+    end
+  end
+
+  describe '#scrub_params' do
+    let(:params) do
+      {
+        :param1 => 'value1',
+        :param2 => 'value2'
+      }
+    end
+    let(:sensitive_params) { [:param1, :param2] }
+    let(:scrub_fields) { [:password, :secret] }
+
+    before do
+      allow(Rollbar.configuration).to receive(:scrub_fields).and_return(scrub_fields)
+    end
+
+    it 'calls the scrubber with the correct options' do
+      expected_options = {
+        :params => params,
+        :config => scrub_fields,
+        :extra_fields => sensitive_params
       }
-      expect(Rollbar::Scrubbers::URL).to receive(:new).with(scrubber_config).and_return(scrubber)
-      expect(scrubber).to receive(:call).with(kind_of(String))
+
+      expect(Rollbar::Scrubbers::Params).to receive(:call).with(expected_options)
+
+      subject.scrub_params(params, sensitive_params)
+    end
+  end
+
+  describe '#extract_request_data_from_rack' do
+    it 'returns a Hash object' do
+      expect(Rollbar::Scrubbers::URL).to receive(:call).with(kind_of(Hash)).and_call_original
+      expect(Rollbar::Scrubbers::Params).to receive(:call).with(kind_of(Hash)).and_call_original.exactly(7)
 
       result = subject.extract_request_data_from_rack(env)