airbrake-ruby 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cd1c4c112ec8325d9e800128cb3598ecca5e79
-  data.tar.gz: e06b612001f91e0a6e928250d735fc57b2d9a313
+  metadata.gz: 90f2e4201837aa2d9bde698e677f0821dfffde88
+  data.tar.gz: 26f5a5638e4dad153694a04551ac5b98f0241398
 SHA512:
-  metadata.gz: 39edba81094187bde03fd1f5fc916255737dde0fabcd0f5c720075c22c97d914c602bdda046669db3b48680ec0bae798bf4225a4645d4a08e450171de76a34d0
-  data.tar.gz: 3d0b4de47de97f5cc9bd425a70aa1128449df90329f33e93f843c6729571cd2ca38d371477fa98ea46d380c116dd7bf20a670f230bef59eeb34d8fd72d1b0f23
+  metadata.gz: 2a115026135272d066da9d827ce6d1259345881b4ee1c12287729d0fdf76c42f58485d8108cc38dff14d9eaf60ee289642ae80d740aee2c5ebb67d4e5728e1ad
+  data.tar.gz: 9d8d43dc5745d05e649fa290be7500015ff5f416915a8de3b0489ad518e9b307c7c4edec5f9f6cdb2d800ff569eb45175f2b5c7cb456a8ba460e59206ffc7053

data/lib/airbrake-ruby/truncator.rb

@@ -12,6 +12,15 @@ module Airbrake
     #   strings with +ENCODING_OPTIONS+
     TEMP_ENCODING = 'utf-16'.freeze
 
+    # @return [String] what to append when something is a circular reference
+    CIRCULAR = '[Circular]'.freeze
+
+    # @return [String] what to append when something is truncated
+    TRUNCATED = '[Truncated]'.freeze
+
+    # @return [Array<Class>] The types that can contain references to itself
+    CIRCULAR_TYPES = [Array, Hash, Set].freeze
+
     # @param [Integer] max_size maximum size of hashes, arrays and strings
     def initialize(max_size)
       @max_size = max_size
@@ -24,7 +33,10 @@ module Airbrake
     # @param [Set] seen The cache that helps to detect recursion
     # @return [Object] truncated object
     def truncate(object, seen = Set.new)
-      return '[Circular]'.freeze if seen.include?(object)
+      if seen.include?(object)
+        return CIRCULAR if CIRCULAR_TYPES.any? { |t| object.is_a?(t) }
+        return object
+      end
       truncate_object(object, seen << object)
     end
 
@@ -51,7 +63,7 @@ module Airbrake
     def truncate_string(str)
       fixed_str = replace_invalid_characters(str)
       return fixed_str if fixed_str.length <= @max_size
-      (fixed_str.slice(0, @max_size) + '[Truncated]').freeze
+      (fixed_str.slice(0, @max_size) + TRUNCATED).freeze
     end
 
     def stringify_object(object)

data/lib/airbrake-ruby/version.rb

@@ -4,5 +4,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '2.6.0'.freeze
+  AIRBRAKE_RUBY_VERSION = '2.6.1'.freeze
 end

data/spec/truncator_spec.rb

@@ -211,5 +211,28 @@ RSpec.describe Airbrake::Truncator do
         expect(subject).to be_frozen
       end
     end
+
+    context "given an array with hashes and hash-like objects with identical keys" do
+      let(:hashie) { Class.new(Hash) }
+
+      let(:object) do
+        {
+          errors: [
+            { file: 'a' },
+            hashie.new.merge(file: 'bcde')
+          ]
+        }
+      end
+
+      it "truncates values" do
+        expect(subject).to eq(
+          errors: [
+            { file: 'a' },
+            hashie.new.merge(file: 'bcd[Truncated]')
+          ]
+        )
+        expect(subject).to be_frozen
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec