sentry-raven 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd5b9f37fa1ca79dea7e89151503de77596ed98
-  data.tar.gz: aaedca0037e5beb365920db50e7e1b0051f9e7c4
+  metadata.gz: 0068907131d47616cf8229a45fb15dc5d736f680
+  data.tar.gz: 5060b2230dee53bd64eab9b5f7da98a8737eb8df
 SHA512:
-  metadata.gz: c462bfc11f2cde6d33464b16b0ae3986ac62ea34a63d16f2185d4d4f5cbf1c7bf6a18228058f17d1aeefad3aa47827deba61eed49f33a2db786bfff91ff42c8f
-  data.tar.gz: 38266e8ad1642b99d59fcafef2c42814d09e9ebcbd8800e7a4af2040068be367ff3a4907a60df17b8f00173a9631f1d03b9381f31c6dc189e70b64bb8cb7c9f2
+  metadata.gz: 7bcf7fb4332ea22d13f703cf68158b3462678750faa6f3ea6d121bc9f79690c96d104d39a273353dfb68d229370cf9fa7c30135947b2bfac6cba9bbaba7d9bce
+  data.tar.gz: d7bd1e408b8d66d9fedacea5782723d23f6f6fa3cf1019ee34cfc07a84046239a44bd05be2e0cb07cf19bfdd785389b31093c4996a5c77e9e9678ce4bee2ac62

data/lib/raven/base.rb

@@ -79,8 +79,14 @@ module Raven
     # @example
     #   evt = Raven::Event.new(:message => "An error")
     #   Raven.send(evt)
-    def send(evt)
-      client.send(evt)
+    def send_event(event)
+      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
@@ -195,7 +201,7 @@ module Raven
 
     # Injects various integrations
     def inject
-      available_integrations = %w[delayed_job rails sidekiq rack rake]
+      available_integrations = %w[delayed_job railties sidekiq rack rake]
       integrations_to_load = available_integrations & Gem.loaded_specs.keys
       # TODO(dcramer): integrations should have some additional checks baked-in
       # or we should break them out into their own repos. Specifically both the

data/lib/raven/cli.rb

@@ -17,28 +17,15 @@ module Raven
 
       # wipe out env settings to ensure we send the event
       unless Raven.configuration.send_in_current_environment?
-        environments = Raven.configuration.environments
-        env_name = (environments && environments[0]) || 'production'
+        env_name = Raven.configuration.environments.pop || 'production'
         puts "Setting environment to #{env_name}"
         Raven.configuration.current_environment = env_name
       end
 
-      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|
-        unless Raven.configuration[key]
-          puts "Missing configuration for #{key}"
-          exit 1
-        end
-        puts "-> #{key}: #{Raven.configuration[key]}"
-      end
-      puts ""
+      Raven.configuration.verify!
 
       puts "Sending a test event:"
+      puts ""
 
       begin
         1 / 0
@@ -53,7 +40,11 @@ module Raven
           puts "-> event ID: #{evt.id}"
         end
       elsif evt #async configuration
-        puts "-> event ID: #{evt.value.id}"
+        if evt.value.is_a? Hash
+          puts "-> event ID: #{evt.value[:event_id]}"
+        else
+          puts "-> event ID: #{evt.value.id}"
+        end
       else
         puts ""
         puts "An error occurred while attempting to send the event."

data/lib/raven/client.rb

@@ -21,7 +21,7 @@ module Raven
       @state = ClientState.new
     end
 
-    def send(event)
+    def send_event(event)
       return false unless configuration_allows_sending
 
       # Convert to hash
@@ -37,7 +37,7 @@ module Raven
       content_type, encoded_data = encode(event)
 
       begin
-        transport.send(generate_auth_header, encoded_data,
+        transport.send_event(generate_auth_header, encoded_data,
                        :content_type => content_type)
       rescue => e
         failed_send(e, event)
@@ -49,6 +49,12 @@ 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)
+    end
+
     private
 
     def configuration_allows_sending

data/lib/raven/configuration.rb

@@ -95,6 +95,9 @@ module Raven
     # additional fields to sanitize
     attr_accessor :sanitize_fields
 
+    # Sanitize values that look like credit card numbers
+    attr_accessor :sanitize_credit_cards
+
     IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
                       'ActionController::RoutingError',
                       'ActionController::InvalidAuthenticityToken',
@@ -119,6 +122,8 @@ module Raven
       self.async = false
       self.catch_debugged_exceptions = true
       self.sanitize_fields = []
