sentry-raven 0.4.2 → 0.4.3

data/lib/raven.rb

@@ -1,9 +1,10 @@
 require 'raven/version'
 require 'raven/backtrace'
 require 'raven/configuration'
-require 'raven/logger'
+require 'raven/context'
 require 'raven/client'
 require 'raven/event'
+require 'raven/logger'
 require 'raven/rack'
 require 'raven/interfaces/message'
 require 'raven/interfaces/exception'
@@ -25,13 +26,15 @@ module Raven
     # values for all Raven configuration options. See Raven::Configuration.
     attr_writer :configuration
 
-    def logger
-      @logger ||= Logger.new
+    # Additional context for events
+    attr_writer :context
+
+    def context
+      @context ||= Context.new
     end
 
-    # Tell the log that the client is good to go
-    def report_ready
-      self.logger.info "Raven #{VERSION} ready to catch errors"
+    def logger
+      @logger ||= Logger.new
     end
 
     # The configuration object.
@@ -45,6 +48,11 @@ module Raven
       @client ||= Client.new(configuration)
     end
 
+    # Tell the log that the client is good to go
+    def report_ready
+      self.logger.info "Raven #{VERSION} ready to catch errors"
+    end
+
     # Call this method to modify defaults in your initializers.
     #
     # @example
@@ -108,22 +116,16 @@ module Raven
       send(evt) if evt
     end
 
-    # Bind context for any future events
-    #
-    # @example
-    #   Raven.context({
-    #     :tags => {
-    #       'key' => 'value',
-    #     }
-    #   })
-    def context(hash = {})
-      Thread.current[:sentry_context] ||= {}
-      Thread.current[:sentry_context].merge!(hash)
-      self
+    def user_context(options={})
+      self.context.user.merge!(options)
+    end
+
+    def tags_context(options={})
+      self.context.tags.merge!(options)
     end
 
-    def clear!
-      Thread.current[:sentry_context] = nil
+    def extra_context(options={})
+      self.context.extra.merge!(options)
     end
 
     # For cross-language compat

data/lib/raven/client.rb

@@ -10,7 +10,7 @@ module Raven
 
   class Client
 
-    PROTOCOL_VERSION = '3.0'
+    PROTOCOL_VERSION = '3'
     USER_AGENT = "raven-ruby/#{Raven::VERSION}"
     CONTENT_TYPE = 'application/json'
 

data/lib/raven/configuration.rb

@@ -51,6 +51,9 @@ module Raven
 
     attr_reader :current_environment
 
+    # The Faraday adapter to be used. Will default to Net::HTTP when not set.
+    attr_accessor :http_adapter
+
     IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
                       'ActionController::RoutingError',
                       'ActionController::InvalidAuthenticityToken',

data/lib/raven/context.rb

@@ -0,0 +1,19 @@
+module Raven
+  class Context
+    def current
+      Thread.current[:sentry_context] ||= new
+    end
+    
+    def clear!
+      Thread.current[:sentry_context] = nil
+    end
+    
+    attr_reader :extra, :tags, :user
+    
+    def initialize
+      @extra  = {}
+      @tags   = {}
+      @user   = {}
+    end
+  end
+end

data/lib/raven/event.rb

@@ -23,27 +23,22 @@ module Raven
     PLATFORM = "ruby"
 
     attr_reader :id
-    attr_accessor :project, :message, :timestamp, :level, :context
+    attr_accessor :project, :message, :timestamp, :level
     attr_accessor :logger, :culprit, :server_name, :modules, :extra, :tags
 
     def initialize(options={}, &block)
       @configuration = options[:configuration] || Raven.configuration
       @interfaces = {}
 
-      @context = Thread.current[:sentry_context] || {}
+      context = options[:context] || Raven.context
 
       @id = options[:id] || UUIDTools::UUID.random_create.hexdigest
       @message = options[:message]
       @timestamp = options[:timestamp] || Time.now.utc
 
-      @level = options[:level]
-      @logger = options[:logger]
+      @level = options[:level] || :error
+      @logger = options[:logger] || 'root'
       @culprit = options[:culprit]
-
-      @extra = options[:extra] || {}
-      @tags = options[:tags] || {}
-
-      # Try to resolve the hostname to an FQDN, but fall back to whatever the load name is
       @server_name = options[:server_name] || get_hostname
 
       if @configuration.send_modules
@@ -51,15 +46,16 @@ module Raven
       end
       @modules = options[:modules]
 
-      block.call(self) if block
+      @user = options[:user] || {}
+      @user.merge!(context.user)
 
-      # Merge in context
-      @level ||= @context[:level] || :error
-      @logger ||= @context[:logger] || 'root'
-      @culprit ||= @context[:culprit]
+      @extra = options[:extra] || {}
+      @extra.merge!(context.extra)
 
-      @tags.merge!(@context[:tags]) if @context[:tags]
-      @extra.merge!(@context[:extra]) if @context[:extra]
+      @tags = options[:tags] || {}
+      @tags.merge!(context.tags)
+
+      block.call(self) if block
 
       # Some type coercion
       @timestamp = @timestamp.strftime('%Y-%m-%dT%H:%M:%S') if @timestamp.is_a?(Time)
@@ -67,6 +63,7 @@ module Raven
     end
 
     def get_hostname
+      # Try to resolve the hostname to an FQDN, but fall back to whatever the load name is
       hostname = Socket.gethostname
       hostname = Socket.gethostbyname(hostname).first rescue hostname
     end
@@ -93,19 +90,20 @@ module Raven
 
     def to_hash
       data = {
-        'event_id' => self.id,
-        'message' => self.message,
-        'timestamp' => self.timestamp,
-        'level' => self.level,
-        'project' => self.project,
-        'logger' => self.logger,
+        'event_id' => @id,
+        'message' => @message,
+        'timestamp' => @timestamp,
+        'level' => @level,
+        'project' => @project,
+        'logger' => @logger,
         'platform' => PLATFORM,
       }
-      data['culprit'] = self.culprit if self.culprit
-      data['server_name'] = self.server_name if self.server_name
-      data['modules'] = self.modules if self.modules
-      data['extra'] = self.extra if self.extra
-      data['tags'] = self.tags if self.tags
+      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['sentry.interfaces.User'] = @user if @user
       @interfaces.each_pair do |name, int_data|
         data[name] = int_data.to_hash
       end

data/lib/raven/transports/http.rb

@@ -30,13 +30,17 @@ module Raven
             :url => self.configuration[:server],
             :ssl => {:verify => self.configuration.ssl_verification}
           ) do |builder|
-            builder.adapter Faraday.default_adapter
+            builder.adapter(*adapter)
             builder.options[:timeout] = self.configuration.timeout if self.configuration.timeout
             builder.options[:open_timeout] = self.configuration.open_timeout if self.configuration.open_timeout
           end
         end
       end
 
+      def adapter
+        configuration.http_adapter || Faraday.default_adapter
+      end
+
     end
 
   end

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -88,6 +88,7 @@ files:
 - lib/raven/backtrace.rb
 - lib/raven/client.rb
 - lib/raven/configuration.rb
+- lib/raven/context.rb
 - lib/raven/error.rb
 - lib/raven/event.rb
 - lib/raven/interfaces/exception.rb