rollbar 2.7.1 → 2.8.0

data/spec/rollbar_spec.rb

@@ -39,7 +39,7 @@ describe Rollbar do
   end
 
   context 'Notifier' do
-    context 'log' do
+    describe '#log' do
       let(:exception) do
         begin
           foo = bar
@@ -50,7 +50,7 @@ describe Rollbar do
 
       let(:configuration) { Rollbar.configuration }
 
-      context 'executing a Thread before Rollbar is configured', :skip_dummy_rollbar => true do
+      context 'executing a Thread before Rollbar is configured' do
         before do
           Rollbar.reset_notifier!
           Rollbar.unconfigure
@@ -104,6 +104,236 @@ describe Rollbar do
       end
     end
 
+    context 'with before_process handlers in configuration' do
+      let!(:notifier) { Rollbar::Notifier.new }
+      let(:scope) { { :bar => :foo } }
+      let(:configuration) do
+        config = Rollbar::Configuration.new
+        config.enabled = true
+        config
+      end
+      let(:message) { 'message' }
+      let(:exception) { Exception.new }
+      let(:extra) { {:foo => :bar } }
+      let(:level) { 'error' }
+
+      before do
+        notifier.configuration = configuration
+        notifier.scope!(scope)
+      end
+
+      context 'without raise Rollbar::Ignore' do
+        let(:handler) do
+          proc do |options|
+
+          end
+        end
+
+        before do
+          configuration.before_process = handler
+        end
+
+        it 'calls the handler with the correct options' do
+          options = {
+            :level => level,
+            :scope => Rollbar::LazyStore.new(scope),
+            :exception => exception,
+            :message => message,
+            :extra => extra
+          }
+
+          expect(handler).to receive(:call).with(options)
+          expect(notifier).to receive(:report).with(level, message, exception, extra)
+
+          notifier.log(level, message, exception, extra)
+        end
+      end
+
+      context 'raising Rollbar::Ignore in the handler' do
+        let(:handler) do
+          proc do |options|
+            raise Rollbar::Ignore
+          end
+        end
+
+        before do
+          configuration.before_process = handler
+        end
+
+        it "calls the handler with correct options and doesn't call #report" do
+          options = {
+            :level => level,
+            :scope => Rollbar::LazyStore.new(scope),
+            :exception => exception,
+            :message => message,
+            :extra => extra
+          }
+          expect(handler).to receive(:call).with(options).and_call_original
+          expect(notifier).not_to receive(:report)
+
+          result = notifier.log(level, message, exception, extra)
+
+          expect(result).to be_eql('ignored')
+        end
+      end
+
+      context 'with 2 handlers, raising Rollbar::Ignore in the first one' do
+        let(:handler1) do
+          proc do |options|
+            raise Rollbar::Ignore
+          end
+        end
+
+        let(:handler2) do
+          proc do |options|
+
+          end
+        end
+
+        before do
+          configuration.before_process << handler1
+          configuration.before_process << handler2
+        end
+
+        it "calls only the first handler and doesn't calls #report" do
+          options = {
+            :level => level,
+            :scope => Rollbar::LazyStore.new(scope),
+            :exception => exception,
+            :message => message,
+            :extra => extra
+          }
+          expect(handler1).to receive(:call).with(options).and_call_original
+          expect(handler2).not_to receive(:call)
+          expect(notifier).not_to receive(:report)
+
+          result = notifier.log(level, message, exception, extra)
+
+          expect(result).to be_eql('ignored')
+        end
+
+        context 'if the first handler fails' do
+          let(:exception) { StandardError.new('foo') }
+          let(:handler1) do
+            proc { |options|  raise exception }
+          end
+
+          it 'doesnt call the second handler and logs the error' do
+            expect(handler2).not_to receive(:call)
+            expect(notifier).to receive(:log_error).with("[Rollbar] Error calling the `before_process` hook: #{exception}")
+
+            notifier.log(level, message, exception, extra)
+          end
+        end
+      end
+    end
+
+    context 'with transform handlers in configuration' do
+      let!(:notifier) { Rollbar::Notifier.new }
+      let(:scope) { { :bar => :foo } }
+      let(:configuration) do
+        config = Rollbar::Configuration.new
+        config.enabled = true
+        config
+      end
+      let(:message) { 'message' }
+      let(:exception) { Exception.new }
+      let(:extra) { {:foo => :bar } }
+      let(:level) { 'error' }
+
+      before do
+        notifier.configuration = configuration
+        notifier.scope!(scope)
+      end
+
+      context 'without mutation in payload' do
+        let(:handler) do
+          proc do |options|
+
+          end
+        end
+
+        before do
+          configuration.transform = handler
+        end
+
+        it 'calls the handler with the correct options' do
+          options = {
+            :level => level,
+            :scope => Rollbar::LazyStore.new(scope),
+            :exception => exception,
+            :message => message,
+            :extra => extra,
+            :payload => kind_of(Hash)
+          }
+          expect(handler).to receive(:call).with(options).and_call_original
+          expect(notifier).to receive(:schedule_payload).with(kind_of(Hash))
+
+          notifier.log(level, message, exception, extra)
+        end
+      end
+
+      context 'with mutation in payload' do
+        let(:new_payload) do
+          {
+            'access_token' => notifier.configuration.access_token,
+            'data' => {
+            }
+          }
+        end
+        let(:handler) do
+          proc do |options|
+            payload = options[:payload]
+
+            payload.replace(new_payload)
+          end
+        end
+
+        before do
+          configuration.transform = handler
+        end
+
+        it 'calls the handler with the correct options' do
+          options = {
+            :level => level,
+            :scope => Rollbar::LazyStore.new(scope),
+            :exception => exception,
+            :message => message,
+            :extra => extra,
+            :payload => kind_of(Hash)
+          }
+          expect(handler).to receive(:call).with(options).and_call_original
+          expect(notifier).to receive(:schedule_payload).with(new_payload)
+
+          notifier.log(level, message, exception, extra)
+        end
+      end
+
+      context 'with two handlers' do
+        let(:handler1) { proc { |options|} }
+        let(:handler2) { proc { |options|} }
+
+        before do
+          configuration.transform << handler1
+          configuration.transform << handler2
+        end
+
+        context 'and the first one fails' do
+          let(:exception) { StandardError.new('foo') }
+          let(:handler1) do
+            proc { |options|  raise exception }
+          end
+
+          it 'doesnt call the second handler and logs the error' do
+            expect(handler2).not_to receive(:call)
+            expect(notifier).to receive(:log_error).with("[Rollbar] Error calling the `transform` hook: #{exception}")
+
+            notifier.log(level, message, exception, extra)
+          end
+        end
+      end
+    end
+
     context 'debug/info/warning/error/critical' do
       let(:exception) do
         begin
