{@link RubyString String}#to_json_raw(*)
- *
- * This method creates a JSON text from the result of a call to
- * {@link #to_json_raw_object} of this String.
- */
- @JRubyMethod
- public static IRubyObject to_json_raw(ThreadContext context, IRubyObject vSelf) {
- RubyHash obj = toJsonRawObject(context, Utils.ensureString(vSelf));
- return Generator.generateJson(context, obj, Generator.HASH_HANDLER);
- }
-
- @JRubyMethod
- public static IRubyObject to_json_raw(ThreadContext context, IRubyObject vSelf, IRubyObject arg0) {
- RubyHash obj = toJsonRawObject(context, Utils.ensureString(vSelf));
- return Generator.generateJson(context, obj, Generator.HASH_HANDLER, arg0);
- }
-
- /**
- * {@link RubyString String}#to_json_raw_object(*)
- *
- *
This method creates a raw object Hash, that can be nested into
- * other data structures and will be unparsed as a raw string. This
- * method should be used if you want to convert raw strings to JSON
- * instead of UTF-8 strings, e.g. binary data.
- */
- @JRubyMethod
- public static IRubyObject to_json_raw_object(ThreadContext context, IRubyObject vSelf) {
- return toJsonRawObject(context, Utils.ensureString(vSelf));
- }
-
- private static RubyHash toJsonRawObject(ThreadContext context,
- RubyString self) {
- Ruby runtime = context.runtime;
- RubyHash result = RubyHash.newHash(runtime);
-
- IRubyObject createId = RuntimeInfo.forRuntime(runtime)
- .jsonModule.get().callMethod(context, "create_id");
- result.op_aset(context, createId, self.getMetaClass().to_s());
-
- ByteList bl = self.getByteList();
- byte[] uBytes = bl.unsafeBytes();
- RubyArray array = runtime.newArray(bl.length());
- for (int i = bl.begin(), t = bl.begin() + bl.length(); i < t; i++) {
- array.store(i, runtime.newFixnum(uBytes[i] & 0xff));
- }
-
- result.op_aset(context, runtime.newString("raw"), array);
- return result;
- }
-
- @JRubyMethod(module=true)
- public static IRubyObject included(ThreadContext context, IRubyObject extendModule, IRubyObject module) {
- RuntimeInfo info = RuntimeInfo.forRuntime(context.runtime);
- return module.callMethod(context, "extend", ((RubyModule) extendModule).getConstant("Extend"));
- }
- }
-
- public static class StringExtend {
- /**
- * {@link RubyString String}#json_create(o)
- *
- *
Raw Strings are JSON Objects (the raw bytes are stored in an - * array for the key "raw"). The Ruby String can be created by this - * module method. - */ - @JRubyMethod - public static IRubyObject json_create(ThreadContext context, - IRubyObject vSelf, IRubyObject vHash) { - Ruby runtime = context.runtime; - RubyHash o = vHash.convertToHash(); - IRubyObject rawData = o.fastARef(runtime.newString("raw")); - if (rawData == null) { - throw runtime.newArgumentError("\"raw\" value not defined " - + "for encoded String"); - } - RubyArray ary = Utils.ensureArray(rawData); - byte[] bytes = new byte[ary.getLength()]; - for (int i = 0, t = ary.getLength(); i < t; i++) { - IRubyObject element = ary.eltInternal(i); - if (element instanceof RubyFixnum) { - bytes[i] = (byte)RubyNumeric.fix2long(element); - } else { - throw runtime.newTypeError(element, runtime.getFixnum()); - } - } - return runtime.newString(new ByteList(bytes, false)); - } } public static class RbTrue { diff --git a/lib/json/add/core.rb b/lib/json/add/core.rb index 485f097ff..61ff45421 100644 --- a/lib/json/add/core.rb +++ b/lib/json/add/core.rb @@ -7,6 +7,7 @@ require 'json/add/exception' require 'json/add/range' require 'json/add/regexp' +require 'json/add/string' require 'json/add/struct' require 'json/add/symbol' require 'json/add/time' diff --git a/lib/json/add/string.rb b/lib/json/add/string.rb new file mode 100644 index 000000000..46f07967c --- /dev/null +++ b/lib/json/add/string.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true +unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED + require 'json' +end + +class String + # call-seq: json_create(o) + # + # Raw Strings are JSON Objects (the raw bytes are stored in an array for the + # key "raw"). The Ruby String can be created by this class method. + def self.json_create(object) + object["raw"].pack("C*") + end + + # call-seq: to_json_raw_object() + # + # This method creates a raw object hash, that can be nested into + # other data structures and will be generated as a raw string. This + # method should be used, if you want to convert raw strings to JSON + # instead of UTF-8 strings, e. g. binary data. + def to_json_raw_object + { + JSON.create_id => self.class.name, + "raw" => unpack("C*"), + } + end + + # call-seq: to_json_raw(*args) + # + # This method creates a JSON text from the result of a call to + # to_json_raw_object of this String. + def to_json_raw(...) + to_json_raw_object.to_json(...) + end +end \ No newline at end of file diff --git a/lib/json/truffle_ruby/generator.rb b/lib/json/truffle_ruby/generator.rb index c814106de..aba20068a 100644 --- a/lib/json/truffle_ruby/generator.rb +++ b/lib/json/truffle_ruby/generator.rb @@ -635,39 +635,6 @@ def to_json(state = nil, *args) rescue Encoding::UndefinedConversionError => error raise ::JSON::GeneratorError.new(error.message, self) end - - # Module that holds the extending methods if, the String module is - # included. - module Extend - # Raw Strings are JSON Objects (the raw bytes are stored in an - # array for the key "raw"). The Ruby String can be created by this - # module method. - def json_create(o) - o['raw'].pack('C*') - end - end - - # Extends _modul_ with the String::Extend module. - def self.included(modul) - modul.extend Extend - end - - # This method creates a raw object hash, that can be nested into - # other data structures and will be unparsed as a raw string. This - # method should be used, if you want to convert raw strings to JSON - # instead of UTF-8 strings, e. g. binary data. - def to_json_raw_object - { - JSON.create_id => self.class.name, - 'raw' => self.unpack('C*'), - } - end - - # This method creates a JSON text from the result of - # a call to to_json_raw_object of this String. - def to_json_raw(*args) - to_json_raw_object.to_json(*args) - end end module TrueClass