StringUtils.utf8() uses String.encode() instead of iconv

medusa-project · Apr 22, 2024 · 886ac78 · 886ac78
1 parent 25b242a
commit 886ac78
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -27,8 +27,6 @@ gem "delayed_job_active_record"
 gem "haml-rails"
 # Application HTTP client
 gem "httpclient"
-# Assists in converting non-Unicode text during full text extraction
-gem "iconv"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem "jbuilder"
 # Use jquery as the JavaScript library

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -203,7 +203,6 @@ GEM
     httpclient (2.8.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    iconv (1.0.8)
     io-console (0.7.2)
     irb (1.12.0)
       rdoc
@@ -427,7 +426,6 @@ DEPENDENCIES
   delayed_job_active_record
   haml-rails
   httpclient
-  iconv
   jbuilder
   jquery-rails
   js_cookie_rails

diff --git a/app/util/string_utils.rb b/app/util/string_utils.rb
@@ -38,7 +38,7 @@ def self.url_encode(string)
   # @return [String] UTF-8 string.
   #
   def self.utf8(string)
-    Iconv.conv('UTF-8//IGNORE', 'UTF-8', string)
+    string.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
   end
 
   ##

diff --git a/test/util/string_utils_test.rb b/test/util/string_utils_test.rb
@@ -22,6 +22,13 @@ class StringUtilsTest < ActiveSupport::TestCase
     assert_equal "word%20word", StringUtils.url_encode("word word")
   end
 
+  # utf8()
+
+  test "utf8() converts a non-UTF-8 string to UTF-8" do
+    str = [0x5a, 0xfc, 0x72, 0x69, 0x63, 0x68].pack('c*')
+    assert_equal "Z?rich", StringUtils.utf8(str)
+  end
+
   # valid_email?()
 
   test "valid_email?() returns true for a valid email" do