sentry-raven 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8e99d6cd40b4a9bcebae0aa4c2b6a9ae92c65f
-  data.tar.gz: f0b34e2f0061b92c0b94dbfce8409b415850a756
+  metadata.gz: 591ad299f0dbdc5e0c5e980fd0406733a90c6ffa
+  data.tar.gz: bdbcf9a5152af5c5bfd459f302be3439080dbca1
 SHA512:
-  metadata.gz: 89cd1bda236dfc17bde728a9b69ddcc0d2f4bbffdd2a8697969662c977addf14f180285132987b20cfa53f9398cf3b80309bc781bd502700ce6a4b20a663ccde
-  data.tar.gz: 11d7601a11bd66e3881f457f60c9db1bb253a4a93fa35b32bb61447d938f74019b7fa219a3f4cf8d797cac48835e8d795a2417f5b9b4d793a97596203516286c
+  metadata.gz: dc97bc821db8541a18dc10cf031c6c8684cc6aa1b2200bad974e1e8d11460dabe59e59d144651e27cc8117965452b1ff2ef3a031f14736f801ec7ac1836e1609
+  data.tar.gz: 9e6c6de2b3eda11d19514736823f487fd5a66cddde4bbdbc81a1a4e6382ea2fd4a42d3d5ed0eae5208245f1c10c98b612a6479c4331b3eda70a0090d128e1aba

data/README.md

@@ -7,7 +7,7 @@ A client and integration layer for the [Sentry](https://github.com/getsentry/sen
 
 ## Requirements
 
-We test on Ruby 1.9, 2.2 and 2.3 at the latest patchlevel/teeny version. We also support JRuby 1.7 and 9.0. Our Rails integration works with Rails 4.2+.
+We test on Ruby 1.9, 2.2, 2.3, and 2.4 at the latest patchlevel/teeny version. We also support JRuby 1.7 and 9.0. Our Rails integration works with Rails 4.2+ (including Rails 5).
 
 ## Getting Started
 

data/lib/raven/integrations/rack-timeout.rb

@@ -1,5 +1,5 @@
 # We need to do this because of the way integration loading works
-require "rack/timeout/base"
+require "rack/timeout/base" unless defined?(Rack::Timeout)
 
 # This integration is a good example of how to change how exceptions
 # get grouped by Sentry's UI. Simply override #raven_context in

data/lib/raven/interfaces/stack_trace.rb

@@ -38,6 +38,7 @@ module Raven
 
       def filename
         return if abs_path.nil?
+        return @filename if @filename
 
         prefix =
           if under_project_root? && in_app
@@ -48,9 +49,21 @@ module Raven
             longest_load_path
           end
 
-        prefix ? abs_path[prefix.to_s.chomp(File::SEPARATOR).length + 1..-1] : abs_path
+        @filename = prefix ? abs_path[prefix.to_s.chomp(File::SEPARATOR).length + 1..-1] : abs_path
       end
 
+      def to_hash(*args)
+        data = super(*args)
+        data[:filename] = filename
+        data.delete(:vars) unless vars && !vars.empty?
+        data.delete(:pre_context) unless pre_context && !pre_context.empty?
+        data.delete(:post_context) unless post_context && !post_context.empty?
+        data.delete(:context_line) unless context_line && !context_line.empty?
+        data
+      end
+
+      private
+
       def under_project_root?
         project_root && abs_path.start_with?(project_root)
       end
@@ -60,17 +73,7 @@ module Raven
       end
 
       def longest_load_path
-        $LOAD_PATH.select { |s| abs_path.start_with?(s) }.max_by(&:length)
-      end
-
-      def to_hash(*args)
-        data = super(*args)
-        data[:filename] = filename
-        data.delete(:vars) unless vars && !vars.empty?
-        data.delete(:pre_context) unless pre_context && !pre_context.empty?
-        data.delete(:post_context) unless post_context && !post_context.empty?
-        data.delete(:context_line) unless context_line && !context_line.empty?
-        data
+        $LOAD_PATH.select { |path| abs_path.start_with?(path.to_s) }.max_by(&:size)
       end
     end
   end

data/lib/raven/processor.rb

@@ -4,7 +4,7 @@ module Raven
     INT_MASK = 0
     REGEX_SPECIAL_CHARACTERS = %w(. $ ^ { [ ( | ) * + ?).freeze
 
-    def initialize(client)
+    def initialize(client = nil)
       @client = client
     end
 

data/lib/raven/processor/sanitizedata.rb

@@ -40,9 +40,16 @@ module Raven
 
     private
 
+    # CGI.parse takes our nice UTF-8 strings and converts them back to ASCII,
+    # so we have to convert them back, again.
+    def utf8_processor
+      @utf8_processor ||= Processor::UTF8Conversion.new
+    end
+
     def sanitize_query_string(query_string)
       query_hash = CGI.parse(query_string)
-      processed_query_hash = process(query_hash)
+      sanitized = utf8_processor.process(query_hash)
+      processed_query_hash = process(sanitized)
       URI.encode_www_form(processed_query_hash)
     end
 

data/lib/raven/processor/utf8conversion.rb

@@ -1,19 +1,25 @@
 module Raven
   class Processor::UTF8Conversion < Processor
+    # Slightly misnamed - actually just removes any bytes with invalid encoding
+    # Previously, our JSON backend required UTF-8. Since we now use the built-in
+    # JSON, we can use any encoding, but it must be valid anyway so we can do
+    # things like call #match and #slice on strings
+    REPLACE = "".freeze
+
     def process(value)
       case value
-      when Array
-        !value.frozen? ? value.map! { |v| process v } : value.map { |v| process v }
       when Hash
         !value.frozen? ? value.merge!(value) { |_, v| process v } : value.merge(value) { |_, v| process v }
+      when Array
+        !value.frozen? ? value.map! { |v| process v } : value.map { |v| process v }
       when Exception
         return value if value.message.valid_encoding?
-        clean_exc = value.class.new(clean_invalid_utf8_bytes(value.message))
+        clean_exc = value.class.new(remove_invalid_bytes(value.message))
         clean_exc.set_backtrace(value.backtrace)
         clean_exc
       when String
         return value if value.valid_encoding?
-        clean_invalid_utf8_bytes(value)
+        remove_invalid_bytes(value)
       else
         value
       end
@@ -21,8 +27,18 @@ module Raven
 
     private
 
-    def clean_invalid_utf8_bytes(obj)
-      obj.encode('UTF-16', :invalid => :replace, :undef => :replace, :replace => '').encode('UTF-8')
+    # Stolen from RSpec
+    # https://github.com/rspec/rspec-support/blob/f0af3fd74a94ff7bb700f6ba06dbdc67bba17fbf/lib/rspec/support/encoded_string.rb#L120-L139
+    if String.method_defined?(:scrub) # 2.1+
+      def remove_invalid_bytes(string)
+        string.scrub!(REPLACE)
+      end
+    else
+      def remove_invalid_bytes(string)
+        string.chars.map do |char|
+          char.valid_encoding? ? char : REPLACE
+        end.join
+      end
     end
   end
 end

data/lib/raven/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Raven
   # Freezing this constant breaks in 1.9.x
-  VERSION = "2.5.0" # rubocop:disable Style/MutableConstant
+  VERSION = "2.5.1" # rubocop:disable Style/MutableConstant
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday