bugsnag 2.8.4 → 2.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98754bef4fe1a80b60181d175224dc46b9fa8513
-  data.tar.gz: c430fa486e7d64d9711797fc6a019fec38c442b4
+  metadata.gz: c82e8e7e46403a193b059ff577ea4b7808ab2f82
+  data.tar.gz: 12c42851511672d1a2209fc6c46effbef3447e6f
 SHA512:
-  metadata.gz: 58eb4aebb5a8c8cc4c09b9d6cfe145616ba528923c36b5e2439198cfc42b77bb14367aadf108e7af4ca18e873c4a91a5f356fbe2408916596006211e9134e82d
-  data.tar.gz: 86d9e6a36a7a2e44a1f9af847b8637f313370a49ee0a730799f99191854fdfcd78240d27c1210d1ee71b45d8bbd17f6a1ce7c9da05c4ca540d2a0078b2e909b2
+  metadata.gz: 4ee30f99540b90d2d898bc8037e2ce2f534a52ca30c8d57ecff9313557c6af717a90c691ac781cfad56af133b6ad0ae7a5a4eff46b4579ebba7881c52333a14f
+  data.tar.gz: 227828a21ae4cf499392bc41c44639db5f6decf7d9515c46a4363d809b4b5e9256af4d3f3f66a5628d16ab9b2aa3ffc516b8f7afe6807d84a32ab165ba67e4de

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.8.5
+-----
+
+-   Fix performance problems in cleanup_obj
+
+
 2.8.4
 -----
 

data/VERSION

@@ -1 +1 @@
-2.8.4
+2.8.5

data/lib/bugsnag/helpers.rb

@@ -3,26 +3,23 @@ require 'uri'
 module Bugsnag
   module Helpers
     MAX_STRING_LENGTH = 4096
+    ENCODING_OPTIONS = {:invalid => :replace, :undef => :replace}.freeze
 
-    def self.cleanup_obj(obj, filters = nil, seen=Set.new)
+    def self.cleanup_obj(obj, filters = nil, seen = {})
       return nil unless obj
 
       # Protect against recursion of recursable items
-      if obj.is_a?(Hash) || obj.is_a?(Array) || obj.is_a?(Set)
-        return "[RECURSION]" if seen.include? obj
-
-        # We duplicate the seen set here so that no updates by further cleanup_obj calls
-        # are persisted beyond that call.
-        seen = seen.dup
-        seen << obj
+      protection = if obj.is_a?(Hash) || obj.is_a?(Array) || obj.is_a?(Set)
+        return seen[obj] if seen[obj]
+        seen[obj] = '[RECURSION]'.freeze
       end
 
-      case obj
+      value = case obj
       when Hash
         clean_hash = {}
         obj.each do |k,v|
           if filters_match?(k, filters)
-            clean_hash[k] = "[FILTERED]"
+            clean_hash[k] = '[FILTERED]'.freeze
           else
             clean_obj = cleanup_obj(v, filters, seen)
             clean_hash[k] = clean_obj
@@ -39,19 +36,22 @@ module Bugsnag
         str = obj.to_s
         # avoid leaking potentially sensitive data from objects' #inspect output
         if str =~ /#<.*>/
-          '[OBJECT]'
+          '[OBJECT]'.freeze
         else
           cleanup_string(str)
         end
       end
+
+      seen[obj] = value if protection
+      value
     end
 
     def self.cleanup_string(str)
       if defined?(str.encoding) && defined?(Encoding::UTF_8)
         if str.encoding == Encoding::UTF_8
-          str.valid_encoding? ? str : str.encode('utf-16', {:invalid => :replace, :undef => :replace}).encode('utf-8')
+          str.valid_encoding? ? str : str.encode('utf-16', ENCODING_OPTIONS).encode('utf-8')
         else
-          str.encode('utf-8', {:invalid => :replace, :undef => :replace})
+          str.encode('utf-8', ENCODING_OPTIONS)
         end
       elsif defined?(Iconv)
         Iconv.conv('UTF-8//IGNORE', 'UTF-8', str) || str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json