[GR-11066] Time#strftime fails if the format is a BINARY String.

PullRequest: truffleruby/920

Author: nirvdrum

CHANGELOG.md

@@ -3,6 +3,7 @@
 Bug fixes:
 
 * Fixed `Symbol#match` returning `MatchData` (#1706).
+* Allow `Time#strftime` to be called with binary format strings.
 
 Compatibility:
 

src/main/java/org/truffleruby/core/rope/RopeOperations.java

@@ -136,7 +136,7 @@ public static Rope encodeAscii(String value, Encoding encoding) {
     }
 
     public static byte[] encodeAsciiBytes(String value) {
-        assert StringOperations.isASCIIOnly(value);
+        assert StringOperations.isAsciiOnly(value);
 
         final byte[] bytes = new byte[value.length()];
 

src/main/java/org/truffleruby/core/string/StringOperations.java

@@ -36,6 +36,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jcodings.Encoding;
+import org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.core.array.ArrayOperations;
@@ -69,9 +70,13 @@ public static int clampExclusiveIndex(DynamicObject string, int index) {
     public static byte[] encodeBytes(String value, Encoding encoding) {
         // Taken from org.jruby.RubyString#encodeByteList.
 
+        if (encoding == ASCIIEncoding.INSTANCE && !isAsciiOnly(value)) {
+            throw new UnsupportedOperationException(
+                    StringUtils.format("Can't convert Java String (%s) to Ruby BINARY String because it contains non-ASCII characters", value));
+        }
+
         Charset charset = encoding.getCharset();
 
-        // if null charset, fall back on Java default charset
         if (charset == null) {
             throw new UnsupportedOperationException("Cannot find Charset to encode " + value + " with " + encoding);
         }
@@ -109,7 +114,7 @@ public static Encoding encoding(DynamicObject string) {
         return rope(string).getEncoding();
     }
 
-    public static boolean isASCIIOnly(String string) {
+    public static boolean isAsciiOnly(String string) {
         for (int i = 0; i < string.length(); i++) {
             int c = string.charAt(i);
             if (!Encoding.isAscii(c)) {

src/main/java/org/truffleruby/core/symbol/SymbolTable.java

@@ -79,7 +79,7 @@ public DynamicObject getSymbol(String string) {
         }
 
         final Rope rope;
-        if (StringOperations.isASCIIOnly(string)) {
+        if (StringOperations.isAsciiOnly(string)) {
             rope = RopeOperations.encodeAscii(string, USASCIIEncoding.INSTANCE);
         } else {
             rope = StringOperations.encodeRope(string, UTF8Encoding.INSTANCE);

src/main/java/org/truffleruby/core/time/RubyDateFormatter.java

@@ -45,7 +45,6 @@
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.RubyContext;
-import org.truffleruby.core.encoding.EncodingManager;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeBuilder;
 import org.truffleruby.core.rope.RopeOperations;
@@ -522,7 +521,7 @@ public static RopeBuilder formatToRopeBuilder(List<Token> compiledPattern, Zoned
             // reset formatter
             formatter = RubyTimeOutputFormatter.DEFAULT_FORMATTER;
 
-            toAppendTo.append(output.getBytes(EncodingManager.charsetForEncoding(toAppendTo.getEncoding())));
+            toAppendTo.append(StringOperations.encodeBytes(output, toAppendTo.getEncoding()));
         }
 
         return toAppendTo;

test/mri/excludes/TestTimeExtension.rb

@@ -1,38 +1,5 @@
-exclude :test_completion, "needs investigation"
-exclude :test_completion_with_different_timezone, "needs investigation"
-exclude :test_encode_httpdate, "needs investigation"
-exclude :test_encode_rfc2822, "needs investigation"
-exclude :test_encode_xmlschema, "needs investigation"
-exclude :test_huge_precision, "needs investigation"
-exclude :test_invalid, "needs investigation"
-exclude :test_nsec, "needs investigation"
-exclude :test_parse_fraction, "needs investigation"
-exclude :test_parse_leap_second, "needs investigation"
-exclude :test_rfc2616, "needs investigation"
-exclude :test_rfc2822, "needs investigation"
-exclude :test_rfc2822_leap_second, "needs investigation"
-exclude :test_rfc2822_utc_roundtrip_summer, "needs investigation"
-exclude :test_rfc2822_utc_roundtrip_winter, "needs investigation"
-exclude :test_rfc3339, "needs investigation"
-exclude :test_rfc822, "needs investigation"
-exclude :test_ruby_talk_152866, "needs investigation"
-exclude :test_strptime, "needs investigation"
-exclude :test_strptime_Ymd_z, "needs investigation"
-exclude :test_strptime_empty, "needs investigation"
-exclude :test_strptime_s_z, "needs investigation"
-exclude :test_xmlschema, "needs investigation"
-exclude :test_xmlschema_fraction, "needs investigation"
-exclude :test_xmlschema_leap_second, "needs investigation"
-exclude :test_zone_0000, "needs investigation"
-exclude :test_iso8601, "needs investigation"
-exclude :test_iso8601_alias, "needs investigation"
 exclude :test_iso8601_encode, "needs investigation"
-exclude :test_iso8601_nsec, "needs investigation"
 exclude :test_strptime_s_N, "needs investigation"
-exclude :test_xmlschema_alias, "needs investigation"
 exclude :test_xmlschema_encode, "needs investigation"
-exclude :test_xmlschema_nsec, "needs investigation"
-exclude :test_iso8601_leap_second, "needs investigation"
-exclude :test_parse_offset_hour_minute_second, "needs investigation"
-exclude :test_strptime_j, "needs investigation"
-exclude :test_parse_with_various_object, "needs investigation"
+exclude :test_iso8601, "needs investigation"
+exclude :test_xmlschema, "needs investigation"