From d8497b36c98f0d18effb5a0f3b16a55a47e7f1da Mon Sep 17 00:00:00 2001 From: Steve Kirkland Date: Sat, 25 Jan 2020 22:13:19 +0000 Subject: [PATCH] fix: Resolve Ruby deprecation warning (in Ruby 2.7)/error (in 3.0) Fixes #580 --- lib/bugsnag/cleaner.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bugsnag/cleaner.rb b/lib/bugsnag/cleaner.rb index 6c851542e..e4b6240af 100644 --- a/lib/bugsnag/cleaner.rb +++ b/lib/bugsnag/cleaner.rb @@ -2,7 +2,6 @@ module Bugsnag class Cleaner - ENCODING_OPTIONS = {:invalid => :replace, :undef => :replace}.freeze FILTERED = '[FILTERED]'.freeze RECURSION = '[RECURSION]'.freeze OBJECT = '[OBJECT]'.freeze @@ -60,9 +59,9 @@ def traverse_object(obj, seen, scope) def clean_string(str) if defined?(str.encoding) && defined?(Encoding::UTF_8) if str.encoding == Encoding::UTF_8 - str.valid_encoding? ? str : str.encode('utf-16', ENCODING_OPTIONS).encode('utf-8') + str.valid_encoding? ? str : str.encode('utf-16', invalid: :replace, undef: :replace).encode('utf-8') else - str.encode('utf-8', ENCODING_OPTIONS) + str.encode('utf-8', invalid: :replace, undef: :replace) end elsif defined?(Iconv) Iconv.conv('UTF-8//IGNORE', 'UTF-8', str) || str