sentry-raven 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbeb1ae8141697af3bf06f4c2167f97af8a7e58
-  data.tar.gz: 3431f08512c915bce224d07fb8ad77d5f04fe62a
+  metadata.gz: bdf4bb6934f77389e7393fc2408408020cdfd923
+  data.tar.gz: dc076e2fd742caa665e84ac3d7fedd1bed8ad6cf
 SHA512:
-  metadata.gz: 869b6bb29a4a351c8694de220ea6513bafea70554488fd1086b3fcced14510cae903621e37c9f86dedab1e12d40da51fb73c138a12a9b460afddba1485f7fd71
-  data.tar.gz: ef80ba9d906d81621e4add41b76368ee2549c7bbef3053bf9c280f10b8c3808a1cff39019bc20b01d70201f37bdf28585f65f977dcd76d1f9fc0863d005d26cb
+  metadata.gz: ed202296b99e4622def0e9be5ba2150075723e90deea84fbd1e5f7e66e39235b2d656d4a301896f381ebae8d05f745511055ec5e845b247c6ff13f026e0e8917
+  data.tar.gz: e4730690c60b5902804d6bd0f8c98d18379350d7ca263e6fe84ac95c5c9a042150e2f481f2f323339e2eafc2eae08d1ad89708de4cc0fae4337a180b9ff6142f

data/lib/raven/base.rb

@@ -5,7 +5,6 @@ require 'raven/context'
 require 'raven/client'
 require 'raven/event'
 require 'raven/logger'
-require 'raven/rack'
 require 'raven/interfaces/message'
 require 'raven/interfaces/exception'
 require 'raven/interfaces/stack_trace'
@@ -207,13 +206,9 @@ module Raven
 
     # Injects various integrations
     def inject
-      require 'raven/integrations/delayed_job' if defined?(::Delayed::Plugin)
-      require 'raven/railtie' if defined?(::Rails::Railtie)
-      require 'raven/sidekiq' if defined?(Sidekiq)
-      if defined?(Rake)
-        require 'raven/rake'
-        require 'raven/tasks'
-      end
+      available_integrations = %w[delayed_job rails sidekiq rack rake]
+      integrations_to_load = available_integrations & Gem.loaded_specs.keys
+      integrations_to_load.each { |integration| require "raven/integrations/#{integration}" }
     end
 
     # For cross-language compat

data/lib/raven/configuration.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'uri'
 
 module Raven
   class Configuration

data/lib/raven/event.rb

@@ -52,7 +52,8 @@ module Raven
       @extra = options[:extra] || {}
       @extra.merge!(context.extra)
 
-      @tags = @configuration.tags
+      @tags = {}
+      @tags.merge!(@configuration.tags)
       @tags.merge!(options[:tags] || {})
       @tags.merge!(context.tags)
 

data/lib/raven/{rack.rb → integrations/rack.rb}

@@ -1,4 +1,5 @@
 require 'time'
+require 'rack'
 
 module Raven
   # Middleware for Rack applications. Any errors raised by the upstream
@@ -20,6 +21,7 @@ module Raven
   #
   # Use a standard Raven.configure call to configure your server credentials.
   class Rack
+
     def self.capture_exception(exception, env, options = {})
       if env['requested_at']
         options[:time_spent] = Time.now - env['requested_at']

data/lib/raven/{railtie.rb → integrations/rails.rb}

@@ -2,14 +2,14 @@ require 'raven'
 require 'rails'
 
 module Raven
-  class Railtie < ::Rails::Railtie
+  class Rails < ::Rails::Railtie
     initializer "raven.use_rack_middleware" do |app|
       app.config.middleware.insert 0, "Raven::Rack"
     end
 
     initializer 'raven.action_controller' do
       ActiveSupport.on_load :action_controller do
-        require 'raven/rails/controller_methods'
+        require 'raven/integrations/rails/controller_methods'
         include Raven::Rails::ControllerMethods
       end
     end
@@ -22,17 +22,17 @@ module Raven
 
       if Raven.configuration.catch_debugged_exceptions
         if defined?(::ActionDispatch::DebugExceptions)
-          require 'raven/rails/middleware/debug_exceptions_catcher'
+          require 'raven/integrations/rails/middleware/debug_exceptions_catcher'
           ::ActionDispatch::DebugExceptions.send(:include, Raven::Rails::Middleware::DebugExceptionsCatcher)
         elsif defined?(::ActionDispatch::ShowExceptions)
-          require 'raven/rails/middleware/debug_exceptions_catcher'
+          require 'raven/integrations/rails/middleware/debug_exceptions_catcher'
           ::ActionDispatch::ShowExceptions.send(:include, Raven::Rails::Middleware::DebugExceptionsCatcher)
         end
       end
     end
 
     rake_tasks do
