rollbar 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cfe303ae73dcfd7cfaff61a78a3d189205b7bcc
-  data.tar.gz: 327509998ddc5c03907fd30190ac7f087de12187
+  metadata.gz: 1a432f94f474059f9731e64f22f23963c4b3926e
+  data.tar.gz: 0ccbc7ed06b952be8139592dcc7e40ca8ff396be
 SHA512:
-  metadata.gz: 95207004e19203386da2851e762a0301694e7e7d6385608cd2acdcc04076fb9c6ee0ba4be4ac8d37fcd1697936f5797d2559c92ba0a87b546db6c0cb4b4d7e0e
-  data.tar.gz: 70541207c0df4a50eac2ee39622ffb806f7561684ce1bdfcd9c8731fb0197411674adf058e2cb2deac4f02991336228f41162a963e9a7d29e0de0acb88682ea0
+  metadata.gz: 098d37ecd9ba8c011bc73fb23da48d90d19c70d123a455412ede696de8b22c369a76b3a80fb9d8874afc6c7ab3c2dadda2a205ad1b7e8430f3e68339d68b837d
+  data.tar.gz: ba67c227bd1f08f21943cfcfa58a043c0be64845d5e98b227456fac58caecb2713110322c1c10482d14ef2e490a12fcfaf7c2eb5b80c37a198211fd7e3460c72

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+**1.2.2**
+- Fix issue with delayed_job and Rollbar.report_exception (bug introduced in 1.2.0). See [#145](https://github.com/rollbar/rollbar-gem/issues/145)
+- Explicitly require 'rack' in request_data_extractor. See [#144](https://github.com/rollbar/rollbar-gem/pull/144)
+
 **1.2.1**
 - Revert change made as part of 1.2.0 where all procs in the payload would be evaluated. See [#143](https://github.com/rollbar/rollbar-gem/pull/143).
 

data/README.md

@@ -9,7 +9,7 @@ Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https:/
 
 Add this line to your application's Gemfile:
 
-    gem 'rollbar', '~> 1.2.0'
+    gem 'rollbar', '~> 1.2.1'
 
 And then execute:
 

data/lib/rollbar.rb

@@ -733,31 +733,30 @@ module Rollbar
 
     # Backwards compatibility methods
 
-    def report_exception(exception, request_data = {}, person_data = {}, level = 'error')
+    def report_exception(exception, request_data = nil, person_data = nil, level = 'error')
       Kernel.warn('[DEPRECATION] Rollbar.report_exception has been deprecated, please use log() or one of the level functions')
 
       scope = {}
-      scope[:request] = request_data if request_data && request_data.any?
-      scope[:person] = person_data if person_data && person_data.any?
+      scope[:request] = request_data if request_data
+      scope[:person] = person_data if person_data
 
       Rollbar.scoped(scope) do
         Rollbar.notifier.log(level, exception)
       end
     end
 
-    def report_message(message, level = 'info', extra_data = {})
+    def report_message(message, level = 'info', extra_data = nil)
       Kernel.warn('[DEPRECATION] Rollbar.report_message has been deprecated, please use log() or one of the level functions')
 
       Rollbar.notifier.log(level, message, extra_data)
     end
 
-    def report_message_with_request(message, level = 'info', request_data = {}, person_data = {}, extra_data = {})
+    def report_message_with_request(message, level = 'info', request_data = nil, person_data = nil, extra_data = nil)
       Kernel.warn('[DEPRECATION] Rollbar.report_message_with_request has been deprecated, please use log() or one of the level functions')
 
       scope = {}
-      scope[:request] = request_data if request_data && request_data.any?
-      scope[:person] = person_data if person_data && person_data.any?
-
+      scope[:request] = request_data if request_data
+      scope[:person] = person_data if person_data
 
       Rollbar.scoped(:request => request_data, :person => person_data) do
         Rollbar.notifier.log(level, message, extra_data)

data/lib/rollbar/request_data_extractor.rb

@@ -1,4 +1,5 @@
 require 'multi_json'
+require 'rack'
 
 module Rollbar
   module RequestDataExtractor
@@ -14,7 +15,7 @@ module Rollbar
     end
 
     def extract_request_data_from_rack(env)
-      rack_req = Rack::Request.new(env)
+      rack_req = ::Rack::Request.new(env)
 
       sensitive_params = sensitive_params_list(env)
       request_params = rollbar_filtered_params(sensitive_params, rollbar_request_params(env))

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/rollbar.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'genspec', '>= 0.2.7'
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'resque'
+  gem.add_development_dependency 'delayed_job'
 end

data/spec/rollbar/delayed_job_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'delayed_job'
+require 'rollbar/delayed_job'
+
+describe Rollbar::Delayed do
+  class FailingJob
+    class TestException < Exception; end
+
+    def perform
+      fail(TestException, 'failing')
+    end
+  end
+
+  module DummyBackend
+    class Job
+      include Delayed::Backend::Base
+
+      attr_accessor :handler, :attempts
+
+      def initialize(options = {})
+        @payload_object = options[:payload_object]
+        @attempts = 0
+      end
+    end
+  end
+
+  let(:logger) { Rollbar.logger }
+
+  before do
+    Rollbar::Delayed.wrap_worker
+    Delayed::Worker.delay_jobs = false
+    Delayed::Worker.backend = DummyBackend::Job
+  end
+
+  it 'sends the exception' do
+    expect do
+      Delayed::Job.enqueue(FailingJob.new)
+    end.to raise_error(FailingJob::TestException)
+
+    last_report = Rollbar.last_report
+    expect(last_report[:request]).to be_kind_of(DummyBackend::Job)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails plugin to catch and send exceptions to Rollbar
 email:
 - support@rollbar.com
@@ -267,6 +281,7 @@ files:
 - spec/rollbar/delay/girl_friday_spec.rb
 - spec/rollbar/delay/resque_spec.rb
 - spec/rollbar/delay/thread_spec.rb
+- spec/rollbar/delayed_job_spec.rb
 - spec/rollbar/logger_proxy_spec.rb
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb
@@ -358,6 +373,7 @@ test_files:
 - spec/rollbar/delay/girl_friday_spec.rb
 - spec/rollbar/delay/resque_spec.rb
 - spec/rollbar/delay/thread_spec.rb
+- spec/rollbar/delayed_job_spec.rb
 - spec/rollbar/logger_proxy_spec.rb
 - spec/rollbar/middleware/rack/builder_spec.rb
 - spec/rollbar/middleware/sinatra_spec.rb