rollbar 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92f097c75f3cb5932b906b826e27419c976f21a2
-  data.tar.gz: 428482c69eefc4a6a98edd0b2c6d549f45d816b4
+  metadata.gz: bbb658a771dc1cbad8de7954d57946917e118850
+  data.tar.gz: 105c6f0298070083eabd46665a6311331c40918f
 SHA512:
-  metadata.gz: d247e87607a92f30fb146b8ddb07b86f7cc1ffe6224d55a84643c087cb32909fc550e3629a77066126dd7437fbda15433cef398425746ff73cde30f2069e5fbf
-  data.tar.gz: 1584aeb1cf872ab96222d7dc77b2ee6fd40fe1b2c5a152db92294e6a9796b89bf9e825990766859b957bb15d75938c57000b31004be607b50a67b849b7380a8a
+  metadata.gz: 792ff9b09527b95a6bd284da0df1fea31671fe2cd2140d2aac334edf3e5009af703ef57d4ff03d37c1137b7967d406bc307269b987b4cca81c0d3fe9ae3d545f
+  data.tar.gz: e9b9cc45ed82b74a4bc02189c86dd2a27f5644108615f2d33bc72b7a5d4c291bdbf54328be4a4cb2ea2515c541d41c3b226a7e5dc57634bc96f6007b320907ff

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.11.6**
+- Adding new middleware that grabs possible database-hitting person data before the rake connection pool cleanup middleware
+
 **0.11.5**
 - Fix rake test task when Authlogic is present
 

data/lib/rollbar/middleware/rails/rollbar_request_store.rb

@@ -0,0 +1,25 @@
+module Rollbar
+  module Middleware
+    module Rails
+      # Middleware that ensures any database calls to load data for exception reports
+      # are done before connections are cleaned up by the rake connection pool middleware
+      class RollbarRequestStore
+        def initialize(app)
+          @app = app
+        end
+        
+        def call(env)
+          begin
+            @app.call(env)
+          rescue
+            controller = env["action_controller.instance"]
+            if controller
+              env['rollbar.person_data'] = controller.try(Rollbar.configuration.person_method)
+            end
+            raise
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rollbar/railtie.rb

@@ -6,6 +6,12 @@ module Rollbar
     rake_tasks do
       require 'rollbar/rake_tasks'
     end
+    
+    initializer 'rollbar.middleware.rails' do |app|
+      require 'rollbar/middleware/rails/rollbar_request_store'
+      app.config.middleware.insert_after ActiveRecord::ConnectionAdapters::ConnectionManagement,
+        Rollbar::Middleware::Rails::RollbarRequestStore
+    end
 
     config.after_initialize do
       Rollbar.configure do |config|

data/lib/rollbar/request_data_extractor.rb

@@ -6,8 +6,7 @@ module Rollbar
     ].freeze
 
     def extract_person_data_from_controller(env)
-      controller = env['action_controller.instance']
-      person_data = controller ? controller.try(:rollbar_person_data) : {}
+      person_data = env['rollbar.person_data'] || {}
     end
 
     def extract_request_data_from_rack(env)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

data/spec/controllers/home_controller_spec.rb

@@ -278,6 +278,18 @@ describe HomeController do
         
         get 'cause_exception'
       end
+      
+      it 'rollbar request store should extract person data and put it into the reqest' do
+        Rollbar.configure do |config|
+          config.person_method = 'custom_current_user'
+        end
+        
+        get 'cause_exception'
+        
+        user = request.env['rollbar.person_data']
+        user.id.should == 123
+        user.name.should == 'test'
+      end
     end
   end
 

data/spec/dummyapp/app/controllers/home_controller.rb

@@ -22,4 +22,11 @@ class HomeController < ApplicationController
   def current_user
     User.find_by_encrypted_password(cookies[:session_id])
   end
+  
+  def custom_current_user
+    user = User.new
+    user.id = 123
+    user.name = 'test'
+    user
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Brian Rue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -157,6 +157,7 @@ files:
 - lib/rollbar/goalie.rb
 - lib/rollbar/middleware/rack/builder.rb
 - lib/rollbar/middleware/rack/test_session.rb
+- lib/rollbar/middleware/rails/rollbar_request_store.rb
 - lib/rollbar/middleware/rails/show_exceptions.rb
 - lib/rollbar/rack.rb
 - lib/rollbar/rails.rb