🔀 Merge pull request #740 from OskarEichler/codex/formatting-imap

Match ID string literal bytes without encoding conflicts

Author: nevans

lib/net/imap/command_data.rb

@@ -459,7 +459,7 @@ def valid_nstring?(str)
       # coerces using +to_s+
       def string(str)
         str = str.to_s
-        if str =~ LITERAL_REGEX
+        if str.b.match?(LITERAL_REGEX)
           Literal.new(str)
         else
           QuotedString.new(str)

test/net/imap/test_command_data.rb

@@ -161,6 +161,14 @@ def send_data(*data, tag: TAG)
   class StringFormatterTest < Net::IMAP::TestCase
     include Net::IMAP::StringFormatter
 
+    test "string selects a literal for non-ASCII text" do
+      value = "日本語"
+      formatted = string(value)
+
+      assert_kind_of Literal, formatted
+      assert_equal value.b, formatted.data
+    end
+
     test "literal_or_literal8" do
       assert_kind_of Literal,  literal_or_literal8("simple\r\n")
       assert_kind_of Literal8, literal_or_literal8("has NULL \0")