rollbar 0.12.3 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44e090d61a9b70d5cbb17870bc0f5e34c95968db
-  data.tar.gz: 39ff1049102e01994034bc3d16abc56b51a85a46
+  metadata.gz: 23c9d47e5d49503a01978ee4d8e4fa00816522de
+  data.tar.gz: fecba94515d4ed5a804d735d73b54dcdb048edd3
 SHA512:
-  metadata.gz: 219ca368775abdeca9960080e684356f29994929f64091e9e1a7b76e620e0fe1e460c4fb9bd51dd900253c7778bae7a71f3a315fc590d7d45ad4fb310cdefa45
-  data.tar.gz: 2bc902e4f9a8cfecbb2a37cd2e198ab309c0dcb4a68f8e6c7b14ffe0530eaf01a455c44df58d2755aa6238d1c9e2392c4d70c649e86faac4e8d5bd2247de0ff1
+  metadata.gz: 5cbab0b59a0cc48c1798c976d3891068a8ce43ed5c3b2419323adb7cd11f79fadf14577448f86890f08a5358284ed123211f585e4c08c3af95a66e835414db17
+  data.tar.gz: 022d97884a1ff339520f7492ce22fedc77536a710588b47ba2cf37a75e6646fb08d515a2edfeee5eac94040c6afd1a8c5fb3e360d14f2e8d215f1f3228414e74

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+**0.12.5**
+- Fixed SIGSEGV with the delayed_job plugin and Ruby 2.1.0
+
+**0.12.4**
+- Record controller context (controller#action) in reported items
+
 **0.12.3**
 - Change rollbar_request_store middleware to only grab required person data properties by using rollbar_person_data
 

data/lib/rollbar.rb

@@ -79,8 +79,13 @@ module Rollbar
 
       data = exception_data(exception, level ? level : filtered_level(exception))
       if request_data
+        if request_data[:route]
+          data[:context] = request_data[:route][:controller] + '#' + request_data[:route][:action]
+        end
+        
         request_data[:env].reject!{|k, v| v.is_a?(IO) } if request_data[:env]
         data[:request] = request_data
+        
       end
       data[:person] = person_data if person_data
 

data/lib/rollbar/delayed_job.rb

@@ -3,19 +3,13 @@
 module Delayed
   module Plugins
     class Rollbar < Plugin
-      module ReportErrors
-        def error(job, error)
-          # send the job object as the 'request data'
-          ::Rollbar.report_exception(error, job)
-          super if defined?(super)
-        end
-      end
-
       callbacks do |lifecycle|
-        lifecycle.before(:invoke_job) do |job|
-          payload = job.payload_object
-          payload = payload.object if payload.is_a? Delayed::PerformableMethod
-          payload.extend ReportErrors
+        lifecycle.around(:invoke_job) do |job, *args, &block|
+          begin
+            block.call(job, *args)
+          rescue Exception => e
+            ::Rollbar.report_exception(e, job)
+          end
         end
       end
     end

data/lib/rollbar/request_data_extractor.rb

@@ -25,6 +25,7 @@ module Rollbar
       post_params = rollbar_filtered_params(sensitive_params, rollbar_post_params(rack_req))
       cookies = rollbar_filtered_params(sensitive_params, rollbar_request_cookies(rack_req))
       session = rollbar_filtered_params(sensitive_params, env['rack.session.options'])
+      route_params = rollbar_filtered_params(sensitive_params, rollbar_route_params(env))
       
       params = request_params.merge(get_params).merge(post_params)
       
@@ -35,7 +36,8 @@ module Rollbar
         :headers => rollbar_headers(env),
         :cookies => cookies,
         :session => session,
-        :method => rollbar_request_method(env)
+        :method => rollbar_request_method(env),
+        :route => route_params
       }
     end
 
@@ -93,12 +95,16 @@ module Rollbar
     end
 
     def rollbar_request_params(env)
+      env['action_dispatch.request.parameters'] || {}
+    end
+    
+    def rollbar_route_params(env)
       route = ::Rails.application.routes.recognize_path(env['PATH_INFO']) rescue {}
       {
         :controller => route[:controller],
         :action => route[:action],
-        :format => route[:format],
-      }.merge(env['action_dispatch.request.parameters'] || {})
+        :format => route[:format]
+      }
     end
     
     def rollbar_request_cookies(rack_req)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.12.3"
+  VERSION = "0.12.5"
 end

data/spec/controllers/home_controller_spec.rb

@@ -49,6 +49,7 @@ describe HomeController do
       data.should have_key(:headers)
       data.should have_key(:session)
       data.should have_key(:method)
+      data.should have_key(:route)
     end
 
     it "should build empty person data when no one is logged-in" do
@@ -205,6 +206,31 @@ describe HomeController do
         controller.send(:rollbar_request_data)[:user_ip].should == '0.0.0.0'
       end
     end
+    
+    context "rollbar_route_params" do
+      it "should save route params in request[:route]" do
+        route = controller.send(:rollbar_request_data)[:route]
+        
+        route.should have_key(:controller)
+        route.should have_key(:action)
+        route.should have_key(:format)
+        
+        route[:controller].should == 'home'
+        route[:action].should == 'index'
+      end
+      
+      it "should save controller and action in the payload body" do
+        post 'report_exception'
+        
+        route = controller.send(:rollbar_request_data)[:route]
+        
+        route[:controller].should == 'home'
+        route[:action].should == 'report_exception'
+        
+        Rollbar.last_report.should_not be_nil
+        Rollbar.last_report[:context].should == 'home#report_exception'
+      end
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.5
 platform: ruby
 authors:
 - Brian Rue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json