Merge pull request #512 from rollbar/jon/delayed-job-sequel-as-json-e…

…rror

Delayed job fix on job serialization

lib/rollbar/plugins/delayed_job/job_data.rb

@@ -1,29 +1,48 @@
-class JobData
-  attr_reader :job
+module Rollbar
+  module Delayed
+    class JobData
+      attr_reader :job
 
-  def initialize(job)
-    @job = job
-  end
+      def initialize(job)
+        @job = job
+      end
 
-  def to_hash
-    job_data = job.as_json
-    handler_parent = job_data['job'] ? job_data['job'] : job_data
-    handler_parent['handler'] = handler_data
+      def to_hash
+        job_data = extract_job_data
 
-    job_data
-  end
+        handler_parent = job_data['job'] ? job_data['job'] : job_data
+        handler_parent['handler'] = handler_data
+
+        job_data
+      end
+
+      private
+
+      def extract_job_data
+        if job.respond_to?(:as_json)
+          job.as_json
+        else
+          Hash[job.to_hash.map { |k, v| [k.to_s, v] }]
+        end
+      end
+
+      def handler_data
+        payload_object = job.payload_object
 
-  private
+        return payload_object unless payload_object.respond_to?(:object)
 
-  def handler_data
-    object = job.payload_object.object
+        object_data(payload_object.object)
+      end
 
-    {
-      :method_name => job.payload_object.method_name,
-      :args => job.payload_object.args,
-      :object => object.is_a?(Class) ? object.name : object.to_s
-    }
-  rescue
-    {}
+      def object_data(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
   end
 end

spec/delayed/backend/test.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'delayed_job'
 require 'delayed/backend/base'
 
 # This code is taken from delayed_job/spec/delayed/backend/test.rb.

spec/rollbar/plugins/delayed_job/job_data.rb → spec/rollbar/plugins/delayed_job/job_data_spec.rb

@@ -1,8 +1,21 @@
 require 'spec_helper'
-
-require 'rollbar/delayed_job'
+require 'rollbar/plugins/delayed_job/job_data'
 require 'delayed/backend/test'
 
+# In delayed_job/lib/delayed/syck_ext.rb YAML.load_dj
+# is broken cause it's defined as an instance method
+# instead of module/class method. This is breaking
+# the tests for ruby 1.8.7
+if YAML.parser.class.name =~ /syck|yecht/i
+  module YAML
+    def self.load_dj(yaml)
+      # See https://github.com/dtao/safe_yaml
+      # When the method is there, we need to load our YAML like this...
+      respond_to?(:unsafe_load) ? load(yaml, :safe => false) : load(yaml)
+    end
+  end
+end
+
 describe Rollbar::Delayed::JobData do
   describe '#to_hash' do
     let(:handler) { { 'foo' => 'bar' } }