quickjs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3241377c00ffedb82e1752917d2a3bd6ac1fb667eebc30eb16b153c83119103
-  data.tar.gz: adc59082d4d1eb6cfbe662b88d3cbbee6deeb933c623964ccb139f1ae5b238c8
+  metadata.gz: d949a011a5d0f2a19d351045d6a0de4550beee0908758c477a339af9d1e5863b
+  data.tar.gz: '09a2510b4a484e6b35a7be189cbd4015a3c575c0a318e8514beee56336c0055e'
 SHA512:
-  metadata.gz: b434d7100850f01b027d437800018a14eec3d97292d3553736baf43ede5714146eb56c81b060462bc6e49a21df90aa562638ee9dfe35c73fdd8d0046f2eb65e0
-  data.tar.gz: 7b37256b42f7d5a767cb8a048ae0d287dc8d7c6590bb2155d059f8a5fc674d08fda84d1242d7bcdc198367e0aef5d4699cab6ecb984dc28e430571da25fc8122
+  metadata.gz: e8ecb1d0510082d9c0eca95ee6ef7257ff8f15ff4a2ea60fe9bc69e1274de689e71671b0f3f56ddcbe2c23421fa6fcd00b9cafadba653b89550447eb3b2a6310
+  data.tar.gz: af34d0b17332ba6df2e6f6c165d38cdd15ee4684a03f4bc5dc92dac2acdf5512313b263d775e9c942ab70a144e5317b1695b402ecf958ad3a86750662f84e675

data/README.md

@@ -158,6 +158,6 @@ vm,logs.last.raw #=> ['log me', nil]
 
 ## License
 
-Every file in `ext/quickjsrb/quickjs` is licensed under [the MIT License Copyright 2017-2021 by Fabrice Bellard and Charlie Goron](/ext/quickjsrb/quickjs/LICENSE).
+Every file in `ext/quickjsrb/quickjs` is licensed under [the MIT License Copyright 2017-2021 by Fabrice Bellard and Charlie Gordon](https://github.com/bellard/quickjs/blob/6e2e68fd0896957f92eb6c242a2e048c1ef3cae0/LICENSE).
 
 For otherwise, [the MIT License, Copyright 2024 by Kengo Hamasaki](/LICENSE).

data/ext/quickjsrb/quickjsrb.c

@@ -109,6 +109,25 @@ VALUE r_try_json_parse(VALUE r_str)
   return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, r_str);
 }
 
+VALUE to_r_json(JSContext *ctx, JSValue j_val)
+{
+  JSValue j_global = JS_GetGlobalObject(ctx);
+  JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
+  JSValue j_stringifyFunc = JS_GetPropertyStr(ctx, j_jsonClass, "stringify");
+  JSValue j_strigified = JS_Call(ctx, j_stringifyFunc, j_jsonClass, 1, &j_val);
+
+  const char *msg = JS_ToCString(ctx, j_strigified);
+  VALUE r_str = rb_str_new2(msg);
+  JS_FreeCString(ctx, msg);
+
+  JS_FreeValue(ctx, j_strigified);
+  JS_FreeValue(ctx, j_stringifyFunc);
+  JS_FreeValue(ctx, j_jsonClass);
+  JS_FreeValue(ctx, j_global);
+
+  return r_str;
+}
+
 VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 {
   switch (JS_VALUE_GET_NORM_TAG(j_val))
@@ -135,10 +154,16 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
   }
   case JS_TAG_STRING:
   {
-    const char *msg = JS_ToCString(ctx, j_val);
-    VALUE r_str = rb_str_new2(msg);
-    JS_FreeCString(ctx, msg);
-    return r_str;
+    int couldntParse;
+    VALUE r_result = rb_protect(r_try_json_parse, to_r_json(ctx, j_val), &couldntParse);
+    if (couldntParse)
+    {
+      return Qnil;
+    }
+    else
+    {
+      return r_result;
+    }
   }
   case JS_TAG_OBJECT:
   {
@@ -159,20 +184,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       }
       // will support other errors like just returning an instance of Error
     }
-
-    JSValue j_global = JS_GetGlobalObject(ctx);
-    JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
-    JSValue j_stringifyFunc = JS_GetPropertyStr(ctx, j_jsonClass, "stringify");
-    JSValue j_strigified = JS_Call(ctx, j_stringifyFunc, j_jsonClass, 1, &j_val);
-
-    const char *msg = JS_ToCString(ctx, j_strigified);
-    VALUE r_str = rb_str_new2(msg);
-    JS_FreeCString(ctx, msg);
-
-    JS_FreeValue(ctx, j_strigified);
-    JS_FreeValue(ctx, j_stringifyFunc);
-    JS_FreeValue(ctx, j_jsonClass);
-    JS_FreeValue(ctx, j_global);
+    VALUE r_str = to_r_json(ctx, j_val);
 
     if (rb_funcall(r_str, rb_intern("=="), 1, rb_str_new2("undefined")))
     {
@@ -314,8 +326,9 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
 
   VMData *data = JS_GetContextOpaque(ctx);
   VALUE r_proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
+  // Shouldn't happen
   if (r_proc == Qnil)
-  {                                                                           // Shouldn't happen
+  {
     return JS_ThrowReferenceError(ctx, "Proc `%s` is not defined", funcName); // TODO: Free funcnName
   }
   JS_FreeCString(ctx, funcName);

data/lib/quickjs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quickjs
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json