-      require 'raven/tasks'
+      require 'raven/integrations/tasks'
     end
   end
 end

data/lib/raven/{rails → integrations/rails}/controller_methods.rb

@@ -1,5 +1,5 @@
 module Raven
-  module Rails
+  class Rails
     module ControllerMethods
       def capture_message(message, options = {})
         Raven::Rack.capture_message(message, request.env, options)

data/lib/raven/{rails → integrations/rails}/middleware/debug_exceptions_catcher.rb

@@ -1,5 +1,5 @@
 module Raven
-  module Rails
+  class Rails
     module Middleware
       module DebugExceptionsCatcher
         def self.included(base)

data/lib/raven/{rake.rb → integrations/rake.rb}

@@ -1,5 +1,6 @@
-require 'raven'
+require 'rake'
 require 'rake/task'
+require 'raven/integrations/tasks'
 
 module Rake
   class Application
@@ -9,5 +10,4 @@ module Rake
       orig_display_error_messsage(ex)
     end
   end
-end
-
+end

data/lib/raven/{sidekiq.rb → integrations/sidekiq.rb}

@@ -1,4 +1,5 @@
 require 'time'
+require 'sidekiq'
 
 module Raven
   class Sidekiq

data/lib/raven/interfaces/http.rb

@@ -19,12 +19,12 @@ module Raven
     end
 
     def from_rack(env)
-      require 'rack'
       req = ::Rack::Request.new(env)
-      self.url = req.url.split('?').first
+      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

data/lib/raven/okjson.rb

@@ -28,9 +28,8 @@ require 'stringio'
 # http://golang.org/src/pkg/json/decode.go and
 # http://golang.org/src/pkg/utf8/utf8.go
 module Raven
-
 module OkJson
-  Upstream = '42'
+  Upstream = '43'
   extend self
 
 
@@ -62,20 +61,19 @@ module OkJson
   # is not a String.
   # Strings contained in x must be valid UTF-8.
   def encode(x)
-    visited = []
     case x
-    when Hash    then objenc(x, visited)
-    when Array   then arrenc(x, visited)
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
     else
       raise Error, 'root value must be an Array or a Hash'
     end
   end
 
 
-  def valenc(x, visited)
+  def valenc(x)
     case x
-    when Hash    then objenc(x, visited)
-    when Array   then arrenc(x, visited)
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
     when String  then strenc(x)
     when Symbol  then strenc(x.to_s)
     when Numeric then numenc(x)
@@ -83,7 +81,7 @@ module OkJson
     when false   then "false"
     when nil     then "null"
     else
-      strenc((x.inspect rescue $!.to_s))
+      raise Error, "cannot encode #{x.class}: #{x.inspect}"
     end
   end
 
@@ -134,6 +132,10 @@ private
     ts = eat('{', ts)
     obj = {}
 
+    unless ts[0]
+      raise Error, "unexpected end of object"
+    end
+
     if ts[0][0] == '}'
       return obj, ts[1..-1]
     end
@@ -177,6 +179,10 @@ private
     ts = eat('[', ts)
     arr = []
 
+    unless ts[0]
+      raise Error, "unexpected end of array"
+    end
+
     if ts[0][0] == ']'
       return arr, ts[1..-1]
     end
@@ -427,18 +433,13 @@ private
   end
 
 
-  def objenc(x, visited)
-    return '"{...}"' if visited.include?(x.__id__)
-    visited += [x.__id__]
-    '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v, visited)}.join(',') + '}'
+  def objenc(x)
+    '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
   end
 
 
-  def arrenc(a, visited)
-    return '"[...]"' if visited.include?(a.__id__)
-    visited += [a.__id__]
-
-    '[' + a.map{|x| valenc(x, visited)}.join(',') + ']'
+  def arrenc(a)
+    '[' + a.map{|x| valenc(x)}.join(',') + ']'
   end
 
 
@@ -447,7 +448,7 @@ private
     when String then strenc(k)
     when Symbol then strenc(k.to_s)
     else
-      strenc(k.inspect)
+      raise Error, "Hash key is not a string: #{k.inspect}"
     end
   end
 
@@ -471,11 +472,16 @@ private
         # In ruby >= 1.9, s[r] is a codepoint, not a byte.
         if rubydoesenc?
           begin
-            c.ord # will raise an error if c is invalid UTF-8
+            # c.ord will raise an error if c is invalid UTF-8
+            if c.ord < Spc.ord
+              c = "\\u%04x" % [c.ord]
+            end
             t.write(c)
           rescue
             t.write(Ustrerr)
           end
+        elsif c < Spc
+          t.write("\\u%04x" % c)
         elsif Spc <= c && c <= ?~
           t.putc(c)
         else
