bugsnag 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/bugsnag.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "bugsnag"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]

data/lib/bugsnag.rb

@@ -18,15 +18,8 @@ module Bugsnag
     end
 
     def notify(exception, session_data={})
-      opts = {
-        :releaseStage => configuration.release_stage,
-        :projectRoot => configuration.project_root.to_s,
-        :appVersion => configuration.app_version
-      }.merge(session_data)
-
-      # Send the notification
-      notification = Notification.new(configuration.api_key, exception, opts)
-      notification.deliver
+      notification = Notification.new(exception, configuration.merge(session_data))
+      notification.deliver unless notification.ignore?
     end
 
     def log(message)

data/lib/bugsnag/configuration.rb

@@ -1,5 +1,60 @@
 module Bugsnag
   class Configuration
-    attr_accessor :api_key, :release_stage, :project_root, :app_version, :framework, :endpoint, :logger, :disable_auto_notification
+    OPTIONS = [
+      :api_key, :release_stage, :project_root, :app_version,
+      :framework, :endpoint, :logger, :disable_auto_notification,
+      :params_filters, :stacktrace_filters, :ignore_classes
+    ]
+    OPTIONS.each {|o| attr_accessor o }
+
+
+    DEFAULT_ENDPOINT = "http://api.bugsnag.com/notify"
+    DEFAULT_PARAMS_FILTERS = %w(password password_confirmation).freeze
+
+    DEFAULT_STACKTRACE_FILTERS = [
+      lambda { |line|
+        if defined?(Bugsnag.configuration.project_root) && Bugsnag.configuration.project_root.to_s != '' 
+          line.sub(/#{Bugsnag.configuration.project_root}\//, "")
+        else
+          line
+        end
+      },
+      lambda { |line| line.gsub(/^\.\//, "") },
+      lambda { |line|
+        if defined?(Gem)
+          Gem.path.inject(line) do |line, path|
+            line.gsub(/#{path}\//, "")
+          end
+        end
+      },
+      lambda { |line| line if line !~ %r{lib/bugsnag} }
+    ].freeze
+
+    DEFAULT_IGNORE_CLASSES = [
+      "ActiveRecord::RecordNotFound",
+      "ActionController::RoutingError",
+      "ActionController::InvalidAuthenticityToken",
+      "CGI::Session::CookieStore::TamperedWithCookie",
+      "ActionController::UnknownAction",
+      "AbstractController::ActionNotFound"
+    ]
+
+
+    def initialize
+      @endpoint = DEFAULT_ENDPOINT
+      @params_filters = DEFAULT_PARAMS_FILTERS.dup
+      @stacktrace_filters = DEFAULT_STACKTRACE_FILTERS.dup
+      @ignore_classes = DEFAULT_IGNORE_CLASSES.dup
+    end
+    
+    def to_hash
+      OPTIONS.inject({}) do |hash, option|
+        hash.merge(option.to_sym => send(option))
+      end
+    end
+
+    def merge(hash)
+      to_hash.merge(hash)
+    end
   end
 end

data/lib/bugsnag/helpers.rb

@@ -20,7 +20,7 @@ module Bugsnag
     end
     
     def self.param_context(params)
-      "#{params[:controller]}##{params[:action]}"
+      "#{params[:controller]}##{params[:action]}" if params && params[:controller] && params[:action]
     end
   end
 end

data/lib/bugsnag/notification.rb

@@ -12,31 +12,37 @@ module Bugsnag
     include HTTParty
     headers  "Content-Type" => "application/json"
 
-    attr_accessor :apiKey, :exception, :endpoint,
-                  :appVersion, :releaseStage, :projectRoot,
-                  :userId, :context, :metaData
+    # Basic notification attributes
+    attr_accessor :exception
 
-    def initialize(api_key, exception, opts={})
-      self.apiKey = api_key
-      self.exception = exception
-      self.endpoint = DEFAULT_ENDPOINT
+    # Attributes from session
+    attr_accessor :user_id, :context, :meta_data
+
+    # Attributes from configuration
+    attr_accessor :api_key, :params_filters, :stacktrace_filters, 
+                  :ignore_classes, :endpoint, :app_version, :release_stage, 
+                  :project_root
 
-      opts.reject! {|k,v| v.nil?}.each {|k,v| self.send("#{k}=", v)}
+    def initialize(exception, opts={})
+      self.exception = exception
+      opts.reject! {|k,v| v.nil?}.each do |k,v|
+        self.send("#{k}=", v) if self.respond_to?("#{k}=")
+      end
     end
 
     def deliver
       Bugsnag.log("Notifying #{self.endpoint} of exception")
 
       payload = {
-        :apiKey => self.apiKey,
+        :apiKey => self.api_key,
         :notifier => notifier_identification,
         :errors => [{
-          :userId => self.userId,
-          :appVersion => self.appVersion,
-          :releaseStage => self.releaseStage,
+          :userId => self.user_id,
+          :appVersion => self.app_version,
+          :releaseStage => self.release_stage,
           :context => self.context,
           :exceptions => [exception_hash],
-          :metaData => self.metaData
+          :metaData => self.meta_data
         }.reject {|k,v| v.nil? }]
       }
 
@@ -49,6 +55,10 @@ module Bugsnag
       return response
     end
 
+    def ignore?
+      self.ignore_classes.include?(self.exception.class.to_s)
+    end
+
 
     private
     def notifier_identification
@@ -69,21 +79,25 @@ module Bugsnag
         method = nil
         file, line_str, method_str = trace.split(":")
 
-        trace_hash = {
-          :file => file,
-          :lineNumber => line_str.to_i
-        }
+        # Generate the stacktrace line hash
+        trace_hash = {}
+        trace_hash[:inProject] = true if self.project_root && file.match(/^#{self.project_root}/)
+        trace_hash[:file] = self.stacktrace_filters.inject(file) {|file, proc| proc.call(file) }
+        trace_hash[:lineNumber] = line_str.to_i
 
+        # Add a method if we have it
         if method_str
           method_match = /in `([^']+)'/.match(method_str)
           method = method_match.captures.first if method_match
         end
-
         trace_hash[:method] = method if method
-        trace_hash[:inProject] = true if self.projectRoot && file.match(/^#{self.projectRoot}/)
 
-        trace_hash
-      end
+        if trace_hash[:file] && !trace_hash[:file].empty?
+          trace_hash
+        else
+          nil
+        end
+      end.compact
     end
 
     def exception_hash

data/lib/bugsnag/rack.rb

@@ -27,9 +27,9 @@ module Bugsnag
       params = env['action_dispatch.request.parameters'] || request.params || {}
 
       {
-        :userId => session[:session_id] || session["session_id"],
+        :user_id => session[:session_id] || session["session_id"],
         :context => Bugsnag::Helpers.param_context(params),
-        :metaData => {
+        :meta_data => {
           :request => {
             :url => request.url,
             :controller => params[:controller],

data/lib/bugsnag/rails/controller_methods.rb

@@ -5,16 +5,16 @@ module Bugsnag
       def notify_bugsnag(exception, custom_data=nil)
         unless bugsnag_local_request?
           request_data = bugsnag_request_data
-          request_data[:metaData][:custom] = custom_data if custom_data
+          request_data[:meta_data][:custom] = custom_data if custom_data
           Bugsnag.notify(exception, request_data)
         end
       end
 
       def bugsnag_request_data
         {
-          :userId => bugsnag_session_id,
+          :user_id => bugsnag_session_id,
           :context => Bugsnag::Helpers.param_context(params),
-          :metaData => {
+          :meta_data => {
             :request => {
               :url => bugsnag_request_url,
               :controller => params[:controller],
@@ -40,10 +40,6 @@ module Bugsnag
         session[:session_id] || session["session_id"]
       end
       
-      def bugsnag_context
-        "#{params[:controller]}##{params[:action]}"
-      end
-
       def bugsnag_request_url
         url = "#{request.protocol}#{request.host}"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - James Smith