sentry-raven 0.7.1 → 0.8.0

data/lib/raven/cli.rb

@@ -2,7 +2,7 @@ require 'raven'
 
 module Raven
   class CLI
-    def self.test(dsn=nil)
+    def self.test(dsn = nil)
       require 'logger'
 
       logger = ::Logger.new(STDOUT)
@@ -13,26 +13,24 @@ module Raven
 
       Raven.configuration.logger = logger
 
-      if dsn then
-        Raven.configuration.dsn = dsn
-      end
+      Raven.configuration.dsn = dsn if dsn
 
       # wipe out env settings to ensure we send the event
-      if !Raven.configuration.send_in_current_environment? then
+      unless Raven.configuration.send_in_current_environment?
         environments = Raven.configuration.environments
         env_name = (environments && environments[0]) || 'production'
         puts "Setting environment to #{env_name}"
         Raven.configuration.current_environment = env_name
       end
 
-      if !Raven.configuration.server then
+      unless Raven.configuration.server
         puts "Your client is not configured!"
         exit 1
       end
 
       puts "Client configuration:"
       ['server', 'project_id', 'public_key', 'secret_key'].each do |key|
-        if !Raven.configuration[key] then
+        unless Raven.configuration[key]
           puts "Missing configuration for #{key}"
           exit 1
         end
@@ -48,7 +46,7 @@ module Raven
         evt = Raven.capture_exception(exception)
       end
 
-      if evt then
+      if evt
         puts "-> event ID: #{evt.id}"
       else
         puts ""
@@ -60,4 +58,4 @@ module Raven
       puts "Done!"
     end
   end
-end
+end

data/lib/raven/client.rb

@@ -22,8 +22,8 @@ module Raven
     end
 
     def send(event)
-      if !configuration.send_in_current_environment?
-        Raven.logger.debug "Event not sent due to excluded environment: #{configuration.current_environment}"
+      unless configuration.send_in_current_environment?
+        configuration.log_excluded_environment_message
         return
       end
 
@@ -34,17 +34,17 @@ module Raven
       content_type, encoded_data = encode(event)
       begin
         transport.send(generate_auth_header(encoded_data), encoded_data,
-                     :content_type => content_type)
+                       :content_type => content_type)
       rescue => e
         Raven.logger.error "Unable to record event with remote Sentry server (#{e.class} - #{e.message})"
         e.backtrace[0..10].each { |line| Raven.logger.error(line) }
         return
       end
 
-      return event
+      event
     end
 
-  private
+    private
 
     def encode(event)
       hash = event.to_hash
@@ -67,7 +67,8 @@ module Raven
     end
 
     def transport
-      @transport ||= case self.configuration.scheme
+      @transport ||=
+        case self.configuration.scheme
         when 'udp'
           Transports::UDP.new self.configuration
         when 'http', 'https'
@@ -86,9 +87,7 @@ module Raven
         'sentry_key' => self.configuration.public_key,
         'sentry_secret' => self.configuration.secret_key,
       }
-      'Sentry ' + fields.map{|key, value| "#{key}=#{value}"}.join(', ')
+      'Sentry ' + fields.map { |key, value| "#{key}=#{value}" }.join(', ')
     end
-
   end
-
 end

data/lib/raven/configuration.rb

@@ -67,9 +67,15 @@ module Raven
     # DEPRECATED: This option is now ignored as we use our own adapter.
     attr_accessor :json_adapter
 
-    # Default tags for events 
+    # Default tags for events
     attr_accessor :tags
 
+    # Optional Proc to be used to send events asynchronously.
+    attr_reader :async
+
+    # Exceptions from these directories to be ignored
+    attr_accessor :app_dirs_pattern
+
     IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
                       'ActionController::RoutingError',
                       'ActionController::InvalidAuthenticityToken',
@@ -90,10 +96,11 @@ module Raven
       self.timeout = 1
       self.open_timeout = 1
       self.tags = {}
+      self.async = false
     end
 
     def server=(value)
-      uri = URI::parse(value)
+      uri = URI.parse(value)
       uri_path = uri.path.split('/')
 
       if uri.user
@@ -110,7 +117,7 @@ module Raven
 
       # For anyone who wants to read the base server string
       @server = "#{@scheme}://#{@host}"
