Merge remote-tracking branch 'origin/v0.7.10-compatibillity-for-m1' i…

…nto v0.7.10-compatibillity-for-m1
brianmario · Feb 10, 2025 · b2202f6 · b2202f6
2 parents 061eea6 + 2be284b
commit b2202f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/ext/charlock_holmes/encoding_detector.c b/ext/charlock_holmes/encoding_detector.c
@@ -72,6 +72,8 @@ static VALUE rb_encdec_binarymatch(void) {
 	rb_match = rb_hash_new();
 
 	rb_hash_aset(rb_match, ID2SYM(rb_intern("type")), ID2SYM(rb_intern("binary")));
+	rb_hash_aset(rb_match, ID2SYM(rb_intern("encoding")), charlock_new_str2("BINARY"));
+	rb_hash_aset(rb_match, ID2SYM(rb_intern("ruby_encoding")), charlock_new_str2("ASCII-8BIT"));
 	rb_hash_aset(rb_match, ID2SYM(rb_intern("confidence")), INT2NUM(100));
 
 	return rb_match;

diff --git a/test/encoding_detector_test.rb b/test/encoding_detector_test.rb
@@ -107,6 +107,10 @@ def test_returns_a_ruby_compatible_encoding_name
     detected = @detector.detect not_compat_txt
     assert_equal 'ISO-2022-KR', detected[:encoding]
     assert_equal 'binary', detected[:ruby_encoding]
+
+    detected = @detector.detect "\0\0"
+    assert_equal 'BINARY', detected[:encoding]
+    assert_equal 'ASCII-8BIT', detected[:ruby_encoding]
   end
 
   def test_is_binary
@@ -132,13 +136,13 @@ def test_is_binary
     ['utf16be.html',              'UTF-16BE',   :text],
     ['utf32le.html',              'UTF-32LE',   :text],
     ['utf32be.html',              'UTF-32BE',   :text],
-    ['hello_world',               nil,          :binary],
-    ['octocat.png',               nil,          :binary],
-    ['octocat.jpg',               nil,          :binary],
-    ['octocat.psd',               nil,          :binary],
-    ['octocat.gif',               nil,          :binary],
-    ['octocat.ai',                nil,          :binary],
-    ['foo.pdf',                   nil,          :binary],
+    ['hello_world',               'BINARY',     :binary],
+    ['octocat.png',               'BINARY',     :binary],
+    ['octocat.jpg',               'BINARY',     :binary],
+    ['octocat.psd',               'BINARY',     :binary],
+    ['octocat.gif',               'BINARY',     :binary],
+    ['octocat.ai',                'BINARY',     :binary],
+    ['foo.pdf',                   'BINARY',     :binary],
   ]
 
   def test_detection_works_as_expected