sentry-raven 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d1ff44aab9878c7070e85ac6bac6a2573e5332
-  data.tar.gz: 7668ff7bdc645dc3d77305f0be63bd028696eee5
+  metadata.gz: c09fc2d9d439ff50aa3d575716890797ebb81cb6
+  data.tar.gz: 834dc9c9d24c2bf004f071b9ec77d3c96edb22e7
 SHA512:
-  metadata.gz: ba3fb97a2c6a77adf1e8d5afcf00d7d94f14b3d5bf3851db165e0624afc1aa702efd61d2c3f24cf9195b8b9e2bedf72244219f7bd61a698e8d443732e227efec
-  data.tar.gz: e96788e536488bed998d179c9c752157044c5a703de5c479c9265966bde529f6d37dcba908478e9a292e4c149256f1ecb67ab748c2e89829ae73c8496c8d7e4a
+  metadata.gz: b07c730db8e117c99f3f3e40bbf66863880bb630b2e57de211335994749a930f3f9ea4a86b49eb3f632a88c09184588c0d38b73ce9f0fb3482845c4ccfe4f904
+  data.tar.gz: 3e3390603c2835ff88c0644c753a3459f721026adc5bb0f03e207158f65528e861363c571d6a73c7185b0f844fdfdb60190b31fe0ed6e6db3e5bcc7363e69b85

data/README.md