-      @server << ":#{@port}" unless @port == {'http'=>80,'https'=>443}[@scheme]
+      @server << ":#{@port}" unless @port == { 'http' => 80, 'https' => 443 }[@scheme]
       @server << @path
     end
 
@@ -121,6 +128,13 @@ module Raven
 
     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))
+      @async = value
+    end
+
+    alias_method :async?, :async
+
     # Allows config options to be read like a hash
     #
     # @param [Symbol] option Key for a given attribute
@@ -140,5 +154,8 @@ module Raven
       end
     end
 
+    def log_excluded_environment_message
+      Raven.logger.debug "Event not sent due to excluded environment: #{current_environment}"
+    end
   end
 end

data/lib/raven/error.rb

@@ -1,6 +1,4 @@
 module Raven
-
   class Error < StandardError
   end
-
 end

data/lib/raven/event.rb

@@ -26,7 +26,7 @@ module Raven
     attr_accessor :project, :message, :timestamp, :level
     attr_accessor :logger, :culprit, :server_name, :modules, :extra, :tags
 
-    def initialize(options={}, &block)
+    def initialize(options = {}, &block)
       @configuration = options[:configuration] || Raven.configuration
       @interfaces = {}
 
@@ -41,9 +41,8 @@ module Raven
       @culprit = options[:culprit]
       @server_name = options[:server_name] || @configuration.server_name || get_hostname
 
-      if @configuration.send_modules
-        options[:modules] ||= get_modules
-      end
+      options[:modules] ||= get_modules if @configuration.send_modules
+
       @modules = options[:modules]
 
       @user = options[:user] || {}
@@ -79,11 +78,11 @@ module Raven
 
     def get_modules
       # 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)
+      Hash[Gem::Specification.map { |spec| [spec.name, spec.version.to_s] }] if Gem::Specification.respond_to?(:map)
     end
 
-    def interface(name, value=nil, &block)
-      int = Raven::find_interface(name)
+    def interface(name, value = nil, &block)
+      int = Raven.find_interface(name)
       raise Error.new("Unknown interface: #{name}") unless int
       @interfaces[int.name] = int.new(value, &block) if value || block
       @interfaces[int.name]
@@ -119,7 +118,7 @@ module Raven
       data
     end
 
-    def self.from_exception(exc, options={}, &block)
+    def self.from_exception(exc, options = {}, &block)
       notes = exc.instance_variable_get(:@__raven_context) || {}
       options = notes.merge(options)
 
@@ -140,21 +139,21 @@ module Raven
         evt.message = "#{exc.class.to_s}: #{exc.message}"
         evt.level = options[:level] || :error
         evt.parse_exception(exc)
-        if (exc.backtrace)
+        if exc.backtrace
           evt.interface :stack_trace do |int|
             backtrace = Backtrace.parse(exc.backtrace)
-            int.frames = backtrace.lines.reverse.map { |line|
+            int.frames = backtrace.lines.reverse.map do |line|
               int.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 and frame.abs_path
+                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
-            }.select{ |f| f.filename }
+            end.select { |f| f.filename }
             evt.culprit = evt.get_culprit(int.frames)
           end
         end
@@ -162,7 +161,7 @@ module Raven
       end
     end
 
-    def self.from_message(message, options={})
+    def self.from_message(message, options = {})
       new(options) do |evt|
         evt.message = message
         evt.level = options[:level] || :error
@@ -178,20 +177,20 @@ module Raven
 
     def get_file_context(filename, lineno, context)
       lines = (2 * context + 1).times.map do |i|
-        Raven::LineCache::getline(filename, lineno - context + i)
+        Raven::LineCache.getline(filename, lineno - context + i)
       end
-      [lines[0..(context-1)], lines[context], lines[(context+1)..-1]]
+      [lines[0..(context - 1)], lines[context], lines[(context + 1)..-1]]
     end
 
     def get_culprit(frames)
-      lastframe = frames.reverse.detect { |f| f.in_app } || frames.last
+      lastframe = frames.reverse.find { |f| f.in_app } || frames.last
       "#{lastframe.filename} in #{lastframe.function} at line #{lastframe.lineno}" if lastframe
     end
 
     def parse_exception(exception)
       interface(:exception) do |int|
         int.type = exception.class.to_s
