From 0f9cec152e90f1c253bd25f31bcfb5fd7bb1cbb4 Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Wed, 2 Mar 2022 18:17:47 +0100 Subject: [PATCH] Remove outdated Encoding workaround --- lib/execjs/encoding.rb | 26 -------------------------- lib/execjs/runtime.rb | 4 ---- 2 files changed, 30 deletions(-) delete mode 100644 lib/execjs/encoding.rb diff --git a/lib/execjs/encoding.rb b/lib/execjs/encoding.rb deleted file mode 100644 index 8296144..0000000 --- a/lib/execjs/encoding.rb +++ /dev/null @@ -1,26 +0,0 @@ -module ExecJS - # Encodes strings as UTF-8 - module Encoding - if RUBY_ENGINE == 'jruby' || RUBY_ENGINE == 'rbx' - # workaround for jruby bug http://jira.codehaus.org/browse/JRUBY-6588 - # workaround for rbx bug https://github.com/rubinius/rubinius/issues/1729 - def encode(string) - if string.encoding == ::Encoding::BINARY - data = string.dup - data.force_encoding(::Encoding::UTF_8) - - unless data.valid_encoding? - raise ::Encoding::UndefinedConversionError, "Could not encode binary data #{string.dump} as UTF-8" - end - else - data = string.encode(::Encoding::UTF_8) - end - data - end - else - def encode(string) - string.encode(::Encoding::UTF_8) - end - end - end -end diff --git a/lib/execjs/runtime.rb b/lib/execjs/runtime.rb index 822bf5a..726e57b 100644 --- a/lib/execjs/runtime.rb +++ b/lib/execjs/runtime.rb @@ -1,11 +1,7 @@ -require "execjs/encoding" - module ExecJS # Abstract base class for runtimes class Runtime class Context - include Encoding - def initialize(runtime, source = "", options = {}) end