@@ -243,7 +473,7 @@ describe Rollbar do
         notifier3.configuration.code_version.should == '456'
         notifier3.configuration.payload_options.should == {
           :a => 'a',
-          :b => {:c => 3, :d => 'd'},
+          :b => {:c => 'c'},
           :c => 'c'
         }
 
@@ -427,15 +657,24 @@ describe Rollbar do
           notifier.configure do |config|
             config.custom_data_method = custom_method
           end
-
-          expect(notifier).to receive(:report_custom_data_error).once.and_return(custom_data_report)
         end
 
         it 'doesnt crash the report' do
+          expect(notifier).to receive(:report_custom_data_error).once.and_return(custom_data_report)
           payload = notifier.send(:build_payload, 'info', 'message', nil, extra)
 
           expect(payload['data'][:body][:message][:extra]).to be_eql(expected_extra)
         end
+
+        context 'and for some reason the safely.error returns a String' do
+          it 'returns an empty Hash' do
+            allow_any_instance_of(Rollbar::Notifier).to receive(:error).and_return('ignored')
+
+            payload = notifier.send(:build_payload, 'info', 'message', nil, extra)
+
+            expect(payload['data'][:body][:message][:extra]).to be_eql(extra)
+          end
+        end
       end
 
       it 'should include project_gem_paths' do
@@ -1665,17 +1904,17 @@ describe Rollbar do
       { :foo => 'bar' }
     end
 
-    it 'changes payload options inside the block' do
+    it 'changes data in scope_object inside the block' do
       Rollbar.reset_notifier!
       configure
 
       current_notifier_id = Rollbar.notifier.object_id
 
       Rollbar.scoped(scope_options) do
-        configuration = Rollbar.notifier.configuration
+        scope_object = Rollbar.notifier.scope_object
 
         expect(Rollbar.notifier.object_id).not_to be_eql(current_notifier_id)
-        expect(configuration.payload_options).to be_eql(scope_options)
+        expect(scope_object).to be_eql(scope_options)
       end
 
       expect(Rollbar.notifier.object_id).to be_eql(current_notifier_id)