-        int.value = exception.message
+        int.value = exception.to_s
         int.module = exception.class.to_s.split('::')[0...-1].join('::')
       end
     end
@@ -203,7 +202,5 @@ module Raven
       alias :capture_exception :from_exception
       alias :capture_message :from_message
     end
-
-    private
   end
 end

data/lib/raven/interfaces.rb

@@ -5,7 +5,7 @@ module Raven
   INTERFACES = {}
 
   class Interface < Hashie::Dash
-    def initialize(attributes={}, &block)
+    def initialize(attributes = {}, &block)
       @check_required = false
       super(attributes)
       block.call(self) if block
@@ -17,7 +17,7 @@ module Raven
       super if @check_required
     end
 
-    def self.name(value=nil)
+    def self.name(value = nil)
       @interface_name = value if value
       @interface_name
     end
@@ -33,5 +33,4 @@ module Raven
   def self.find_interface(name)
     INTERFACES[name.to_s]
   end
-
 end

data/lib/raven/interfaces/exception.rb

@@ -1,16 +1,13 @@
 require 'raven/interfaces'
 
 module Raven
-
   class ExceptionInterface < Interface
 
     name 'sentry.interfaces.Exception'
     property :type, :required => true
     property :value, :required => true
     property :module
-
   end
 
   register_interface :exception => ExceptionInterface
-
 end

data/lib/raven/interfaces/http.rb

@@ -1,7 +1,6 @@
 require 'raven/interfaces'
 
 module Raven
-
   class HttpInterface < Interface
 
     name 'sentry.interfaces.Http'
@@ -29,7 +28,7 @@ module Raven
         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('-')
+          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
@@ -38,17 +37,17 @@ module Raven
           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
 
+      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
-
 end

data/lib/raven/interfaces/message.rb

@@ -1,7 +1,6 @@
 require 'raven/interfaces'
 
 module Raven
-
   class MessageInterface < Interface
 
     name 'sentry.interfaces.Message'
@@ -15,5 +14,4 @@ module Raven
   end
 
   register_interface :message => MessageInterface
-
 end

data/lib/raven/interfaces/stack_trace.rb

@@ -3,7 +3,6 @@ require 'hashie'
 require 'raven/interfaces'
 
 module Raven
-
   class StacktraceInterface < Interface
 
     name 'sentry.interfaces.Stacktrace'
@@ -14,13 +13,13 @@ module Raven
       super(*arguments)
     end
 
-    def to_hash
-      data = super
-      data['frames'] = data['frames'].map{|frame| frame.to_hash}
+    def to_hash(*args)
+      data = super(*args)
+      data['frames'] = data['frames'].map { |frame| frame.to_hash }
       data
     end
 
-    def frame(attributes=nil, &block)
+    def frame(attributes = nil, &block)
       Frame.new(attributes, &block)
     end
 
@@ -45,12 +44,12 @@ module Raven
       def filename
         return nil if self.abs_path.nil?
 
-        prefix = $:.select {|s| self.abs_path.start_with?(s.to_s)}.sort_by {|s| s.to_s.length}.last
+        prefix = $LOAD_PATH.select { |s| self.abs_path.start_with?(s.to_s) }.sort_by { |s| s.to_s.length }.last
         prefix ? self.abs_path[prefix.chomp(File::SEPARATOR).length+1..-1] : self.abs_path
       end
 
-      def to_hash
-        data = super
+      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?
@@ -59,9 +58,7 @@ module Raven
         data
       end
     end
-
   end
 
   register_interface :stack_trace => StacktraceInterface
-
 end

data/lib/raven/linecache.rb

@@ -16,10 +16,8 @@ module Raven
 
       def getline(path, n)
         return nil if n < 1
-        getlines(path)[n-1]
+        getlines(path)[n - 1]
       end
-
     end
   end
-
 end

data/lib/raven/logger.rb

@@ -13,12 +13,10 @@ module Raven
         msg = args[0] # Block-level default args is a 1.9 feature
         msg ||= block.call if block
         logger = Raven.configuration[:logger]
-        if logger.nil?
-          logger = ::Logger.new(STDOUT)
-        end
+        logger = ::Logger.new(STDOUT) if logger.nil?
+
         logger.send(level, "#{LOG_PREFIX}#{msg}") if logger
       end
     end
-
   end
 end