+      self.sanitize_credit_cards = true
+      self.environments = []
     end
 
     def server=(value)
@@ -169,11 +174,18 @@ module Raven
     end
 
     def send_in_current_environment?
-      !!server && (!environments || environments.include?(current_environment))
+      !!server && (environments.empty? || environments.include?(current_environment))
     end
 
     def log_excluded_environment_message
       Raven.logger.debug "Event not sent due to excluded environment: #{current_environment}"
     end
+
+    def verify!
+      raise Error.new('No server specified') unless server
+      raise Error.new('No public key specified') unless public_key
+      raise Error.new('No secret key specified') unless secret_key
+      raise Error.new('No project ID specified') unless project_id
+    end
   end
 end

data/lib/raven/event.rb

@@ -54,10 +54,9 @@ module Raven
 
       init.each_pair  { |key, val| instance_variable_set('@' + key.to_s, val) }
 
-      @user.merge!(@context.user)
-      @extra.merge!(@context.extra)
-      @tags.merge!(@configuration.tags)
-      @tags.merge!(@context.tags)
+      @user = @context.user.merge(@user)
+      @extra = @context.extra.merge(@extra)
+      @tags = @configuration.tags.merge(@context.tags).merge(@tags)
 
       # Some type coercion
       @timestamp  = @timestamp.strftime('%Y-%m-%dT%H:%M:%S') if @timestamp.is_a?(Time)

data/lib/raven/integrations/delayed_job.rb

@@ -15,7 +15,8 @@ module Delayed
             ::Raven.capture_exception(exception,
               :logger  => 'delayed_job',
               :tags    => {
-                 :delayed_job_queue => job.queue
+                 :delayed_job_queue => job.queue,
+                 :delayed_job_id => job.id
               },
               :extra => {
                   :delayed_job => {

data/lib/raven/integrations/railties.rb

@@ -0,0 +1 @@
+require 'raven/integrations/rails'

data/lib/raven/processor/sanitizedata.rb

@@ -6,11 +6,12 @@ module Raven
     DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec)
     CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/
 
-    attr_accessor :sanitize_fields
+    attr_accessor :sanitize_fields, :sanitize_credit_cards
 
     def initialize(client)
       super
       self.sanitize_fields = client.configuration.sanitize_fields
+      self.sanitize_credit_cards = client.configuration.sanitize_credit_cards
     end
 
     def process(value)
@@ -49,7 +50,8 @@ module Raven
     end
 
     def matches_regexes?(k, v)
-      CREDIT_CARD_RE.match(v.to_s) || fields_re.match(k.to_s)
+      (sanitize_credit_cards && CREDIT_CARD_RE.match(v.to_s)) ||
+        fields_re.match(k.to_s)
     end
 
     def fields_re
@@ -65,4 +67,3 @@ module Raven
     end
   end
 end
-

data/lib/raven/transports.rb

@@ -10,17 +10,14 @@ module Raven
         @configuration = configuration
       end
 
-      def send#(auth_header, data, options = {})
+      def send_event#(auth_header, data, options = {})
         raise NotImplementedError.new('Abstract method not implemented')
       end
 
       protected
 
       def verify_configuration
-        raise Error.new('No server specified') unless self.configuration.server
-        raise Error.new('No public key specified') unless self.configuration.public_key
-        raise Error.new('No secret key specified') unless self.configuration.secret_key
-        raise Error.new('No project ID specified') unless self.configuration.project_id
+        configuration.verify!
       end
     end
   end

data/lib/raven/transports/http.rb

@@ -6,8 +6,7 @@ require 'raven/error'
 module Raven
   module Transports
     class HTTP < Transport
-
-      def send(auth_header, data, options = {})
+      def send_event(auth_header, data, options = {})
         project_id = self.configuration[:project_id]
         path = self.configuration[:path] + "/"
 
@@ -20,6 +19,12 @@ 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

data/lib/raven/transports/udp.rb

@@ -6,11 +6,16 @@ require 'raven/error'
 module Raven
   module Transports
     class UDP < Transport
-
-      def send(auth_header, data, _options = {})
+      def send_event(auth_header, data, _options = {})
         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.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -121,6 +121,7 @@ files:
 - lib/raven/integrations/rails.rb
 - lib/raven/integrations/rails/controller_methods.rb
 - lib/raven/integrations/rails/middleware/debug_exceptions_catcher.rb
+- lib/raven/integrations/railties.rb
 - lib/raven/integrations/rake.rb
 - lib/raven/integrations/sidekiq.rb
 - lib/raven/integrations/tasks.rb