@@ -1696,7 +1935,7 @@ describe Rollbar do
       let(:block) do
         proc do
           Thread.new do
-            scope = Rollbar.notifier.configuration.payload_options
+            scope = Rollbar.notifier.scope_object
             Thread.main[:inner_scope] = scope
           end.join
         end
@@ -1722,10 +1961,10 @@ describe Rollbar do
     before { reconfigure_notifier }
 
     it 'adds the new scope to the payload options' do
-      configuration = Rollbar.notifier.configuration
+      scope_object = Rollbar.notifier.scope_object
       Rollbar.scope!(new_scope)
 
-      expect(configuration.payload_options).to be_eql(new_scope)
+      expect(scope_object).to be_eql(new_scope)
     end
   end
 
@@ -1799,6 +2038,28 @@ describe Rollbar do
     end
   end
 
+  describe '.preconfigure'do
+    before do
+      Rollbar.unconfigure
+      Rollbar.reset_notifier!
+    end
+
+    it 'resets the notifier' do
+      Rollbar.configure do |config|
+        config.access_token = 'foo'
+      end
+
+      Thread.new {}
+
+      Rollbar.preconfigure do |config|
+        config.root = 'bar'
+      end
+
+      notifier_config = Rollbar.notifier.configuration
+      expect(notifier_config.root).to be_eql('bar')
+    end
+  end
+
   # configure with some basic params
   def configure
     reconfigure_notifier

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ RSpec.configure do |config|
   config.formatter = 'documentation'
 
   config.use_transactional_fixtures = true
-  config.order = "random"
+  config.order = 'random'
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :truncation
@@ -44,12 +44,6 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
-  config.backtrace_exclusion_patterns = [/gems\/rspec-.*/]
 
-  if ENV['SKIP_DUMMY_ROLLBAR'] == 'true'
-    config.filter_run(:skip_dummy_rollbar => true)
-  else
-    config.filter_run_excluding(:skip_dummy_rollbar => true)
-  end
+  config.backtrace_exclusion_patterns = [/gems\/rspec-.*/]
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,14 +70,14 @@ dependencies:
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -215,6 +215,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -226,6 +228,8 @@ files:
 - UPGRADE_FROM_RATCHET.md
 - UPGRADING.md
 - bin/rollbar-rails-runner
+- data/rollbar.snippet.js
+- docs/configuration_options.md
 - gemfiles/rails30.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
@@ -253,11 +257,18 @@ files:
 - lib/rollbar/encoding/encoder.rb
 - lib/rollbar/encoding/legacy_encoder.rb
 - lib/rollbar/exception_reporter.rb
+- lib/rollbar/exceptions.rb
 - lib/rollbar/goalie.rb
+- lib/rollbar/js.rb
+- lib/rollbar/js/frameworks.rb
+- lib/rollbar/js/frameworks/rails.rb
+- lib/rollbar/js/middleware.rb
+- lib/rollbar/js/version.rb
 - lib/rollbar/json.rb
 - lib/rollbar/json/default.rb
 - lib/rollbar/json/oj.rb
 - lib/rollbar/language_support.rb
+- lib/rollbar/lazy_store.rb
 - lib/rollbar/logger_proxy.rb
 - lib/rollbar/middleware/rack/builder.rb
 - lib/rollbar/middleware/rack/test_session.rb
@@ -285,6 +296,7 @@ files:
 - lib/rollbar/util/hash.rb
 - lib/rollbar/util/ip_obfuscator.rb
 - lib/rollbar/version.rb
+- lib/tasks/tasks.rake
 - rollbar.gemspec
 - spec/cacert.pem
 - spec/controllers/home_controller_spec.rb
@@ -309,9 +321,11 @@ files:
 - 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
@@ -357,8 +371,11 @@ files:
 - spec/rollbar/delayed_job/job_data.rb
 - spec/rollbar/delayed_job_spec.rb
 - spec/rollbar/encoding/encoder_spec.rb
+- spec/rollbar/js/frameworks/rails_spec.rb
+- spec/rollbar/js/middleware_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/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
@@ -430,9 +447,11 @@ test_files:
 - 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
@@ -478,8 +497,11 @@ test_files:
 - spec/rollbar/delayed_job/job_data.rb
 - spec/rollbar/delayed_job_spec.rb
 - spec/rollbar/encoding/encoder_spec.rb
+- spec/rollbar/js/frameworks/rails_spec.rb
+- spec/rollbar/js/middleware_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/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb