sentry-raven 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35cd02edfcecacab72ec05f5e21e6a49099d60c2
-  data.tar.gz: eb2e610878a3dc5a05158880951afb0c5ce9f8f8
+  metadata.gz: dc70253c8534fa8631331cbabf07e6cb4c4d31d2
+  data.tar.gz: 3d956a4c483a317b359332de520c3b402f8317bf
 SHA512:
-  metadata.gz: 533c27c8a509e7ce2ca90dd1da725d50750c8273f41afc9b273ca625eb62cb08b55aa85c7dee0bf6ee72d5dd0d0596cf2c21c09157e843ec8d28c20883978948
-  data.tar.gz: 4152a65f5a7775349b05e3fb88d13ba4ddbb92671d629a0125d450c84f9cd35ac46d97daf9a72de56c85b00d4f355a2c1241e50529a5011c0181ae6d8fc83366
+  metadata.gz: 2354d4020c5379674e12700beae4d39188a8f4b212832fa9bf1862977af062e84c9f9b559f0822a4b7430dd42c3ad2580778b55795a65b95586b9714860df462
+  data.tar.gz: 1842f5311c0d807b3595f26941b2162d400fb806b0c2d314cd5053d0e280dbcf832d05b3fb9c1a4633f42ea17a12fb7929b88237bdae0a0926d6b1a98167d079

data/README.md

@@ -26,7 +26,7 @@ Raven.configure do |config|
 end
 ```
 ### Call
-If you use Rails, you're already done - no more configuration required! Check [Integrations](https://github.com/getsentry/raven-ruby/wiki/Integrations) for more details on other gems Sentry integrates with automatically.
+If you use Rails, you're already done - no more configuration required! Check [Integrations](https://docs.getsentry.com/hosted/clients/ruby/integrations/) for more details on other gems Sentry integrates with automatically.
 
 Otherwise, Raven supports two methods of capturing exceptions:
 ```ruby
