airbrake_user_attributes 0.1.1 → 0.1.2

data/airbrake_user_attributes.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("sham_rack",     "~> 1.3.0")
   s.add_development_dependency("shoulda",       "~> 2.11.3")
 
-  s.add_dependency 'airbrake',           '>= 3.0.9'
+  s.add_dependency 'airbrake',           '3.0.9'
 
 end

data/lib/airbrake/current_user.rb

@@ -0,0 +1,21 @@
+module Airbrake
+  module CurrentUser
+
+    # Returns filtered attributes for current user
+    def self.filtered_attributes(controller)
+      return {} unless controller.respond_to?(:current_user, true)
+      user = controller.send(:current_user)
+      # Removes auth-related fields
+      attributes = user.attributes.reject do |k, v|
+        /password|token|login|sign_in|per_page|_at$/ =~ k
+      end
+      # Try to include a URL for the user, if possible.
+      if url_method = [:user_url, :admin_user_url].detect {|m| controller.respond_to?(m) }
+        attributes[:url] = controller.send(url_method, user)
+      end
+      # Return all keys with non-blank values
+      attributes.select {|k,v| v.present? }
+    end
+
+  end
+end

data/lib/airbrake_overrides/airbrake.rb

@@ -0,0 +1,14 @@
+module Airbrake
+  class << self
+    private
+
+    def build_notice_for_with_current_user(exception, opts = {})
+      if opts[:rack_env] && controller = opts[:rack_env]['action_controller.instance']
+        opts[:user_attributes] = Airbrake::CurrentUser.filtered_attributes(controller)
+      end
+      build_notice_for_without_current_user(exception, opts)
+    end
+    alias_method_chain :build_notice_for, :current_user
+
+  end
+end

data/lib/airbrake_overrides/rails/controller_methods.rb

@@ -3,30 +3,15 @@ require 'airbrake/rails/controller_methods'
 module Airbrake
   module Rails
     module ControllerMethods
+      private
 
       def airbrake_request_data_with_user_attributes
-        data = airbrake_request_data_without_user_attributes
-        data[:user_attributes] = current_user_filtered_attributes if respond_to?(:current_user, true)
-        data
+        airbrake_request_data_without_user_attributes.merge(
+          :user_attributes => Airbrake::CurrentUser.filtered_attributes(self)
+        )
       end
       alias_method_chain :airbrake_request_data, :user_attributes
 
-      private
-
-      # Returns filtered attributes for current user (removes auth-related fields)
-      def current_user_filtered_attributes
-        attributes = current_user.attributes.reject do |k, v|
-          /password|token|login|sign_in|per_page|_at$/ =~ k
-        end
-        # Try to include a URL for the user, if possible.
-        if url_method = [:user_url, :admin_user_url].detect {|m| respond_to?(m) }
-          attributes[:url] = send(url_method, current_user)
-        end
-        # Return all keys with non-blank values
-        attributes.select {|k,v| v.present? }
-      end
-
     end
   end
 end
-

data/lib/airbrake_user_attributes.rb

@@ -1,3 +1,6 @@
 require 'airbrake'
+
+require 'airbrake/current_user'
+require 'airbrake_overrides/airbrake'
 require 'airbrake_overrides/notice'
 require 'airbrake_overrides/rails/controller_methods'

data/lib/airbrake_user_attributes/version.rb

@@ -1,3 +1,3 @@
 module AirbrakeUserAttributes
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake_user_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
@@ -168,7 +168,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.0.9
 description: Adds information about the current user to error reports
@@ -182,6 +182,8 @@ files:
 - README.md
 - Rakefile
 - airbrake_user_attributes.gemspec
+- lib/airbrake/current_user.rb
+- lib/airbrake_overrides/airbrake.rb
 - lib/airbrake_overrides/notice.rb
 - lib/airbrake_overrides/rails/controller_methods.rb
 - lib/airbrake_user_attributes.rb
@@ -203,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 817822340806227861
+      hash: 3324931057514553385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 817822340806227861
+      hash: 3324931057514553385
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24