From 3d8f0cc6b70b55aad20ab4d86642f0e6d605c921 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Thu, 11 Jun 2015 17:11:26 +0100
Subject: convert_string_to_utf8 returns struct of string and scrubbing status.

---
 lib/normalize_string.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/normalize_string.rb')

diff --git a/lib/normalize_string.rb b/lib/normalize_string.rb
index 8b54c080c..69853fd6e 100644
--- a/lib/normalize_string.rb
+++ b/lib/normalize_string.rb
@@ -73,13 +73,18 @@ def convert_string_to_utf8_or_binary(s, suggested_character_encoding=nil)
     result
 end
 
+class StringConversionResult < Struct.new(:string, :scrubbed)
+  alias_method :scrubbed?, :scrubbed
+end
+
 def convert_string_to_utf8(s, suggested_character_encoding=nil)
     begin
         result = normalize_string_to_utf8 s, suggested_character_encoding
+        StringConversionResult.new(result, false)
     rescue EncodingNormalizationError
         result = scrub(s)
+        StringConversionResult.new(result, true)
     end
-    result
 end
 
 def scrub(string)
-- 
cgit v1.2.3