@@ -44,9 +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).
-
-* [Documentation](https://github.com/getsentry/raven-ruby/wiki)
+* [Documentation](https://docs.getsentry.com/hosted/clients/ruby/)
 * [Bug Tracker](https://github.com/getsentry/raven-ruby/issues>)
 * [Code](https://github.com/getsentry/raven-ruby>)
 * [Mailing List](https://groups.google.com/group/getsentry>)

data/lib/raven/backports/uri.rb

@@ -49,7 +49,7 @@ module URI
   # This decodes + to SP.
   #
   # See URI.encode_www_form_component, URI.decode_www_form
-  def self.decode_www_form_component(str, enc=nil)
+  def self.decode_www_form_component(str, enc = nil)
     raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%[0-9a-fA-F]{2}|[^%])*\z/ =~ str
     str.gsub(/\+|%[0-9a-fA-F]{2}/) {|m| TBLDECWWWCOMP_[m]}
   end

data/lib/raven/backtrace.rb

@@ -4,17 +4,15 @@ module Raven
 
   # Front end to parsing the backtrace for each notice
   class Backtrace
-
     # Handles backtrace parsing line by line
     class Line
-
       # regexp (optionnally allowing leading X: for windows support)
       RUBY_INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+|<.*>):(\d+)(?::in `([^']+)')?$}.freeze
 
       # org.jruby.runtime.callsite.CachingCallSite.call(CachingCallSite.java:170)
       JAVA_INPUT_FORMAT = %r{^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$}.freeze
 
-      APP_DIRS_PATTERN = /(bin|app|config|lib|test)/
+      APP_DIRS_PATTERN = /(bin|exe|app|config|lib|test)/
 
       # The file portion of the line (such as app/models/user.rb)
       attr_reader :file
@@ -108,7 +106,7 @@ module Raven
     end
 
     def inspect
-      "<Backtrace: " + lines.map { |line| line.inspect }.join(", ") + ">"
+      "<Backtrace: " + lines.map(&inspect).join(", ") + ">"
     end
 
     def to_s

data/lib/raven/base.rb

@@ -85,12 +85,6 @@ module Raven
       client.send_event(event)
     end
 
-    def send(event)
-      Raven.logger.warn "DEPRECATION WARNING: Calling #send on Raven::Base will be \
-        removed in Raven-Ruby 0.14! Use #send_event instead!"
-      client.send_event(event)
-    end
-
     # Capture and process any exceptions from the given block, or globally if
     # no block is given
     #
@@ -158,7 +152,7 @@ module Raven
     #                              'email' => 'foo@example.com' })
     #   end
     def annotate_exception(exc, options = {})
-      notes = exc.instance_variable_get(:@__raven_context) || {}
+      notes = (exc.instance_variable_defined?(:@__raven_context) && exc.instance_variable_get(:@__raven_context)) || {}
       notes.merge!(options)
       exc.instance_variable_set(:@__raven_context, notes)
       exc

data/lib/raven/cli.rb

@@ -1,5 +1,3 @@
-require 'raven'
-
 module Raven
   class CLI
     def self.test(dsn = nil)

data/lib/raven/client.rb

@@ -49,10 +49,18 @@ module Raven
       event
     end
 
-    def send(event)
-      Raven.logger.warn "DEPRECATION WARNING: Calling #send on a Client will be \
-        removed in Raven-Ruby 0.14! Use #send_event instead!"
-      send_event(event)
+    def transport
+      @transport ||=
+        case configuration.scheme
+        when 'udp'
+          Transports::UDP.new(configuration)
+        when 'http', 'https'
+          Transports::HTTP.new(configuration)
+        when 'dummy'
+          Transports::Dummy.new(configuration)
+        else
+          fail "Unknown transport scheme '#{configuration.scheme}'"
+        end
     end
 
     private
@@ -82,18 +90,6 @@ module Raven
       (event && event[:message]) || '<no message value>'
     end
 
-    def transport
-      @transport ||=
-        case configuration.scheme
-        when 'udp'
-          Transports::UDP.new(configuration)
-        when 'http', 'https'
-          Transports::HTTP.new(configuration)
-        else
-          raise Error, "Unknown transport scheme '#{self.configuration.scheme}'"
-        end
-    end
-
     def generate_auth_header
       now = Time.now.to_i.to_s
       fields = {
@@ -124,7 +120,6 @@ module Raven
       e.backtrace[0..10].each { |line| Raven.logger.error(line) }
       Raven.logger.error("Failed to submit event: #{get_log_message(event)}")
     end
-
   end
 
   class ClientState

data/lib/raven/configuration.rb

@@ -3,7 +3,6 @@ require 'uri'
 
 module Raven
   class Configuration
-
     # Simple server string (setter provided below)
     attr_reader :server
 
@@ -101,13 +100,16 @@ module Raven
     # Sanitize values that look like credit card numbers
     attr_accessor :sanitize_credit_cards
 
-    IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
-                      'ActionController::RoutingError',
-                      'ActionController::InvalidAuthenticityToken',
-                      'CGI::Session::CookieStore::TamperedWithCookie',
-                      'ActionController::UnknownAction',
-                      'AbstractController::ActionNotFound',
-                      'Mongoid::Errors::DocumentNotFound']
+    IGNORE_DEFAULT = [
+      'AbstractController::ActionNotFound',
+      'ActionController::InvalidAuthenticityToken',
+      'ActionController::RoutingError',
+      'ActionController::UnknownAction',
+      'ActiveRecord::RecordNotFound',
+      'CGI::Session::CookieStore::TamperedWithCookie',
+      'Mongoid::Errors::DocumentNotFound',
+      'Sinatra::NotFound',
+    ]
 
     def initialize
       self.server = ENV['SENTRY_DSN'] if ENV['SENTRY_DSN']
@@ -127,6 +129,16 @@ module Raven
       self.sanitize_fields = []
       self.sanitize_credit_cards = true
       self.environments = []
+
+      self.release = ENV['HEROKU_SLUG_COMMIT']
+
+      if self.release.nil? || self.release.empty?
+        self.release = File.read(File.join(Rails.root, 'REVISION')).strip rescue nil
+      end
+
+      if self.release.nil? || self.release.empty?
+        self.release = `git rev-parse --short HEAD`.strip rescue nil
+      end
     end
 
     def server=(value)
@@ -152,14 +164,14 @@ module Raven
     end
 
     def encoding=(encoding)
-      raise Error.new('Unsupported encoding') unless ['gzip', 'json'].include? encoding
+      raise Error.new('Unsupported encoding') unless %w(gzip json).include? encoding
       @encoding = encoding
     end
 
     alias_method :dsn=, :server=
 
     def async=(value)
-      raise ArgumentError.new("async must be callable (or false to disable)") unless (value == false || value.respond_to?(:call))
+      raise ArgumentError.new("async must be callable (or false to disable)") unless value == false || value.respond_to?(:call)
       @async = value
     end
 

data/lib/raven/event.rb

@@ -9,7 +9,6 @@ require 'raven/linecache'
 module Raven
 
   class Event
-
     LOG_LEVELS = {
       "debug" => 10,
       "info" => 20,
@@ -33,15 +32,16 @@ module Raven
       @interfaces    = {}
       @context       = Raven.context
       @id            = generate_event_id
+      @project       = nil
       @message       = nil
       @timestamp     = Time.now.utc
       @time_spent    = nil
       @level         = :error
       @logger        = ''
       @culprit       = nil
-      @server_name   = @configuration.server_name || get_hostname
+      @server_name   = @configuration.server_name || resolve_hostname
       @release       = @configuration.release
-      @modules       = get_modules if @configuration.send_modules
+      @modules       = list_gem_specs if @configuration.send_modules
       @user          = {}
       @extra         = {}
       @tags          = {}
@@ -56,7 +56,7 @@ module Raven
         end
       end
 
-      init.each_pair  { |key, val| instance_variable_set('@' + key.to_s, val) }
+      init.each_pair { |key, val| instance_variable_set('@' + key.to_s, val) }
 
       @user = @context.user.merge(@user)
       @extra = @context.extra.merge(@extra)
@@ -68,13 +68,13 @@ module Raven
       @level      = LOG_LEVELS[@level.to_s.downcase] if @level.is_a?(String) || @level.is_a?(Symbol)
     end
 
-    def get_hostname
+    def resolve_hostname
       # Try to resolve the hostname to an FQDN, but fall back to whatever the load name is
       hostname = Socket.gethostname
       Socket.gethostbyname(hostname).first rescue hostname
     end
 
-    def get_modules
+    def list_gem_specs
       # Older versions of Rubygems don't support iterating over all specs
       Hash[Gem::Specification.map { |spec| [spec.name, spec.version.to_s] }] if Gem::Specification.respond_to?(:map)
     end
@@ -121,7 +121,7 @@ module Raven
     end
 
     def self.from_exception(exc, options = {}, &block)
-      notes = exc.instance_variable_get(:@__raven_context) || {}
+      notes = (exc.instance_variable_defined?(:@__raven_context) && exc.instance_variable_get(:@__raven_context)) || {}
       options = notes.merge(options)
 
       configuration = options[:configuration] || Raven.configuration
@@ -178,17 +178,18 @@ module Raven
         end
         exceptions.reverse!
 
-        exc_int.values = exceptions.map do |exc|
+        exc_int.values = exceptions.map do |e|
           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)
+            int.type = e.class.to_s
+            int.value = e.to_s
+            int.module = e.class.to_s.split('::')[0...-1].join('::')
+
+            int.stacktrace =
+              if e.backtrace
+                StacktraceInterface.new do |stacktrace|
+                  stacktrace_interface_from(stacktrace, evt, e.backtrace)
+                end
               end
-            end
           end
         end
       end
@@ -209,7 +210,7 @@ module Raven
               evt.get_file_context(frame.abs_path, frame.lineno, evt.configuration[:context_lines])
           end
         end
-      end.select { |f| f.filename }
+      end.select(&:filename)
 
       evt.culprit = evt.get_culprit(int.frames)
     end
@@ -227,7 +228,7 @@ module Raven
     end
 
     def get_culprit(frames)
-      lastframe = frames.reverse.find { |f| f.in_app } || frames.last
+      lastframe = frames.reverse.find(&:in_app) || frames.last
       "#{lastframe.filename} in #{lastframe.function} at line #{lastframe.lineno}" if lastframe
     end
 

data/lib/raven/integrations/delayed_job.rb

@@ -12,27 +12,32 @@ module Delayed
 
           rescue Exception => exception
             # Log error to Sentry
+            extra = {
+              :delayed_job => {
+                :id          => job.id,
+                :priority    => job.priority,
+                :attempts    => job.attempts,
+                # handlers are YAML objects in strings, we definitely can't
+                # report all of that or the event will get truncated randomly
+                :handler     => job.handler[0...100],
+                :last_error  => job.last_error,
+                :run_at      => job.run_at,
+                :locked_at   => job.locked_at,
+                :locked_by   => job.locked_by,
+                :queue       => job.queue,
+                :created_at  => job.created_at
+                }
+            }
+            if job.respond_to?('payload_object') && job.payload_object.respond_to?('job_data')
+              extra.merge!(:active_job => job.payload_object.job_data)
+            end
             ::Raven.capture_exception(exception,
               :logger  => 'delayed_job',
               :tags    => {
                  :delayed_job_queue => job.queue,
                  :delayed_job_id => job.id
               },
-              :extra => {
-                  :delayed_job => {
-                      :id          => job.id,
-                      :priority    => job.priority,
-                      :attempts    => job.attempts,
-                      :handler     => job.handler,
-                      :last_error  => job.last_error,
-                      :run_at      => job.run_at,
-                      :locked_at   => job.locked_at,
-                      #failed_at  => job.failed_at,
-                      :locked_by   => job.locked_by,
-                      :queue       => job.queue,
-                      :created_at  => job.created_at
-                  }
-              })
+              :extra => extra)
 
             # Make sure we propagate the failure!
             raise exception

data/lib/raven/integrations/rack.rb

@@ -21,7 +21,6 @@ module Raven
   #
   # Use a standard Raven.configure call to configure your server credentials.
   class Rack
-
     def self.capture_type(exception, env, options = {})
       if env['raven.requested_at']
         options[:time_spent] = Time.now - env['raven.requested_at']
@@ -60,11 +59,68 @@ module Raven
         raise
       end
 
-      error = env['rack.exception'] || env['sinatra.error'] || env['action_dispatch.exception']
-
+      error = env['rack.exception'] || env['sinatra.error']
       Raven::Rack.capture_exception(error, env) if error
 
       response
     end
   end
+
+  module RackInterface
+    def from_rack(env_hash)
+      req = ::Rack::Request.new(env_hash)
+
+      self.url = req.scheme && req.url.split('?').first
+      self.method = req.request_method
+      self.query_string = req.query_string
+      self.data = read_data_from(req)
+
+      self.headers = format_headers_for_sentry(env_hash)
+      self.env = format_env_for_sentry(env_hash)
+    end
+
+    private
+
+    def read_data_from(request)
+      if request.form_data?
+        request.POST
+      elsif request.body
+        data = request.body.read
+        request.body.rewind
+        data
+      end
+    end
+
+    def format_headers_for_sentry(env_hash)
+      env_hash.each_with_object({}) do |(key, value), memo|
+        key = key.to_s # rack env can contain symbols
+        value = value.to_s
+        next unless key.upcase == key # Non-upper case stuff isn't either
+        # Rack adds in an incorrect HTTP_VERSION key, which causes downstream
+        # to think this is a Version header. Instead, this is mapped to
+        # env['SERVER_PROTOCOL']. But we don't want to ignore a valid header
+        # if the request has legitimately sent a Version header themselves.
+        # See: https://github.com/rack/rack/blob/028438f/lib/rack/handler/cgi.rb#L29
+        next if key == 'HTTP_VERSION' && value == ENV['SERVER_PROTOCOL']
+        if key.start_with?('HTTP_')
+          # Header
+          http_key = key[5..key.length - 1].split('_').map(&:capitalize).join('-')
+          memo[http_key] = value
+        elsif %w(CONTENT_TYPE CONTENT_LENGTH).include? key
+          memo[key.capitalize] = value
+        end
+      end
+    end
+
+    def format_env_for_sentry(env_hash)
+      trimmed_hash = env_hash.select do |k, _v|
+        %w(REMOTE_ADDR SERVER_NAME SERVER_PORT).include? k.to_s
+      end
+      Hash[trimmed_hash] # select returns an Array in Ruby 1.8
+    end
+  end
+
+  class HttpInterface
+    include RackInterface
+  end
 end

data/lib/raven/integrations/rails.rb

@@ -1,4 +1,3 @@
-require 'raven'
 require 'rails'
 
 module Raven
@@ -35,8 +34,10 @@ module Raven
       require 'raven/integrations/tasks'
     end
 
-    runner do
-      Raven.capture
+    if defined?(runner)
+      runner do
+        Raven.capture
+      end
     end
   end
 end

data/lib/raven/integrations/rake.rb

@@ -10,4 +10,4 @@ module Rake
       orig_display_error_messsage(ex)
     end
   end
-end
+end

data/lib/raven/integrations/sidekiq.rb

@@ -23,6 +23,33 @@ if Sidekiq::VERSION < '3'
   end
 else
   Sidekiq.configure_server do |config|
-    config.error_handlers << Proc.new {|ex,context| Raven.capture_exception(ex, :extra => {:sidekiq => context}) }
+    config.error_handlers << Proc.new do |ex, context|
+      Raven.capture_exception(ex, :extra => {
+        :sidekiq => filter_context(context)
+      })
+    end
+  end
+end
+
+def filter_context(context)
+  case context
+  when Array
+    context.map { |arg| filter_context(arg) }
+  when Hash
+    Hash[context.map { |key, value| filter_context_hash(key, value) }]
+  else
+    context
   end
 end
+
+def filter_context_hash(key, value)
+  # Strip any `_aj` prefixes from keys.
+  # These keys come from an internal serialized object from ActiveJob.
+  # Internally, there are a subset of keys that ActiveJob references, but
+  # these are declared as private, and I don't think it's wise
+  # to keep chasing what this list is. But they all use a common prefix, so
+  # we want to strip this becuase ActiveJob will complain.
+  # e.g.: _aj_globalid -> _globalid
+  (key = key[3..-1]) if key [0..3] == "_aj_"
+  [key, filter_context(value)]
+end

data/lib/raven/integrations/tasks.rb

@@ -1,5 +1,4 @@
 require 'rake'
-require 'raven'
 require 'raven/cli'
 
 namespace :raven do

data/lib/raven/interfaces/exception.rb

@@ -2,7 +2,6 @@ require 'raven/interfaces'
 
 module Raven
   class ExceptionInterface < Interface
-
     name 'exception'
     attr_accessor :values
 

data/lib/raven/interfaces/http.rb

@@ -2,7 +2,6 @@ require 'raven/interfaces'
 
 module Raven
   class HttpInterface < Interface
-
     name 'request'
     attr_accessor :url
     attr_accessor :method
@@ -18,36 +17,6 @@ module Raven
       self.cookies = nil
       super(*arguments)
     end
-
-    def from_rack(env)
-      req = ::Rack::Request.new(env)
-      self.url = req.scheme && req.url.split('?').first
-      self.method = req.request_method
-      self.query_string = req.query_string
-      env.each_pair do |key, value|
-        key = key.to_s #rack env can contain symbols
-        next unless key.upcase == key # Non-upper case stuff isn't either
-        if key.start_with?('HTTP_')
-          # Header
-          http_key = key[5..key.length - 1].split('_').map { |s| s.capitalize }.join('-')
-          self.headers[http_key] = value.to_s
-        elsif ['CONTENT_TYPE', 'CONTENT_LENGTH'].include? key
-          self.headers[key.capitalize] = value.to_s
-        elsif ['REMOTE_ADDR', 'SERVER_NAME', 'SERVER_PORT'].include? key
-          # Environment
-          self.env[key] = value.to_s
-        end
-      end
-
-      self.data =
-        if req.form_data?
-          req.POST
-        elsif req.body
-          data = req.body.read
-          req.body.rewind
-          data
-        end
-    end
   end
 
   register_interface :http => HttpInterface

data/lib/raven/interfaces/message.rb

@@ -2,7 +2,6 @@ require 'raven/interfaces'
 
 module Raven
   class MessageInterface < Interface
-
     name 'sentry.interfaces.Message'
     attr_accessor :message
     attr_accessor :params

data/lib/raven/interfaces/single_exception.rb

@@ -2,7 +2,6 @@ require 'raven/interfaces'
 
 module Raven
   class SingleExceptionInterface < Interface
-
     attr_accessor :type
     attr_accessor :value
     attr_accessor :module

data/lib/raven/interfaces/stack_trace.rb

@@ -2,7 +2,6 @@ require 'raven/interfaces'
 
 module Raven
   class StacktraceInterface < Interface
-
     name 'stacktrace'
     attr_accessor :frames
 
@@ -13,7 +12,7 @@ module Raven
 
     def to_hash(*args)
       data = super(*args)
-      data[:frames] = data[:frames].map { |frame| frame.to_hash }
+      data[:frames] = data[:frames].map(&:to_hash)
       data
     end
 
@@ -37,13 +36,14 @@ module Raven
       def filename
         return nil if self.abs_path.nil?
 
-        prefix = if under_project_root? && in_app
-          project_root
-        elsif under_project_root?
-          longest_load_path || project_root
-        else
-          longest_load_path
-        end
+        prefix =
+          if under_project_root? && in_app
+            project_root
+          elsif under_project_root?
+            longest_load_path || project_root
+          else
+            longest_load_path
+          end
 
         prefix ? self.abs_path[prefix.to_s.chomp(File::SEPARATOR).length+1..-1] : self.abs_path
       end

data/lib/raven/linecache.rb

@@ -7,7 +7,7 @@ module Raven
 
       def is_valid_file(path)
         lines = getlines(path)
-        return lines != nil
+        !lines.nil?
       end
 
       def getlines(path)
@@ -21,7 +21,7 @@ module Raven
       def getline(path, n)
         return nil if n < 1
         lines = getlines(path)
-        return nil if lines == nil
+        return nil if lines.nil?
         lines[n - 1]
       end
     end

data/lib/raven/okjson.rb

@@ -221,7 +221,7 @@ private
     ts = []
     while s.length > 0
       typ, lexeme, val = tok(s)
-      if typ == nil
+      if typ.nil?
         raise Error, "invalid character at #{s[0,10].inspect}"
       end
       if typ != :space
@@ -289,7 +289,7 @@ private
 
   def strtok(s)
     m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
-    if ! m
+    unless m
       raise Error, "invalid string literal at #{abbrev(s)}"
     end
     [:str, m[0], unquote(m[0])]
@@ -448,6 +448,7 @@ private
     case k
     when String then strenc(k)
     when Symbol then strenc(k.to_s)
+    when Fixnum then strenc(k.to_s)
     else
       raise Error, "Hash key is not a string: #{k.inspect}"
     end

data/lib/raven/processor.rb

@@ -4,7 +4,7 @@ module Raven
       @client = client
     end
 
-    def process(data)
+    def process(_data)
       raise NotImplementedError
     end
   end

data/lib/raven/processor/removecircularreferences.rb

@@ -1,17 +1,15 @@
 module Raven
   class Processor::RemoveCircularReferences < Processor
-
     def process(v, visited = [])
       return "(...)" if visited.include?(v.__id__)
       visited += [v.__id__]
       if v.is_a?(Hash)
-        v.reduce({}) { |memo, (k, v_)| memo[k] = process(v_, visited); memo }
+        v.each_with_object({}) { |(k, v_), memo| memo[k] = process(v_, visited) }
       elsif v.is_a?(Array)
         v.map { |v_| process(v_, visited) }
       else
         v
       end
     end
-
   end
 end

data/lib/raven/processor/removestacktrace.rb

@@ -1,6 +1,5 @@
 module Raven
   class Processor::RemoveStacktrace < Processor
-
     def process(value)
       if value[:exception]
         value[:exception][:values].map do |single_exception|
@@ -10,6 +9,5 @@ module Raven
 
       value
     end
-
   end
 end

data/lib/raven/processor/sanitizedata.rb

@@ -16,7 +16,7 @@ module Raven
     end
 
     def process(value)
-      value.inject(value) { |memo,(k,v)|  memo[k] = sanitize(k,v); memo }
+      value.each_with_object(value) { |(k,v), memo| memo[k] = sanitize(k,v) }
     end
 
     def sanitize(k,v)
@@ -45,7 +45,7 @@ module Raven
     private
 
     def sanitize_query_string(query_string)
-      query_hash = CGI::parse(query_string)
+      query_hash = CGI.parse(query_string)
       processed_query_hash = process(query_hash)
       URI.encode_www_form(processed_query_hash)
     end

data/lib/raven/processor/utf8conversion.rb

@@ -1,11 +1,14 @@
 module Raven
   class Processor::UTF8Conversion < Processor
-
     def process(value)
       if value.is_a? Array
         value.map { |v| process v }
       elsif value.is_a? Hash
         value.merge(value) { |_, v| process v }
+      elsif value.is_a?(Exception) && !value.message.valid_encoding?
+        clean_exc = value.class.new(clean_invalid_utf8_bytes(value.message))
+        clean_exc.set_backtrace(value.backtrace)
+        clean_exc
       else
         clean_invalid_utf8_bytes(value)
       end

data/lib/raven/transports.rb

@@ -3,14 +3,13 @@ require 'raven/error'
 module Raven
   module Transports
     class Transport
-
       attr_accessor :configuration
 
       def initialize(configuration)
         @configuration = configuration
       end
 
-      def send_event#(auth_header, data, options = {})
+      def send_event #(auth_header, data, options = {})
         raise NotImplementedError.new('Abstract method not implemented')
       end
 

data/lib/raven/transports/dummy.rb

@@ -0,0 +1,16 @@
+module Raven
+  module Transports
+    class Dummy < Transport
+      attr_accessor :events
+
+      def initialize(*)
+        super
+        @events = []
+      end
+
+      def send_event(auth_header, data, options = {})
+        @events << [auth_header, data, options]
+      end
+    end
+  end
+end

data/lib/raven/transports/http.rb

@@ -6,9 +6,17 @@ require 'raven/error'
 module Raven
   module Transports
     class HTTP < Transport
+      attr_accessor :conn, :adapter
+
+      def initialize(*args)
+        super
+        self.adapter = configuration.http_adapter || Faraday.default_adapter
+        self.conn = set_conn
+      end
+
       def send_event(auth_header, data, options = {})
-        project_id = self.configuration[:project_id]
-        path = self.configuration[:path] + "/"
+        project_id = configuration[:project_id]
+        path = configuration[:path] + "/"
 
         response = conn.post "#{path}api/#{project_id}/store/" do |req|
           req.headers['Content-Type'] = options[:content_type]
@@ -19,48 +27,31 @@ module Raven
         response
       end
 
-      def send(auth_header, data, options = {})
-        Raven.logger.warn "DEPRECATION WARNING: Calling #send on a Transport will be \
-          removed in Raven-Ruby 0.14! Use #send_event instead!"
-        send_event(auth_header, data, options)
-      end
-
       private
 
-      def conn
-        @conn ||= begin
-          self.verify_configuration
+      def set_conn
+        verify_configuration
 
-          Raven.logger.debug "Raven HTTP Transport connecting to #{self.configuration.server}"
+        Raven.logger.debug "Raven HTTP Transport connecting to #{configuration.server}"
 
-          ssl_configuration = self.configuration.ssl || {}
-          ssl_configuration[:verify] = self.configuration.ssl_verification
-          ssl_configuration[:ca_file] = self.configuration.ssl_ca_file
+        ssl_configuration = configuration.ssl || {}
+        ssl_configuration[:verify] = configuration.ssl_verification
+        ssl_configuration[:ca_file] = configuration.ssl_ca_file
 
-          conn = Faraday.new(
-            :url => self.configuration[:server],
-            :ssl => ssl_configuration
-          ) do |builder|
-            builder.adapter(*adapter)
-          end
-
-          if self.configuration.proxy
-            conn.options[:proxy] = self.configuration.proxy
-          end
+        conn = Faraday.new(
+          :url => configuration[:server],
+          :ssl => ssl_configuration
+        ) do |builder|
+          builder.adapter(*adapter)
+        end
 
-          if self.configuration.timeout
-            conn.options[:timeout] = self.configuration.timeout
-          end
-          if self.configuration.open_timeout
-            conn.options[:open_timeout] = self.configuration.open_timeout
-          end
+        conn.headers[:user_agent] = "sentry-ruby/#{Raven::VERSION}"
 
-          conn
-        end
-      end
+        conn.options[:proxy] = configuration.proxy if configuration.proxy
+        conn.options[:timeout] = configuration.timeout if configuration.timeout
+        conn.options[:open_timeout] = configuration.open_timeout if configuration.open_timeout
 
-      def adapter
-        configuration.http_adapter || Faraday.default_adapter
+        conn
       end
     end
   end

data/lib/raven/transports/udp.rb

@@ -10,12 +10,6 @@ module Raven
         conn.send "#{auth_header}\n\n#{data}", 0
       end
 
-      def send(auth_header, data, options = {})
-        Raven.logger.warn "DEPRECATION WARNING: Calling #send on a Transport will be \
-          removed in Raven-Ruby 0.14! Use #send_event instead!"
-        send_event(auth_header, data, options)
-      end
-
     private
 
       def conn

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +122,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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'
 description: A gem that provides a client interface for the Sentry error logger
 email: getsentry@googlegroups.com
-executables:
-- raven
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -105,7 +146,6 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- bin/raven
 - lib/raven.rb
 - lib/raven/backports/uri.rb
 - lib/raven/backtrace.rb
@@ -141,6 +181,7 @@ files:
 - lib/raven/processor/sanitizedata.rb
 - lib/raven/processor/utf8conversion.rb
 - lib/raven/transports.rb
+- lib/raven/transports/dummy.rb
 - lib/raven/transports/http.rb
 - lib/raven/transports/udp.rb
 - lib/raven/version.rb
@@ -158,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem that provides a client interface for the Sentry error logger

data/bin/raven

@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-
-require "raven"
-require "raven/cli"
-require "optparse"
-
-parser = OptionParser.new do |opt|
-  opt.banner = "Usage: raven COMMAND [OPTIONS]"
-  opt.separator  ""
-  opt.separator  "Commands"
-  opt.separator  "     test: send a test event"
-  opt.separator  ""
-  opt.separator  "Options"
-
-  # opt.on("-e","--environment ENVIRONMENT","which environment you want server run") do |environment|
-  #   options[:environment] = environment
-  # end
-
-  # opt.on("-d","--daemon","runing on daemon mode?") do
-  #   options[:daemon] = true
-  # end
-
-  opt.on("-h","--help","help") do
-    puts parser
-  end
-end
-
-parser.parse!
-
-case ARGV[0]
-  when "test"
-    dsn = ARGV[1] if ARGV.length > 1
-    if !dsn
-      puts "Usage: raven test <dsn>"
-    else
-      Raven::CLI::test(dsn)
-    end
-  else
-    puts parser
-end