@@ -2,13 +2,12 @@
 
 [![Gem Version](https://img.shields.io/gem/v/sentry-raven.svg)](https://rubygems.org/gems/sentry-raven)
 [![Build Status](https://img.shields.io/travis/getsentry/raven-ruby/master.svg)](https://travis-ci.org/getsentry/raven-ruby)
-[![Coverage Status](https://img.shields.io/coveralls/getsentry/raven-ruby/master.svg)](https://coveralls.io/r/getsentry/raven-ruby)
 
 A client and integration layer for the [Sentry](https://github.com/getsentry/sentry) error reporting API.
 
 ## Requirements
 
-We test on Ruby MRI 1.8.7/REE, 1.9.3, 2.0 and 2.1. JRuby support is experimental - check TravisCI to see if the build is passing or failing.
+We test on Ruby MRI 1.8.7/REE, 1.9.3, 2.0, 2.1 and 2.2. JRuby support is experimental - check TravisCI to see if the build is passing or failing.
 
 ## Getting Started
 ### Install
@@ -45,7 +44,7 @@ end
 
 ## More Information
 
-Full documentation and more information on advanced configuration, sending more information, scrubbing sensitive data, and more can be found on [the wiki](https://github.com/getsentry/raven-ruby/wiki). 
+Full documentation and more information on advanced configuration, sending more information, scrubbing sensitive data, and more can be found on [the wiki](https://github.com/getsentry/raven-ruby/wiki).
 
 * [Documentation](https://github.com/getsentry/raven-ruby/wiki)
 * [Bug Tracker](http://github.com/getsentry/raven-ruby/issues>)

data/lib/raven/base.rb

@@ -7,6 +7,7 @@ require 'raven/event'
 require 'raven/logger'
 require 'raven/interfaces/message'
 require 'raven/interfaces/exception'
+require 'raven/interfaces/single_exception'
 require 'raven/interfaces/stack_trace'
 require 'raven/interfaces/http'
 require 'raven/processor'
@@ -49,9 +50,15 @@ module Raven
     end
 
     # Tell the log that the client is good to go
-    def report_ready
-      self.logger.info "Raven #{VERSION} ready to catch errors"
+    def report_status
+      return if client.configuration.silence_ready
+      if client.configuration.send_in_current_environment?
+        logger.info "Raven #{VERSION} ready to catch errors"
+      else
+        logger.info "Raven #{VERSION} configured not to send errors."
+      end
     end
+    alias_method :report_ready, :report_status
 
     # Call this method to modify defaults in your initializers.
     #
@@ -59,11 +66,11 @@ module Raven
     #   Raven.configure do |config|
     #     config.server = 'http://...'
     #   end
-    def configure(silent = false)
+    def configure
       yield(configuration) if block_given?
 
       self.client = Client.new(configuration)
-      report_ready unless silent
+      report_status
       self.client
     end
 
@@ -83,65 +90,39 @@ module Raven
     #   Raven.capture do
     #     MyApp.run
     #   end
-    def capture(options = {}, &block)
-      if block
-        begin
-          block.call
-        rescue Error
-          raise # Don't capture Raven errors
-        rescue Exception => e
-          capture_exception(e, options)
-          raise
-        end
-      else
-        # Install at_exit hook
-        at_exit do
-          if $ERROR_INFO
-            logger.debug "Caught a post-mortem exception: #{$ERROR_INFO.inspect}"
-            capture_exception($ERROR_INFO, options)
-          end
-        end
+    def capture(options = {})
+      install_at_exit_hook unless block_given?
+      begin
+        yield
+      rescue Error
+        raise # Don't capture Raven errors
+      rescue Exception => e
+        capture_exception(e, options)
+        raise
       end
     end
 
-    def capture_exception(exception, options = {})
-      send_or_skip(exception) do
-        if (evt = Event.from_exception(exception, options))
-          yield evt if block_given?
-          if configuration.async?
-            configuration.async.call(evt)
-          else
-            send(evt)
-          end
+    def capture_type(obj, options = {})
+      return false unless should_capture?(obj)
+      message_or_exc = obj.is_a?(String) ? "message" : "exception"
+      if (evt = Event.send("from_" + message_or_exc, obj, options))
+        yield evt if block_given?
+        if configuration.async?
+          configuration.async.call(evt)
+        else
+          send(evt)
         end
       end
     end
+    alias_method :capture_message, :capture_type
+    alias_method :capture_exception, :capture_type
 
-    def capture_message(message, options = {})
-      send_or_skip(message) do
-        if (evt = Event.from_message(message, options))
-          yield evt if block_given?
-          if configuration.async?
-            configuration.async.call(evt)
-          else
-            send(evt)
-          end
-        end
-      end
-    end
-
-    def send_or_skip(exc)
-      should_send = if configuration.should_send
-        configuration.should_send.call(*[exc])
+    def should_capture?(message_or_exc)
+      if configuration.should_capture
+        configuration.should_capture.call(*[message_or_exc])
       else
         true
       end
-
-      if configuration.send_in_current_environment? && should_send
-        yield if block_given?
-      else
-        configuration.log_excluded_environment_message
-      end
     end
 
     # Provides extra context to the exception prior to it being handled by
@@ -231,5 +212,14 @@ module Raven
     alias :captureMessage :capture_message
     alias :annotateException :annotate_exception
     alias :annotate :annotate_exception
+
+    private
+
+    def install_at_exit_hook
+      at_exit do
+        logger.debug "Caught a post-mortem exception: #{$ERROR_INFO.inspect}"
+        capture_exception($ERROR_INFO, options)
+      end
+    end
   end
 end

data/lib/raven/client.rb

@@ -7,9 +7,8 @@ require 'raven/transports/http'
 require 'raven/transports/udp'
 
 module Raven
-
+  # Encodes events and sends them to the Sentry server.
   class Client
-
     PROTOCOL_VERSION = '5'
     USER_AGENT = "raven-ruby/#{Raven::VERSION}"
     CONTENT_TYPE = 'application/json'
@@ -23,22 +22,20 @@ module Raven
     end
 
     def send(event)
-      unless configuration.send_in_current_environment?
-        configuration.log_excluded_environment_message
-        return
-      end
+      return false unless configuration_allows_sending
 
-      # Set the project ID correctly
-      event.project = self.configuration.project_id
+      # Convert to hash
+      event = event.to_hash
 
       if !@state.should_try?
         Raven.logger.error("Not sending event due to previous failure(s): #{get_log_message(event)}")
         return
       end
 
-      Raven.logger.debug "Sending event #{event.id} to Sentry"
+      Raven.logger.debug "Sending event #{event['id']} to Sentry"
 
       content_type, encoded_data = encode(event)
+
       begin
         transport.send(generate_auth_header, encoded_data,
                        :content_type => content_type)
@@ -54,39 +51,40 @@ module Raven
 
     private
 
-    def encode(event)
-      hash = event.to_hash
-
-      # apply processors
-      hash = @processors.reduce(hash) do |memo, processor|
-        processor.process(memo)
+    def configuration_allows_sending
+      if configuration.send_in_current_environment?
+        true
+      else
+        configuration.log_excluded_environment_message
+        false
       end
+    end
 
+    def encode(event)
+      hash = @processors.reduce(event.to_hash) { |memo, p| p.process(memo) }
       encoded = OkJson.encode(hash)
 
-      case self.configuration.encoding
+      case configuration.encoding
       when 'gzip'
-        gzipped = Zlib::Deflate.deflate(encoded)
-        b64_encoded = strict_encode64(gzipped)
-        return 'application/octet-stream', b64_encoded
+        ['application/octet-stream', strict_encode64(Zlib::Deflate.deflate(encoded))]
       else
-        return 'application/json', encoded
+        ['application/json', encoded]
       end
     end
 
     def get_log_message(event)
-      (event && event.message) || '<no message value>'
+      (event && event['message']) || '<no message value>'
     end
 
     def transport
       @transport ||=
-        case self.configuration.scheme
+        case configuration.scheme
         when 'udp'
-          Transports::UDP.new self.configuration
+          Transports::UDP.new(configuration)
         when 'http', 'https'
-          Transports::HTTP.new self.configuration
+          Transports::HTTP.new(configuration)
         else
-          raise Error.new("Unknown transport scheme '#{self.configuration.scheme}'")
+          raise Error, "Unknown transport scheme '#{self.configuration.scheme}'"
         end
     end
 
@@ -96,14 +94,12 @@ module Raven
         'sentry_version' => PROTOCOL_VERSION,
         'sentry_client' => USER_AGENT,
         'sentry_timestamp' => now,
-        'sentry_key' => self.configuration.public_key,
-        'sentry_secret' => self.configuration.secret_key,
+        'sentry_key' => configuration.public_key,
+        'sentry_secret' => configuration.secret_key
       }
       'Sentry ' + fields.map { |key, value| "#{key}=#{value}" }.join(', ')
     end
 
-    private
-
     def strict_encode64(string)
       if Base64.respond_to? :strict_encode64
         Base64.strict_encode64 string

data/lib/raven/configuration.rb

@@ -31,6 +31,9 @@ module Raven
     # Logger to use internally
     attr_accessor :logger
 
+    # Silence ready message
+    attr_accessor :silence_ready
+
     # Number of lines of code context to capture, or nil for none
     attr_accessor :context_lines
 
@@ -68,6 +71,8 @@ module Raven
 
     attr_accessor :server_name
 
+    attr_accessor :release
+
     # DEPRECATED: This option is now ignored as we use our own adapter.
     attr_accessor :json_adapter
 
@@ -84,8 +89,8 @@ module Raven
     # ActionDispatch::ShowExceptions or ActionDispatch::DebugExceptions
     attr_accessor :catch_debugged_exceptions
 
-    # Provide a configurable callback to block or send events
-    attr_accessor :should_send
+    # Provide a configurable callback to determine event capture
+    attr_accessor :should_capture
 
     # additional fields to sanitize
     attr_accessor :sanitize_fields

data/lib/raven/event.rb

@@ -23,52 +23,46 @@ module Raven
     PLATFORM = "ruby"
 
     attr_reader :id
-    attr_accessor :project, :message, :timestamp, :time_spent, :level
-    attr_accessor :logger, :culprit, :server_name, :modules, :extra, :tags
-
-    def initialize(options = {}, &block)
-      @configuration = options[:configuration] || Raven.configuration
-      @interfaces = {}
-
-      context = options[:context] || Raven.context
-
-      @id = options[:id] || generate_event_id
-      @message = options[:message]
-      @timestamp = options[:timestamp] || Time.now.utc
-      @time_spent = options[:time_spent]
-
-      @level = options[:level] || :error
-      @logger = options[:logger] || 'root'
-      @culprit = options[:culprit]
-      @server_name = options[:server_name] || @configuration.server_name || get_hostname
-
-      options[:modules] ||= get_modules if @configuration.send_modules
-
-      @modules = options[:modules]
-
-      @user = options[:user] || {}
-      @user.merge!(context.user)
+    attr_accessor :project, :message, :timestamp, :time_spent, :level, :logger,
+      :culprit, :server_name, :release, :modules, :extra, :tags, :context, :configuration
+
+    def initialize(init = {})
+      @configuration = Raven.configuration
+      @interfaces    = {}
+      @context       = Raven.context
+      @id            = generate_event_id
+      @message       = nil
+      @timestamp     = Time.now.utc
+      @time_spent    = nil
+      @level         = :error
+      @logger        = 'root'
+      @culprit       = nil
+      @server_name   = @configuration.server_name || get_hostname
+      @release       = @configuration.release
+      @modules       = get_modules if @configuration.send_modules
+      @user          = {}
+      @extra         = {}
+      @tags          = {}
+
+      yield self if block_given?
+
+      if !self[:http] && @context.rack_env
+        interface :http do |int|
+          int.from_rack(@context.rack_env)
+        end
+      end
 
-      @extra = options[:extra] || {}
-      @extra.merge!(context.extra)
+      init.each_pair  { |key, val| instance_variable_set('@' + key.to_s, val) }
 
-      @tags = {}
+      @user.merge!(@context.user)
+      @extra.merge!(@context.extra)
       @tags.merge!(@configuration.tags)
-      @tags.merge!(options[:tags] || {})
-      @tags.merge!(context.tags)
-
-      block.call(self) if block
-
-      if !self[:http] && context.rack_env
-        self.interface :http do |int|
-          int.from_rack(context.rack_env)
-        end
-      end
+      @tags.merge!(@context.tags)
 
       # Some type coercion
-      @timestamp = @timestamp.strftime('%Y-%m-%dT%H:%M:%S') if @timestamp.is_a?(Time)
+      @timestamp  = @timestamp.strftime('%Y-%m-%dT%H:%M:%S') if @timestamp.is_a?(Time)
       @time_spent = (@time_spent*1000).to_i if @time_spent.is_a?(Float)
-      @level = LOG_LEVELS[@level.to_s.downcase] if @level.is_a?(String) || @level.is_a?(Symbol)
+      @level      = LOG_LEVELS[@level.to_s.downcase] if @level.is_a?(String) || @level.is_a?(Symbol)
     end
 
     def get_hostname
@@ -99,23 +93,24 @@ module Raven
 
     def to_hash
       data = {
-        'event_id' => @id,
-        'message' => @message,
-        'timestamp' => @timestamp,
-        'time_spent' => @time_spent,
-        'level' => @level,
-        'project' => @project,
-        'logger' => @logger,
-        'platform' => PLATFORM,
+        :event_id => @id,
+        :message => @message,
+        :timestamp => @timestamp,
+        :time_spent => @time_spent,
+        :level => @level,
+        :project => @project,
+        :logger => @logger,
+        :platform => PLATFORM,
       }
-      data['culprit'] = @culprit if @culprit
-      data['server_name'] = @server_name if @server_name
-      data['modules'] = @modules if @modules
-      data['extra'] = @extra if @extra
-      data['tags'] = @tags if @tags
-      data['user'] = @user if @user
+      data[:culprit] = @culprit if @culprit
+      data[:server_name] = @server_name if @server_name
+      data[:release] = @release if @release
+      data[:modules] = @modules if @modules
+      data[:extra] = @extra if @extra
+      data[:tags] = @tags if @tags
+      data[:user] = @user if @user
       @interfaces.each_pair do |name, int_data|
-        data[name] = int_data.to_hash
+        data[name.to_sym] = int_data.to_hash
       end
       data
     end
@@ -135,54 +130,78 @@ module Raven
         return nil
       end
 
-      context_lines = configuration[:context_lines]
-
       new(options) do |evt|
+        evt.configuration = configuration
         evt.message = "#{exc.class}: #{exc.message}"
         evt.level = options[:level] || :error
 
-        evt.interface(:exception) do |int|
-          int.type = exc.class.to_s
-          int.value = exc.to_s
-          int.module = exc.class.to_s.split('::')[0...-1].join('::')
-
-          # TODO(dcramer): this needs cleaned up, but I couldn't figure out how to
-          # work Hashie as a non-Rubyist
-          if exc.backtrace
-            int.stacktrace = StacktraceInterface.new do |stacktrace|
-              backtrace = Backtrace.parse(exc.backtrace)
-              stacktrace.frames = backtrace.lines.reverse.map do |line|
-                stacktrace.frame do |frame|
-                  frame.abs_path = line.file
-                  frame.function = line.method
-                  frame.lineno = line.number
-                  frame.in_app = line.in_app
-                  if context_lines && frame.abs_path
-                    frame.pre_context, frame.context_line, frame.post_context = \
-                      evt.get_file_context(frame.abs_path, frame.lineno, context_lines)
-                  end
-                end
-              end.select { |f| f.filename }
-
-              evt.culprit = evt.get_culprit(stacktrace.frames)
-            end
-          end
-        end
+        add_exception_interface(evt, exc)
 
         block.call(evt) if block
       end
     end
 
     def self.from_message(message, options = {})
+      configuration = options[:configuration] || Raven.configuration
       new(options) do |evt|
+        evt.configuration = configuration
         evt.message = message
         evt.level = options[:level] || :error
         evt.interface :message do |int|
           int.message = message
         end
+        if options[:backtrace]
+          evt.interface(:stacktrace) do |int|
+            stacktrace_interface_from(int, evt, options[:backtrace])
+          end
+        end
+      end
+    end
+
+    def self.add_exception_interface(evt, exc)
+      evt.interface(:exception) do |exc_int|
+        exceptions = [exc]
+        while exc.respond_to?(:cause) && exc.cause
+          exceptions << exc.cause
+          exc = exc.cause
+        end
+        exceptions.reverse!
+
+        exc_int.values = exceptions.map do |exc|
+          SingleExceptionInterface.new do |int|
+            int.type = exc.class.to_s
+            int.value = exc.to_s
+            int.module = exc.class.to_s.split('::')[0...-1].join('::')
+
+            int.stacktrace = if exc.backtrace
+              StacktraceInterface.new do |stacktrace|
+                stacktrace_interface_from(stacktrace, evt, exc.backtrace)
+              end
+            end
+          end
+        end
       end
     end
 
+    def self.stacktrace_interface_from(int, evt, backtrace)
+      backtrace = Backtrace.parse(backtrace)
+      int.frames = backtrace.lines.reverse.map do |line|
+        StacktraceInterface::Frame.new.tap do |frame|
+          frame.abs_path = line.file
+          frame.function = line.method
+          frame.lineno = line.number
+          frame.in_app = line.in_app
+
+          if evt.configuration[:context_lines] && frame.abs_path
+            frame.pre_context, frame.context_line, frame.post_context = \
+              evt.get_file_context(frame.abs_path, frame.lineno, evt.configuration[:context_lines])
+          end
+        end
+      end.select { |f| f.filename }
+
+      evt.culprit = evt.get_culprit(int.frames)
+    end
+
     # Because linecache can go to hell
     def self._source_lines(_path, _from, _to)
     end

data/lib/raven/integrations/rack.rb

@@ -22,26 +22,19 @@ module Raven
   # Use a standard Raven.configure call to configure your server credentials.
   class Rack
 
-    def self.capture_exception(exception, env, options = {})
+    def self.capture_type(exception, env, options = {})
       if env['requested_at']
         options[:time_spent] = Time.now - env['requested_at']
       end
-      Raven.capture_exception(exception, options) do |evt|
+      Raven.capture_type(exception, options) do |evt|
         evt.interface :http do |int|
           int.from_rack(env)
         end
       end
     end
-
-    def self.capture_message(message, env, options = {})
-      if env['requested_at']
-        options[:time_spent] = Time.now - env['requested_at']
-      end
-      Raven.capture_message(message, options) do |evt|
-        evt.interface :http do |int|
-          int.from_rack(env)
-        end
-      end
+    class << self
+      alias_method :capture_message, :capture_type
+      alias_method :capture_exception, :capture_type
     end
 
     def initialize(app)

data/lib/raven/integrations/rails.rb

@@ -15,7 +15,7 @@ module Raven
     end
 
     config.after_initialize do
-      Raven.configure(true) do |config|
+      Raven.configure do |config|
         config.logger ||= ::Rails.logger
         config.project_root ||= ::Rails.root
       end

data/lib/raven/interfaces.rb

@@ -1,16 +1,11 @@
-require 'raven/better_attr_accessor'
-
 module Raven
 
   INTERFACES = {}
 
   class Interface
-    include BetterAttrAccessor
-    alias_method :to_hash, :attributes
-
     def initialize(attributes = nil)
       attributes.each do |attr, value|
-        send "#{attr}=", value
+        public_send "#{attr}=", value
       end if attributes
 
       yield self if block_given?
@@ -19,6 +14,10 @@ module Raven
     def self.name(value = nil)
       @interface_name ||= value
     end
+
+    def to_hash
+      Hash[instance_variables.map { |name| [name[1..-1].to_sym, instance_variable_get(name)] } ]
+    end
   end
 
   def self.register_interface(mapping)

data/lib/raven/interfaces/exception.rb

@@ -4,15 +4,12 @@ module Raven
   class ExceptionInterface < Interface
 
     name 'exception'
-    attr_accessor :type
-    attr_accessor :value
-    attr_accessor :module
-    attr_accessor :stacktrace
+    attr_accessor :values
 
     def to_hash(*args)
       data = super(*args)
-      if data['stacktrace']
-        data['stacktrace'] = data['stacktrace'].to_hash
+      if data[:values]
+        data[:values] = data[:values].map(&:to_hash)
       end
       data
     end

data/lib/raven/interfaces/http.rb

@@ -15,6 +15,7 @@ module Raven
     def initialize(*arguments)
       self.headers = {}
       self.env = {}
+      self.cookies = nil
       super(*arguments)
     end
 

data/lib/raven/interfaces/single_exception.rb

@@ -0,0 +1,19 @@
+require 'raven/interfaces'
+
+module Raven
+  class SingleExceptionInterface < Interface
+
+    attr_accessor :type
+    attr_accessor :value
+    attr_accessor :module
+    attr_accessor :stacktrace
+
+    def to_hash(*args)
+      data = super(*args)
+      if data[:stacktrace]
+        data[:stacktrace] = data[:stacktrace].to_hash
+      end
+      data
+    end
+  end
+end

data/lib/raven/interfaces/stack_trace.rb

@@ -4,7 +4,7 @@ module Raven
   class StacktraceInterface < Interface
 
     name 'stacktrace'
-    attr_accessor :frames, :default => []
+    attr_accessor :frames
 
     def initialize(*arguments)
       self.frames = []
@@ -13,39 +13,49 @@ module Raven
 
     def to_hash(*args)
       data = super(*args)
-      data['frames'] = data['frames'].map { |frame| frame.to_hash }
+      data[:frames] = data[:frames].map { |frame| frame.to_hash }
       data
     end
 
-    def frame(attributes = nil, &block)
-      Frame.new(attributes, &block)
-    end
-
     # Not actually an interface, but I want to use the same style
     class Frame < Interface
       attr_accessor :abs_path
       attr_accessor :function
-      attr_accessor :vars,         :default => []
-      attr_accessor :pre_context,  :default => []
-      attr_accessor :post_context, :default => []
+      attr_accessor :vars
+      attr_accessor :pre_context
+      attr_accessor :post_context
       attr_accessor :context_line
       attr_accessor :lineno
       attr_accessor :in_app
 
+      def initialize(*arguments)
+        self.vars, self.pre_context, self.post_context = [], [], []
+        super(*arguments)
+      end
+
       def filename
         return nil if self.abs_path.nil?
 
-        prefix = $LOAD_PATH.select { |s| self.abs_path.start_with?(s.to_s) }.sort_by { |s| s.to_s.length }.last
+        prefix = if project_root && self.abs_path.start_with?(project_root)
+          project_root
+        else
+          $LOAD_PATH.select { |s| self.abs_path.start_with?(s.to_s) }.sort_by { |s| s.to_s.length }.last
+        end
+
         prefix ? self.abs_path[prefix.to_s.chomp(File::SEPARATOR).length+1..-1] : self.abs_path
       end
 
+      def project_root
+        @project_root ||= Raven.configuration.project_root && Raven.configuration.project_root.to_s
+      end
+
       def to_hash(*args)
         data = super(*args)
-        data['filename'] = self.filename
-        data.delete('vars') unless self.vars && !self.vars.empty?
-        data.delete('pre_context') unless self.pre_context && !self.pre_context.empty?
-        data.delete('post_context') unless self.post_context && !self.post_context.empty?
-        data.delete('context_line') unless self.context_line && !self.context_line.empty?
+        data[:filename] = self.filename
+        data.delete(:vars) unless self.vars && !self.vars.empty?
+        data.delete(:pre_context) unless self.pre_context && !self.pre_context.empty?
+        data.delete(:post_context) unless self.post_context && !self.post_context.empty?
+        data.delete(:context_line) unless self.context_line && !self.context_line.empty?
         data
       end
     end

data/lib/raven/linecache.rb

@@ -1,7 +1,6 @@
 # A much simpler source line cacher because linecache sucks at platform compat
 
 module Raven
-
   class LineCache
     class << self
       CACHE = {}

data/lib/raven/processor.rb

@@ -1,27 +1,11 @@
-require 'json'
-
 module Raven
   class Processor
-    attr_accessor :sanitize_fields
-
     def initialize(client)
       @client = client
-      @sanitize_fields = client.configuration.sanitize_fields
     end
 
     def process(data)
-      data
-    end
-
-    private
-
-    def parse_json_or_nil(string)
-      begin
-        OkJson.decode(string)
-      rescue Raven::OkJson::Error
-        nil
-      end
+      raise NotImplementedError
     end
-
   end
 end

data/lib/raven/processor/removestacktrace.rb

@@ -2,7 +2,11 @@ module Raven
   class Processor::RemoveStacktrace < Processor
 
     def process(value)
-      value['exception'].delete('stacktrace') if value['exception']
+      if value[:exception]
+        value[:exception][:values].map do |single_exception|
+          single_exception.delete(:stacktrace) if single_exception[:stacktrace]
+        end
+      end
 
       value
     end

data/lib/raven/processor/sanitizedata.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Raven
   class Processor::SanitizeData < Processor
     STRING_MASK = '********'
@@ -5,6 +6,13 @@ module Raven
     DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec)
     CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/
 
+    attr_accessor :sanitize_fields
+
+    def initialize(client)
+      super
+      self.sanitize_fields = client.configuration.sanitize_fields
+    end
+
     def process(value)
       value.inject(value) { |memo,(k,v)|  memo[k] = sanitize(k,v); memo }
     end
@@ -16,13 +24,17 @@ module Raven
         v.map{|a| sanitize(k, a)}
       elsif k == 'query_string'
         sanitize_query_string(v)
-      elsif v.is_a?(String) && (json = parse_json_or_nil(v))
-        #if this string is actually a json obj, convert and sanitize
-        json.is_a?(Hash) ? process(json).to_json : v
-      elsif v.is_a?(Integer) && (CREDIT_CARD_RE.match(v.to_s) || fields_re.match(k.to_s))
+      elsif v.is_a?(Integer) && matches_regexes?(k,v)
         INT_MASK
-      elsif v.is_a?(String)  && (CREDIT_CARD_RE.match(v.to_s) || fields_re.match(k.to_s))
-        STRING_MASK
+      elsif v.is_a?(String)
+        if fields_re.match(v.to_s) && (json = parse_json_or_nil(v))
+          #if this string is actually a json obj, convert and sanitize
+          json.is_a?(Hash) ? process(json).to_json : v
+        elsif matches_regexes?(k,v)
+          STRING_MASK
+        else
+          v
+        end
       else
         v
       end
@@ -36,8 +48,20 @@ module Raven
       URI.encode_www_form(processed_query_hash)
     end
 
+    def matches_regexes?(k, v)
+      CREDIT_CARD_RE.match(v.to_s) || fields_re.match(k.to_s)
+    end
+
     def fields_re
-      @fields_re ||= /(#{(DEFAULT_FIELDS + @sanitize_fields).join("|")})/i
+      @fields_re ||= /(#{(DEFAULT_FIELDS | sanitize_fields).join("|")})/i
+    end
+
+    def parse_json_or_nil(string)
+      begin
+        OkJson.decode(string)
+      rescue Raven::OkJson::Error, NoMethodError
+        nil
+      end
     end
   end
 end

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +110,6 @@ files:
 - lib/raven/backports/uri.rb
 - lib/raven/backtrace.rb
 - lib/raven/base.rb
-- lib/raven/better_attr_accessor.rb
 - lib/raven/cli.rb
 - lib/raven/client.rb
 - lib/raven/configuration.rb
@@ -143,6 +128,7 @@ files:
 - lib/raven/interfaces/exception.rb
 - lib/raven/interfaces/http.rb
 - lib/raven/interfaces/message.rb
+- lib/raven/interfaces/single_exception.rb
 - lib/raven/interfaces/stack_trace.rb
 - lib/raven/linecache.rb
 - lib/raven/logger.rb

data/lib/raven/better_attr_accessor.rb

@@ -1,44 +0,0 @@
-require 'set'
-
-module Raven
-  module BetterAttrAccessor
-
-    def attributes
-      Hash[
-        self.class.attributes.map do |attr|
-          [attr, send(attr)]
-        end
-      ]
-    end
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def attributes
-        @attributes ||= Set.new
-
-        if superclass.include? BetterAttrAccessor
-          @attributes + superclass.attributes
-        else
-          @attributes
-        end
-      end
-
-      def attr_accessor(attr, options = {})
-        @attributes ||= Set.new
-        @attributes << attr.to_s
-
-        define_method attr do
-          if instance_variable_defined? "@#{attr}"
-            instance_variable_get "@#{attr}"
-          elsif options.key? :default
-            instance_variable_set "@#{attr}", options[:default].dup
-          end
-        end
-        attr_writer attr
-      end
-    end
-  end
-end