rollbar 2.11.2 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b3dd5cf42fcd51cbf8e354df6b7815fc6d2e7d
-  data.tar.gz: a1b1401b48c2bd8de38b903120968f88f2a86cd2
+  metadata.gz: f5851703f65adab5176d10107ece8d7c0aea9930
+  data.tar.gz: 27544951ae368273b0a9c43c2d992c0636561197
 SHA512:
-  metadata.gz: 9353bff1d406570707cc2eeea81134f825fbe71fbe7a77b8b28b2f07306fb767867e5745b1bd99a0b61dedbc00f50757696003e6de9a896528badaf71ccf347b
-  data.tar.gz: e689df62811ac61f8b33901f30c7a8793751153260f34c9ea030e3996b84101a20abbebb4c465a32ec6ea6b8d0b0b61dfec62a944e37d44e1078e69169d4bd3b
+  metadata.gz: a33f0936c4f77db669960680feba1f838e90262d033f9d5c5306dc9d74671e748c1aac35536d4ec4e35f3873e60537e130a8dcbdca60af3bc03cd39055997421
+  data.tar.gz: da71d51b05f98ee19d2dd75fdd451474587e16772b3718a77b92f29f3d5a74d7f0d0194ebd3abc4fda7fd5dff979ff78c1af975fec9fe2e9a9496e3e1fbd00fa

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.11.3
+
+Fix:
+
+- Don't rely on #as_json for delayed_job payload_object. See [#463](https://github.com/rollbar/rollbar-gem/pull/463).
+
 ## 2.11.2
 
 Fix:

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.11.2)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.11.3)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 [Rollbar](https://rollbar.com) is an error tracking service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.

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

@@ -7,10 +7,23 @@ class JobData
 
   def to_hash
     job_data = job.as_json
-    # Here job_data['handler'] is a YAML object comming
-    # from the storage backend
-    job_data['handler'] = job.payload_object.as_json
+    handler_parent = job_data['job'] ? job_data['job'] : job_data
+    handler_parent['handler'] = handler_data
 
     job_data
   end
+
+  private
+
+  def handler_data
+    object = job.payload_object.object
+
+    {
+      :method_name => job.payload_object.method_name,
+      :args => job.payload_object.args,
+      :object => object.is_a?(Class) ? object.name : object.to_s
+    }
+  rescue
+    {}
+  end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.11.2'
+  VERSION = '2.11.3'
 end

data/spec/rollbar/plugins/delayed_job_spec.rb

@@ -69,7 +69,20 @@ describe Rollbar::Delayed, :reconfigure_notifier => true do
     end
 
     context 'with attempts > configuration.dj_threshold' do
-      let(:job) { double(:attempts => 6) }
+      let(:object) do
+        double(:to_s => 'foo')
+      end
+      let(:payload_object) do
+        double(:method_name => 'foo',
+               :args => [1, 2],
+               :object => object)
+      end
+      let(:job) do
+        double(
+          :attempts => 6,
+          :job => { :payload_object => payload_object }
+        )
+      end
 
       it 'returns true' do
         expect(described_class.skip_report?(job)).to be(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.3
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json