@@ -491,10 +497,8 @@ private
 
 
   def numenc(x)
-    if (x.nan? rescue false)
-      '"NaN"'
-    elsif (x.infinite? rescue false)
-      '"Infinite"'
+    if ((x.nan? || x.infinite?) rescue false)
+      raise Error, "Numeric cannot be represented: #{x}"
     end
     "#{x}"
   end
@@ -605,5 +609,4 @@ private
   Spc = ' '[0]
   Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
 end
-
-end
+end

data/lib/raven/processor.rb

@@ -17,8 +17,7 @@ module Raven
 
     def parse_json_or_nil(string)
       begin
-        result = OkJson.decode(string)
-        result.is_a?(String) ? nil : result
+        OkJson.decode(string)
       rescue Raven::OkJson::Error
         nil
       end

data/lib/raven/processor/sanitizedata.rb

@@ -6,36 +6,30 @@ module Raven
     VALUES_RE = /^\d{16}$/
 
     def process(value)
-      fields_re = /(#{(DEFAULT_FIELDS + @sanitize_fields).join("|")})/i
+      value.inject(value) { |memo,(k,v)|  memo[k] = sanitize(k,v); memo }
+    end
 
-      value.inject(value) do |value,(k,v)|
-        v = k if v.nil?
-        if v.is_a?(Hash) || v.is_a?(Array)
-          process(v)
-        elsif v.is_a?(String) && (json = parse_json_or_nil(v))
-          #if this string is actually a json obj, convert and sanitize
-          value = modify_in_place(value, [k,v], process(json).to_json)
-        elsif v.is_a?(Integer) && (VALUES_RE.match(v.to_s) || fields_re.match(k.to_s))
-          value = modify_in_place(value, [k,v], INT_MASK)
-        elsif VALUES_RE.match(v.to_s) || fields_re.match(k.to_s)
-          value = modify_in_place(value, [k,v], STRING_MASK)
-        else
-          value
-        end
+    def sanitize(k,v)
+      if v.is_a?(Hash)
+        process(v)
+      elsif v.is_a?(Array)
+        v.map{|a| sanitize(nil, a)}
+      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) && (VALUES_RE.match(v.to_s) || fields_re.match(k.to_s))
+        INT_MASK
+      elsif v.is_a?(String)  && (VALUES_RE.match(v.to_s) || fields_re.match(k.to_s))
+        STRING_MASK
+      else
+        v
       end
-      value
     end
 
     private
 
-    def modify_in_place(original_parent, original_child, new_child)
-      if original_parent.is_a?(Array)
-        index = original_parent.index(original_child[0])
-        original_parent[index] = new_child
-      elsif original_parent.is_a?(Hash)
-        original_parent[original_child[0]] = new_child
-      end
-      original_parent
+    def fields_re
+      @fields_re ||= /(#{(DEFAULT_FIELDS + @sanitize_fields).join("|")})/i
     end
   end
 end

data/lib/raven/processor/utf8conversion.rb

@@ -16,7 +16,7 @@ module Raven
     def clean_invalid_utf8_bytes(obj)
       if obj.respond_to?(:to_utf8)
         obj.to_utf8
-      elsif obj.respond_to?(:encoding)
+      elsif obj.respond_to?(:encoding) && obj.is_a?(String)
         obj.encode('UTF-16', :invalid => :replace, :undef => :replace, :replace => '').encode('UTF-8')
       else
         obj

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,6 +117,13 @@ files:
 - lib/raven/error.rb
 - lib/raven/event.rb
 - lib/raven/integrations/delayed_job.rb
+- lib/raven/integrations/rack.rb
+- lib/raven/integrations/rails.rb
+- lib/raven/integrations/rails/controller_methods.rb
+- lib/raven/integrations/rails/middleware/debug_exceptions_catcher.rb
+- lib/raven/integrations/rake.rb
+- lib/raven/integrations/sidekiq.rb
+- lib/raven/integrations/tasks.rb
 - lib/raven/interfaces.rb
 - lib/raven/interfaces/exception.rb
 - lib/raven/interfaces/http.rb
@@ -130,13 +137,6 @@ files:
 - lib/raven/processor/removestacktrace.rb
 - lib/raven/processor/sanitizedata.rb
 - lib/raven/processor/utf8conversion.rb
-- lib/raven/rack.rb
-- lib/raven/rails/controller_methods.rb
-- lib/raven/rails/middleware/debug_exceptions_catcher.rb
-- lib/raven/railtie.rb
-- lib/raven/rake.rb
-- lib/raven/sidekiq.rb
-- lib/raven/tasks.rb
 - lib/raven/transports.rb
 - lib/raven/transports/http.rb
 - lib/raven/transports/udp.rb